@@ -2062,52 +2062,66 @@ static int sd_done(struct scsi_cmnd *SCpnt)
static void
sd_spinup_disk(struct scsi_disk *sdkp)
{
- unsigned char cmd[10];
+ static const u8 cmd[10] = { TEST_UNIT_READY };
unsigned long spintime_expire = 0;
- int retries, spintime;
+ int spintime;
unsigned int the_result;
struct scsi_sense_hdr sshdr;
- int sense_valid = 0;
+ int sense_valid = 0, i;
+ struct scsi_failure failures[] = {
+ /* Fail immediately for Medium Not Present */
+ {
+ .sense = UNIT_ATTENTION,
+ .asc = 0x3A,
+ .ascq = 0x0,
+ .allowed = 0,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {
+ .sense = NOT_READY,
+ .asc = 0x3A,
+ .ascq = 0x0,
+ .allowed = 0,
+ .result = SAM_STAT_CHECK_CONDITION,
+ },
+ {
+ .result = SCMD_FAILURE_STAT_ANY,
+ .allowed = 3,
+ },
+ {},
+ };
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);
+ for (i = 0; i < ARRAY_SIZE(failures); i++)
+ failures[i].retries = 0;
- 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
@@ -2138,16 +2152,15 @@ sd_spinup_disk(struct scsi_disk *sdkp)
* Issue command to spin up drive when not ready
*/
if (!spintime) {
+ /* Return immediately and start spin cycle */
+ const u8 start_cmd[10] = { START_STOP, 1, 0, 0,
+ sdkp->device->start_stop_pwr_cond ?
+ 0x11 : 1 };
+
sd_printk(KERN_NOTICE, sdkp, "Spinning up disk...");
- cmd[0] = START_STOP;
- cmd[1] = 1; /* Return immediately */
- memset((void *) &cmd[2], 0, 8);
- cmd[4] = 1; /* Start spin cycle */
- if (sdkp->device->start_stop_pwr_cond)
- cmd[4] |= 1 << 4;
scsi_exec_req(((struct scsi_exec_args) {
.sdev = sdkp->device,
- .cmd = cmd,
+ .cmd = start_cmd,
.data_dir = DMA_NONE,
.sshdr = &sshdr,
.timeout = SD_TIMEOUT,