Commit 76aaf87b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: merge __scsi_execute into scsi_execute 



All but one caller want the decoded sense header, so offer the existing
__scsi_execute helper as the public scsi_execute API to simply the
callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3949e2f0

drivers/ata/libata-scsi.c

+4 −8
Original line number Diff line number Diff line
@@ -600,6 +600,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
	u8 args[4], *argbuf = NULL, *sensebuf = NULL;

	int argsize = 0;

	enum dma_data_direction data_dir;

	struct scsi_sense_hdr sshdr;

	int cmd_result;



	if (arg == NULL)
@@ -648,7 +649,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
	/* Good values for timeout and retries?  Values below

	   from scsi_ioctl_send_command() for default case... */

	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,

				  sensebuf, (10*HZ), 5, 0, NULL);

				  sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);



	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;
@@ -657,9 +658,6 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) 
		/* If we set cc then ATA pass-through will cause a

		 * check condition even if no error. Filter that. */

		if (cmd_result & SAM_STAT_CHECK_CONDITION) {

			struct scsi_sense_hdr sshdr;

			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,

					     &sshdr);

			if (sshdr.sense_key == RECOVERED_ERROR &&

			    sshdr.asc == 0 && sshdr.ascq == 0x1d)

				cmd_result &= ~SAM_STAT_CHECK_CONDITION;
@@ -707,6 +705,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	int rc = 0;

	u8 scsi_cmd[MAX_COMMAND_SIZE];

	u8 args[7], *sensebuf = NULL;

	struct scsi_sense_hdr sshdr;

	int cmd_result;



	if (arg == NULL)
@@ -734,7 +733,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
	/* Good values for timeout and retries?  Values below

	   from scsi_ioctl_send_command() for default case... */

	cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,

				sensebuf, (10*HZ), 5, 0, NULL);

				sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);



	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */

		u8 *desc = sensebuf + 8;
@@ -743,9 +742,6 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) 
		/* If we set cc then ATA pass-through will cause a

		 * check condition even if no error. Filter that. */

		if (cmd_result & SAM_STAT_CHECK_CONDITION) {

			struct scsi_sense_hdr sshdr;

			scsi_normalize_sense(sensebuf, SCSI_SENSE_BUFFERSIZE,

						&sshdr);

			if (sshdr.sense_key == RECOVERED_ERROR &&

			    sshdr.asc == 0 && sshdr.ascq == 0x1d)

				cmd_result &= ~SAM_STAT_CHECK_CONDITION;

drivers/scsi/cxlflash/superpipe.c

+3 −5
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli) 
	struct cxlflash_cfg *cfg = shost_priv(sdev->host);

	struct device *dev = &cfg->dev->dev;

	struct glun_info *gli = lli->parent;

	struct scsi_sense_hdr sshdr;

	u8 *cmd_buf = NULL;

	u8 *scsi_cmd = NULL;

	u8 *sense_buf = NULL;
@@ -332,7 +333,8 @@ retry: 
	/* Drop the ioctl read semahpore across lengthy call */

	up_read(&cfg->ioctl_rwsem);

	result = scsi_execute(sdev, scsi_cmd, DMA_FROM_DEVICE, cmd_buf,

			      CMD_BUFSIZE, sense_buf, to, CMD_RETRIES, 0, NULL);

			      CMD_BUFSIZE, sense_buf, &sshdr, to, CMD_RETRIES,

			      0, 0, NULL);

	down_read(&cfg->ioctl_rwsem);

	rc = check_state(cfg);

	if (rc) {
@@ -345,10 +347,6 @@ retry: 
	if (driver_byte(result) == DRIVER_SENSE) {

		result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */

		if (result & SAM_STAT_CHECK_CONDITION) {

			struct scsi_sense_hdr sshdr;



			scsi_normalize_sense(sense_buf, SCSI_SENSE_BUFFERSIZE,

					    &sshdr);

			switch (sshdr.sense_key) {

			case NO_SENSE:

			case RECOVERED_ERROR:

drivers/scsi/cxlflash/vlun.c

+2 −2
Original line number Diff line number Diff line
@@ -453,8 +453,8 @@ static int write_same16(struct scsi_device *sdev, 
		/* Drop the ioctl read semahpore across lengthy call */

		up_read(&cfg->ioctl_rwsem);

		result = scsi_execute(sdev, scsi_cmd, DMA_TO_DEVICE, cmd_buf,

				      CMD_BUFSIZE, sense_buf, to, CMD_RETRIES,

				      0, NULL);

				      CMD_BUFSIZE, sense_buf, NULL, to,

				      CMD_RETRIES, 0, 0, NULL);

		down_read(&cfg->ioctl_rwsem);

		rc = check_state(cfg);

		if (rc) {

drivers/scsi/scsi_lib.c

+21 −27
Original line number Diff line number Diff line
@@ -213,7 +213,26 @@ void scsi_queue_insert(struct scsi_cmnd *cmd, int reason) 
	__scsi_queue_insert(cmd, reason, 1);

}



static int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,



/**

 * scsi_execute - insert request and wait for the result

 * @sdev:	scsi device

 * @cmd:	scsi command

 * @data_direction: data direction

 * @buffer:	data buffer

 * @bufflen:	len of buffer

 * @sense:	optional sense buffer

 * @sshdr:	optional decoded sense header

 * @timeout:	request timeout in seconds

 * @retries:	number of times to retry request

 * @flags:	flags for ->cmd_flags

 * @rq_flags:	flags for ->rq_flags

 * @resid:	optional residual length

 *

 * returns the req->errors value which is the scsi_cmnd result

 * field.

 */

int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,

		 int data_direction, void *buffer, unsigned bufflen,

		 unsigned char *sense, struct scsi_sense_hdr *sshdr,

		 int timeout, int retries, u64 flags, req_flags_t rq_flags,
@@ -268,31 +287,6 @@ static int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, 


	return ret;

}



/**

 * scsi_execute - insert request and wait for the result

 * @sdev:	scsi device

 * @cmd:	scsi command

 * @data_direction: data direction

 * @buffer:	data buffer

 * @bufflen:	len of buffer

 * @sense:	optional sense buffer

 * @timeout:	request timeout in seconds

 * @retries:	number of times to retry request

 * @flags:	or into request flags;

 * @resid:	optional residual length

 *

 * returns the req->errors value which is the scsi_cmnd result

 * field.

 */

int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,

		 int data_direction, void *buffer, unsigned bufflen,

		 unsigned char *sense, int timeout, int retries, u64 flags,

		 int *resid)

{

	return __scsi_execute(sdev, cmd, data_direction, buffer, bufflen, sense,

			NULL, timeout, retries, flags, 0, resid);

}

EXPORT_SYMBOL(scsi_execute);



int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd,
@@ -300,7 +294,7 @@ int scsi_execute_req_flags(struct scsi_device *sdev, const unsigned char *cmd, 
		     struct scsi_sense_hdr *sshdr, int timeout, int retries,

		     int *resid, u64 flags, req_flags_t rq_flags)

{

	return __scsi_execute(sdev, cmd, data_direction, buffer, bufflen,

	return scsi_execute(sdev, cmd, data_direction, buffer, bufflen,

			      NULL, sshdr, timeout, retries, flags, rq_flags,

			      resid);

}

drivers/scsi/scsi_transport_spi.c

+10 −14
Original line number Diff line number Diff line
@@ -123,24 +123,20 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd, 
{

	int i, result;

	unsigned char sense[SCSI_SENSE_BUFFERSIZE];

	struct scsi_sense_hdr sshdr_tmp;



	if (!sshdr)

		sshdr = &sshdr_tmp;



	for(i = 0; i < DV_RETRIES; i++) {

		result = scsi_execute(sdev, cmd, dir, buffer, bufflen,

				      sense, DV_TIMEOUT, /* retries */ 1,

		result = scsi_execute(sdev, cmd, dir, buffer, bufflen, sense,

				      sshdr, DV_TIMEOUT, /* retries */ 1,

				      REQ_FAILFAST_DEV |

				      REQ_FAILFAST_TRANSPORT |

				      REQ_FAILFAST_DRIVER,

				      NULL);

		if (driver_byte(result) & DRIVER_SENSE) {

			struct scsi_sense_hdr sshdr_tmp;

			if (!sshdr)

				sshdr = &sshdr_tmp;



			if (scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE,

						 sshdr)

			    && sshdr->sense_key == UNIT_ATTENTION)

				continue;

		}

				      0, NULL);

		if (!(driver_byte(result) & DRIVER_SENSE) ||

		    sshdr->sense_key != UNIT_ATTENTION)

			break;

	}

	return result;

CRA Git | Maintained and supported by SUSTech CRA and CCSE