This simplifies sd_spinup_disk so scsi-ml retries errors for it. Note that
we retried specifically on a UA and also if scsi_status_is_good returned
failed which could happen for all check conditions, so in this patch we
don't check for only UAs.
We do not handle the outside loop's retries because we want to sleep
between tried and we don't support that yet.
Signed-off-by: Mike Christie <michael.christie@xxxxxxxxxx>
---
drivers/scsi/sd.c | 76 ++++++++++++++++++++++++++++-------------------
1 file changed, 45 insertions(+), 31 deletions(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a35c089c3097..716e0c8ffa57 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2064,50 +2064,64 @@ sd_spinup_disk(struct scsi_disk *sdkp)
{
unsigned char cmd[10];
unsigned long spintime_expire = 0;
- int retries, spintime;
+ int spintime;
unsigned int the_result;
struct scsi_sense_hdr sshdr;
int sense_valid = 0;
+ struct scsi_failure failures[] = {
+ {
+ .sense = SCMD_FAILURE_SENSE_ANY,
+ .asc = SCMD_FAILURE_ASC_ANY,
+ .ascq = SCMD_FAILURE_ASCQ_ANY,
+ .allowed = 3,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {
+ /*
+ * Retry scsi status and host errors that return
+ * failure in scsi_status_is_good.
+ */
+ .result = SAM_STAT_BUSY |
+ SAM_STAT_RESERVATION_CONFLICT |
+ SAM_STAT_TASK_SET_FULL |
+ SAM_STAT_ACA_ACTIVE |
+ SAM_STAT_TASK_ABORTED |
+ DID_NO_CONNECT << 16,
+ },
+ {},
+ };
spintime = 0;
/* Spin up drives, as required. Only do this at boot time */
/* Spinup needs to be done for module loads too. */
do {
- retries = 0;
-
- do {
- bool media_was_present = sdkp->media_present;
+ bool media_was_present = sdkp->media_present;
- cmd[0] = TEST_UNIT_READY;
- memset((void *) &cmd[1], 0, 9);
+ cmd[0] = TEST_UNIT_READY;
+ memset((void *) &cmd[1], 0, 9);
- 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 }));
+ 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,
+ .failures = failures }));
- /*
- * If the drive has indicated to us that it
- * doesn't have any media in it, don't bother
- * with any more polling.
- */
- if (media_not_present(sdkp, &sshdr)) {
- if (media_was_present)
- sd_printk(KERN_NOTICE, sdkp, "Media removed, stopped polling\n");
- return;
- }
+ /*
+ * If the drive has indicated to us that it doesn't have any
+ * media in it, don't bother with any more polling.
+ */
+ if (media_not_present(sdkp, &sshdr)) {
+ if (media_was_present)
+ sd_printk(KERN_NOTICE, sdkp, "Media removed, stopped polling\n");
+ return;
+ }
- if (the_result)
- sense_valid = scsi_sense_valid(&sshdr);
- retries++;
- } while (retries < 3 &&
- (!scsi_status_is_good(the_result) ||
- (scsi_status_is_check_condition(the_result) &&
- sense_valid && sshdr.sense_key == UNIT_ATTENTION)));
+ if (the_result)
+ sense_valid = scsi_sense_valid(&sshdr);
if (!scsi_status_is_check_condition(the_result)) {
/* no sense, TUR either succeeded or failed
--
2.25.1
