diff options
| author |   Finn Thain <fthain@telegraphics.com.au> | 2016-01-03 16:05:34 +1100 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2016-01-06 21:42:58 -0500 |
| commit | 80d3eb6df46603e0b7e9a7361fe5b98383182c7f (patch) | |
| tree | 077f7b114442133ba3fee66ecb992df74ed3975d /drivers/scsi/NCR5380.c | |
| parent | ncr5380: Fix bus phase in do_abort() (diff) | |
| download | linux-dev-80d3eb6df46603e0b7e9a7361fe5b98383182c7f.tar.xz linux-dev-80d3eb6df46603e0b7e9a7361fe5b98383182c7f.zip | |
atari_NCR5380: Set do_abort() timeouts
Use timeouts in do_abort() in atari_NCR5380.c instead of infinite loops.
Also fix the kernel-doc comment. Keep the two core driver forks in sync.
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 | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 334d253fe75a..973ea5189dd4 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -1458,16 +1458,12 @@ static void do_reset(struct Scsi_Host *instance) local_irq_restore(flags); } -/* - * Function : do_abort (Scsi_Host *host) - * - * Purpose : abort the currently established nexus. Should only be - * called from a routine which can drop into a - * - * Returns : 0 on success, -1 on failure. +/** + * do_abort - abort the currently established nexus by going to + * MESSAGE OUT phase and sending an ABORT message. + * @instance: relevant scsi host instance * - * Locks: queue lock held by caller - * FIXME: sort this out and get new_eh running + * Returns 0 on success, -1 on failure. */ static int do_abort(struct Scsi_Host *instance) @@ -1489,9 +1485,9 @@ static int do_abort(struct Scsi_Host *instance) * the target sees, so we just handshake. */ - rc = NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, 60 * HZ); + rc = NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, SR_REQ, 10 * HZ); if (rc < 0) - return -1; + goto timeout; tmp = NCR5380_read(STATUS_REG) & PHASE_MASK; @@ -1500,9 +1496,9 @@ static int do_abort(struct Scsi_Host *instance) if (tmp != PHASE_MSGOUT) { NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN | ICR_ASSERT_ACK); rc = NCR5380_poll_politely(instance, STATUS_REG, SR_REQ, 0, 3 * HZ); - NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN); if (rc < 0) - return -1; + goto timeout; + NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_ATN); } tmp = ABORT; msgptr = &tmp; @@ -1516,6 +1512,10 @@ static int do_abort(struct Scsi_Host *instance) */ return len ? -1 : 0; + +timeout: + NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); + return -1; } #if defined(REAL_DMA) || defined(PSEUDO_DMA) || defined (REAL_DMA_POLL) |