[PATCH v2 26/35] scsi: spi: Have scsi-ml retry spi_execute errors

Mike Christie
2022-09-29T03:08:17Z

This has spi_execute have scsi-ml retry errors instead of driving them.

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

diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 55d9b13b2f8e..ec5b0f562cf2 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -109,38 +109,42 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd,
void *buffer, unsigned bufflen,
struct scsi_sense_hdr *sshdr)
{
- int i, result;
unsigned char sense[SCSI_SENSE_BUFFERSIZE];
struct scsi_sense_hdr sshdr_tmp;
+ struct scsi_failure failures[] = {
+ {
+ .sense = UNIT_ATTENTION,
+ .asc = SCMD_FAILURE_ASC_ANY,
+ .ascq = SCMD_FAILURE_ASCQ_ANY,
+ .allowed = DV_RETRIES,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {},
+ };

if (!sshdr)
sshdr = &sshdr_tmp;

- for(i = 0; i < DV_RETRIES; i++) {
- /*
- * The purpose of the RQF_PM flag below is to bypass the
- * SDEV_QUIESCE state.
- */
- result = scsi_exec_req(((struct scsi_exec_args) {
- .sdev = sdev,
- .cmd = cmd,
- .data_dir = dir,
- .buf = buffer,
- .buf_len = bufflen,
- .sense = sense,
- .sense_len = sizeof(sense),
- .sshdr = sshdr,
- .timeout = DV_TIMEOUT,
- .retries = 1,
- .op_flags = REQ_FAILFAST_DEV |
- REQ_FAILFAST_TRANSPORT |
- REQ_FAILFAST_DRIVER,
- .req_flags = RQF_PM }));
- if (result < 0 || !scsi_sense_valid(sshdr) ||
- sshdr->sense_key != UNIT_ATTENTION)
- break;
- }
- return result;
+ /*
+ * The purpose of the RQF_PM flag below is to bypass the
+ * SDEV_QUIESCE state.
+ */
+ return scsi_exec_req(((struct scsi_exec_args) {
+ .sdev = sdev,
+ .cmd = cmd,
+ .data_dir = dir,
+ .buf = buffer,
+ .buf_len = bufflen,
+ .sense = sense,
+ .sense_len = sizeof(sense),
+ .sshdr = sshdr,
+ .timeout = DV_TIMEOUT,
+ .retries = 1,
+ .op_flags = REQ_FAILFAST_DEV |
+ REQ_FAILFAST_TRANSPORT |
+ REQ_FAILFAST_DRIVER,
+ .req_flags = RQF_PM,
+ .failures = failures }));
}

static struct {
--
2.25.1