[PATCH v2 23/72] ncr5380: Always retry arbitration and selection

Finn Thain
2015-12-06T04:00:59Z

[-- Attachment #1: ncr5380-retry-selection-phase --]
[-- Type: text/plain, Size: 1819 bytes --]

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>

---
drivers/scsi/NCR5380.c | 3 +--
drivers/scsi/atari_NCR5380.c | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux/drivers/scsi/NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/NCR5380.c 2015-12-06 12:29:56.000000000 +1100
+++ linux/drivers/scsi/NCR5380.c 2015-12-06 12:30:00.000000000 +1100
@@ -1047,8 +1047,7 @@ static void NCR5380_main(struct work_str
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);
Index: linux/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux.orig/drivers/scsi/atari_NCR5380.c 2015-12-06 12:29:56.000000000 +1100
+++ linux/drivers/scsi/atari_NCR5380.c 2015-12-06 12:30:00.000000000 +1100
@@ -1176,6 +1176,7 @@ static void NCR5380_main(struct work_str
#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);
}