Commit 152e52fb authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

scsi: core: Support Service Action in scsi_report_opcode() 



The REPORT_SUPPORTED_OPERATION_CODES command allows checking for support of
commands that have the same opcode but different service actions, such as
READ 32 and WRITE 32. However, the current implementation of
scsi_report_opcode() only allows checking an operation code without a
service action differentiation.

Add the "sa" argument to scsi_report_opcode() to allow passing a service
action. If a non-zero service action is specified, the reporting options
field value is set to 3 to have the service action field taken into account
by the device. If no service action field is specified (zero), the
reporting options field is set to 1 as before.

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Link: https://lore.kernel.org/r/20230511011356.227789-8-nks@flawful.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a6cdc35f

drivers/scsi/scsi.c

+19 −9
Original line number Diff line number Diff line
@@ -504,18 +504,22 @@ void scsi_attach_vpd(struct scsi_device *sdev) 
}



/**

 * scsi_report_opcode - Find out if a given command opcode is supported

 * scsi_report_opcode - Find out if a given command is supported

 * @sdev:	scsi device to query

 * @buffer:	scratch buffer (must be at least 20 bytes long)

 * @len:	length of buffer

 * @opcode:	opcode for command to look up

 *

 * Uses the REPORT SUPPORTED OPERATION CODES to look up the given

 * opcode. Returns -EINVAL if RSOC fails, 0 if the command opcode is

 * unsupported and 1 if the device claims to support the command.

 * @opcode:	opcode for the command to look up

 * @sa:		service action for the command to look up

 *

 * Uses the REPORT SUPPORTED OPERATION CODES to check support for the

 * command identified with @opcode and @sa. If the command does not

 * have a service action, @sa must be 0. Returns -EINVAL if RSOC fails,

 * 0 if the command is not supported and 1 if the device claims to

 * support the command.

 */

int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer,

		       unsigned int len, unsigned char opcode)

		       unsigned int len, unsigned char opcode,

		       unsigned short sa)

{

	unsigned char cmd[16];

	struct scsi_sense_hdr sshdr;
@@ -539,8 +543,14 @@ int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer, 
	memset(cmd, 0, 16);

	cmd[0] = MAINTENANCE_IN;

	cmd[1] = MI_REPORT_SUPPORTED_OPERATION_CODES;

	if (!sa) {

		cmd[2] = 1;	/* One command format */

		cmd[3] = opcode;

	} else {

		cmd[2] = 3;	/* One command format with service action */

		cmd[3] = opcode;

		put_unaligned_be16(sa, &cmd[4]);

	}

	put_unaligned_be32(request_len, &cmd[6]);

	memset(buffer, 0, len);

drivers/scsi/sd.c

+5 −5
Original line number Diff line number Diff line
@@ -3056,7 +3056,7 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer) 
		return;

	}



	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, INQUIRY) < 0) {

	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, INQUIRY, 0) < 0) {

		struct scsi_vpd *vpd;



		sdev->no_report_opcodes = 1;
@@ -3072,10 +3072,10 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer) 
		rcu_read_unlock();

	}



	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, WRITE_SAME_16) == 1)

	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, WRITE_SAME_16, 0) == 1)

		sdkp->ws16 = 1;



	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, WRITE_SAME) == 1)

	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE, WRITE_SAME, 0) == 1)

		sdkp->ws10 = 1;

}
@@ -3087,9 +3087,9 @@ static void sd_read_security(struct scsi_disk *sdkp, unsigned char *buffer) 
		return;



	if (scsi_report_opcode(sdev, buffer, SD_BUF_SIZE,

			SECURITY_PROTOCOL_IN) == 1 &&

			SECURITY_PROTOCOL_IN, 0) == 1 &&

	    scsi_report_opcode(sdev, buffer, SD_BUF_SIZE,

			SECURITY_PROTOCOL_OUT) == 1)

			SECURITY_PROTOCOL_OUT, 0) == 1)

		sdkp->security = 1;

}

include/scsi/scsi_device.h

+3 −2
Original line number Diff line number Diff line
@@ -433,8 +433,9 @@ extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, 
				int retries, struct scsi_sense_hdr *sshdr);

extern int scsi_get_vpd_page(struct scsi_device *, u8 page, unsigned char *buf,

			     int buf_len);

extern int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer,

			      unsigned int len, unsigned char opcode);

int scsi_report_opcode(struct scsi_device *sdev, unsigned char *buffer,

		       unsigned int len, unsigned char opcode,

		       unsigned short sa);

extern int scsi_device_set_state(struct scsi_device *sdev,

				 enum scsi_device_state state);

extern struct scsi_event *sdev_evt_alloc(enum scsi_device_event evt_type,