Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2478a736 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: consolidate opcode lookup in scsi_opcode_sa_name() 



Consolidate the CDB opcode lookup in scsi_opcode_sa_name(),
so that we don't have to call several functions to figure
out the CDB opcode string.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 234d6778

drivers/scsi/constants.c

+23 −16
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
#define THIRD_PARTY_COPY_OUT 0x83

#define THIRD_PARTY_COPY_OUT 0x83

#define THIRD_PARTY_COPY_IN 0x84

#define THIRD_PARTY_COPY_IN 0x84





#define VENDOR_SPECIFIC_CDB 0xc0





struct sa_name_list {

struct sa_name_list {

	int opcode;

	int opcode;
@@ -266,7 +267,7 @@ static struct sa_name_list sa_names_arr[] = { 
};

};





#else /* ifndef CONFIG_SCSI_CONSTANTS */

#else /* ifndef CONFIG_SCSI_CONSTANTS */

static const char *cdb_byte0_names[];

static const char *cdb_byte0_names[0];





static struct sa_name_list sa_names_arr[] = {

static struct sa_name_list sa_names_arr[] = {

	{VARIABLE_LENGTH_CMD, NULL, 0},

	{VARIABLE_LENGTH_CMD, NULL, 0},
@@ -286,12 +287,19 @@ static struct sa_name_list sa_names_arr[] = { 
#endif /* CONFIG_SCSI_CONSTANTS */

#endif /* CONFIG_SCSI_CONSTANTS */





static bool scsi_opcode_sa_name(int opcode, int service_action,

static bool scsi_opcode_sa_name(int opcode, int service_action,

				const char **sa_name)

				const char **cdb_name, const char **sa_name)

{

{

	struct sa_name_list *sa_name_ptr;

	struct sa_name_list *sa_name_ptr;

	const struct value_name_pair *arr = NULL;

	const struct value_name_pair *arr = NULL;

	int arr_sz, k;

	int arr_sz, k;





	*cdb_name = NULL;

	if (opcode >= VENDOR_SPECIFIC_CDB)

		return false;



	if (opcode < ARRAY_SIZE(cdb_byte0_names))

		*cdb_name = cdb_byte0_names[opcode];



	for (sa_name_ptr = sa_names_arr; sa_name_ptr->arr; ++sa_name_ptr) {

	for (sa_name_ptr = sa_names_arr; sa_name_ptr->arr; ++sa_name_ptr) {

		if (sa_name_ptr->opcode == opcode) {

		if (sa_name_ptr->opcode == opcode) {

			arr = sa_name_ptr->arr;

			arr = sa_name_ptr->arr;
@@ -316,7 +324,7 @@ static bool scsi_opcode_sa_name(int opcode, int service_action, 
static void print_opcode_name(unsigned char * cdbp, int cdb_len)

static void print_opcode_name(unsigned char * cdbp, int cdb_len)

{

{

	int sa, len, cdb0;

	int sa, len, cdb0;

	const char *name = NULL;

	const char *cdb_name = NULL, *sa_name = NULL;





	cdb0 = cdbp[0];

	cdb0 = cdbp[0];

	if (cdb0 == VARIABLE_LENGTH_CMD) {

	if (cdb0 == VARIABLE_LENGTH_CMD) {
@@ -332,21 +340,20 @@ static void print_opcode_name(unsigned char * cdbp, int cdb_len) 
		len = cdb_len;

		len = cdb_len;

	}

	}





	if (!scsi_opcode_sa_name(cdb0, sa, &name)) {

	if (!scsi_opcode_sa_name(cdb0, sa, &cdb_name, &sa_name)) {

		if (cdb0 < 0xc0) {

		if (cdb_name)

			if (ARRAY_SIZE(cdb_byte0_names) > 1) {

			printk("%s", cdb_name);

				name = cdb_byte0_names[cdb0];

		else if (cdb0 >= VENDOR_SPECIFIC_CDB)

				if (name)

			printk("cdb[0]=0x%x (vendor)", cdb0);

					printk("%s", name);

		else if (cdb0 >= 0x60 && cdb0 < 0x7e)

				else

			printk("cdb[0]=0x%x (reserved)", cdb0);

			printk("cdb[0]=0x%x (reserved)", cdb0);

			} else

		else

			printk("cdb[0]=0x%x", cdb0);

			printk("cdb[0]=0x%x", cdb0);

		} else

			printk("cdb[0]=0x%x (vendor)", cdb0);

	} else {

	} else {

		if (name)

		if (sa_name)

			printk("%s", name);

			printk("%s", sa_name);

		else if (cdb_name)

			printk("%s, sa=0x%x", cdb_name, sa);

		else

		else

			printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);

			printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);