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>
This commit is contained in:
parent
ae753a3387
commit
1d3db59d59
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue