[PATCH v2 11/35] scsi: sd: Convert to scsi_exec_req

Mike Christie
2022-09-29T03:06:07Z

scsi_execute* is going to be removed. Convert to scsi_exec_req so
we pass all args in a scsi_exec_args struct.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/scsi/sd.c | 102 ++++++++++++++++++++++++++++++++++------------
1 file changed, 76 insertions(+), 26 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index eb76ba055021..37eafa968116 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -671,9 +671,16 @@ static int sd_sec_submit(void *data, u16 spsp, u8 secp, void *buffer,
put_unaligned_be16(spsp, &cdb[2]);
put_unaligned_be32(len, &cdb[6]);

- ret = scsi_execute(sdev, cdb, send ? DMA_TO_DEVICE : DMA_FROM_DEVICE,
- buffer, len, NULL, NULL, SD_TIMEOUT, sdkp->max_retries, 0,
- RQF_PM, NULL);
+ ret = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cdb,
+ .data_dir = send ?
+ DMA_TO_DEVICE : DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = len,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries,
+ .req_flags = RQF_PM }));
return ret <= 0 ? ret : -EIO;
}
#endif /* CONFIG_BLK_SED_OPAL */
@@ -1594,8 +1601,14 @@ static int sd_sync_cache(struct scsi_disk *sdkp, struct scsi_sense_hdr *sshdr)
* Leave the rest of the command zero to indicate
* flush everything.
*/
- res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, sshdr,
- timeout, sdkp->max_retries, 0, RQF_PM, NULL);
+ res = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = sshdr,
+ .timeout = timeout,
+ .retries = sdkp->max_retries,
+ .req_flags = RQF_PM }));
if (res == 0)
break;
}
@@ -1720,8 +1733,15 @@ static int sd_pr_command(struct block_device *bdev, u8 sa,
put_unaligned_be64(sa_key, &data[8]);
data[20] = flags;

- result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, &data, sizeof(data),
- &sshdr, SD_TIMEOUT, sdkp->max_retries, NULL);
+ result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cmd,
+ .data_dir = DMA_TO_DEVICE,
+ .buf = &data,
+ .buf_len = sizeof(data),
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));

if (scsi_status_is_check_condition(result) &&
scsi_sense_valid(&sshdr)) {
@@ -2062,10 +2082,13 @@ sd_spinup_disk(struct scsi_disk *sdkp)
cmd[0] = TEST_UNIT_READY;
memset((void *) &cmd[1], 0, 9);

- the_result = scsi_execute_req(sdkp->device, cmd,
- DMA_NONE, NULL, 0,
- &sshdr, SD_TIMEOUT,
- sdkp->max_retries, NULL);
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdkp->device,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));

/*
* If the drive has indicated to us that it
@@ -2122,10 +2145,13 @@ sd_spinup_disk(struct scsi_disk *sdkp)
cmd[4] = 1; /* Start spin cycle */
if (sdkp->device->start_stop_pwr_cond)
cmd[4] |= 1 << 4;
- scsi_execute_req(sdkp->device, cmd, DMA_NONE,
- NULL, 0, &sshdr,
- SD_TIMEOUT, sdkp->max_retries,
- NULL);
+ scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdkp->device,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));
spintime_expire = jiffies + 100 * HZ;
spintime = 1;
}
@@ -2272,9 +2298,15 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
cmd[13] = RC16_LEN;
memset(buffer, 0, RC16_LEN);

- the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
- buffer, RC16_LEN, &sshdr,
- SD_TIMEOUT, sdkp->max_retries, NULL);
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = RC16_LEN,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));

if (media_not_present(sdkp, &sshdr))
return -ENODEV;
@@ -2357,9 +2389,15 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
memset(&cmd[1], 0, 9);
memset(buffer, 0, 8);

- the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
- buffer, 8, &sshdr,
- SD_TIMEOUT, sdkp->max_retries, NULL);
+ the_result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_FROM_DEVICE,
+ .buf = buffer,
+ .buf_len = 8,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries }));

if (media_not_present(sdkp, &sshdr))
return -ENODEV;
@@ -3608,8 +3646,14 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
if (!scsi_device_online(sdp))
return -ENODEV;

- res = scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL, &sshdr,
- SD_TIMEOUT, sdkp->max_retries, 0, RQF_PM, NULL);
+ res = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .sshdr = &sshdr,
+ .timeout = SD_TIMEOUT,
+ .retries = sdkp->max_retries,
+ .req_flags = RQF_PM }));
if (res) {
sd_print_result(sdkp, "Start/Stop Unit failed", res);
if (res > 0 && scsi_sense_valid(&sshdr)) {
@@ -3740,6 +3784,7 @@ static int sd_resume_runtime(struct device *dev)
{
struct scsi_disk *sdkp = dev_get_drvdata(dev);
struct scsi_device *sdp;
+ int result;

if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
return 0;
@@ -3750,9 +3795,14 @@ static int sd_resume_runtime(struct device *dev)
/* clear the device's sense data */
static const u8 cmd[10] = { REQUEST_SENSE };

- if (scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL,
- NULL, sdp->request_queue->rq_timeout, 1, 0,
- RQF_PM, NULL))
+ result = scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdp,
+ .cmd = cmd,
+ .data_dir = DMA_NONE,
+ .timeout = sdp->request_queue->rq_timeout,
+ .retries = 1,
+ .req_flags = RQF_PM }));
+ if (result)
sd_printk(KERN_NOTICE, sdkp,
"Failed to clear sense data\n");
}
--
2.25.1