diff options
| author |   Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 16:05:17 +1100 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-06 21:42:55 -0500 |
| commit | 1f1b0c74dfaf6264d239823ed5aeb8dcdd62838c (patch) | |
| tree | a2546a9f0c41190abf44da820688166609fc13f8 /drivers/scsi/NCR5380.c | |
| parent | ncr5380: Always escalate bad target time-out in NCR5380_select() (diff) | |
| download | linux-dev-1f1b0c74dfaf6264d239823ed5aeb8dcdd62838c.tar.xz linux-dev-1f1b0c74dfaf6264d239823ed5aeb8dcdd62838c.zip | |
ncr5380: Proceed with next command after NCR5380_select() calls scsi_done
If a target disappears from the SCSI bus, NCR5380_select() may
subsequently fail with a time-out. In this situation, scsi_done is
called and NCR5380_select() returns 0. Both hostdata->connected and
hostdata->selecting are NULL and the main loop should proceed with
the next command in the issue queue. Clarify this logic.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
| -rw-r--r-- | drivers/scsi/NCR5380.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 051684b08a77..4ef4fc7bd6eb 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -1007,14 +1007,18 @@ static void NCR5380_main(struct work_struct *work) */ if (!NCR5380_select(instance, tmp)) { - break; + /* OK or bad target */ } else { + /* Need to retry */ LIST(tmp, hostdata->issue_queue); tmp->host_scribble = (unsigned char *) hostdata->issue_queue; hostdata->issue_queue = tmp; done = 0; dprintk(NDEBUG_MAIN|NDEBUG_QUEUES, "scsi%d : main(): select() failed, returned to issue_queue\n", instance->host_no); } + if (hostdata->connected || + hostdata->selecting) + break; /* lock held here still */ } /* if target/lun is not busy */ } /* for */ @@ -1024,7 +1028,7 @@ static void NCR5380_main(struct work_struct *work) tmp = (struct scsi_cmnd *) hostdata->selecting; /* Selection will drop and retake the lock */ if (!NCR5380_select(instance, tmp)) { - /* Ok ?? */ + /* OK or bad target */ } else { /* RvC: device failed, so we wait a long time this is needed for Mustek scanners, that |