diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 08:05:24 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-07 05:42:56 +0300 |
| commit | 1d3db59d59861481349437231c263b6c7a0eef78 (patch) | |
| tree | 3291622981ca55e023cd035e3a7431eed6d5ef31 | |
| parent | ae753a3387504daa11b8779a00d37923f971c6d0 (diff) | |
| download | linux-1d3db59d59861481349437231c263b6c7a0eef78.tar.xz | |
ncr5380: Always retry arbitration and selection
If NCR5380_select() returns -1, it means arbitration was lost or selection
failed and should be retried. If the main loop simply terminates when there
are still commands on the issue queue, they will remain queued until they
expire.
Fix this by clearing the 'done' flag after selection failure or lost
arbitration.
The "else break" clause in NCR5380_main() that gets removed here appears
to be a vestige of a long-gone loop that iterated over host instances.
See commit 491447e1fcff ("[PATCH] next NCR5380 updates") in
history/history.git.
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>
| -rw-r--r-- | drivers/scsi/NCR5380.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/atari_NCR5380.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 3ea8809600cc..6a030139b41f 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -1052,8 +1052,7 @@ static void NCR5380_main(struct work_struct *work) NCR5380_information_transfer(instance); dprintk(NDEBUG_MAIN, "scsi%d : main() : done set false\n", instance->host_no); done = 0; - } else - break; + } } while (!done); spin_unlock_irq(instance->host_lock); diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index 34cf4d938589..64ee92090de3 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c @@ -1181,6 +1181,7 @@ static void NCR5380_main(struct work_struct *work) #endif hostdata->retain_dma_intr--; local_irq_restore(flags); + done = 0; dprintk(NDEBUG_MAIN, "scsi%d: main(): select() failed, " "returned to issue_queue\n", HOSTNO); } |