diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2017-01-16 02:50:57 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-02-01 05:38:58 +0300 |
| commit | b15e791d0c51e778353777b3dd2993ee0a83388e (patch) | |
| tree | 23a83555aaba5988a158ce5ca81a45ee99a13d65 | |
| parent | 4ab2a7878fa56ae7581bf8a94049b355c730aef0 (diff) | |
| download | linux-b15e791d0c51e778353777b3dd2993ee0a83388e.tar.xz | |
scsi: ncr5380: Improve target selection robustness
Handle timeout or bus phase change errors that could occur when sending
the IDENTIFY message.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
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 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 518d10180a31..acc33440bca0 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -1165,8 +1165,16 @@ static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, data = tmp; phase = PHASE_MSGOUT; NCR5380_transfer_pio(instance, &phase, &len, &data); + if (len) { + NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); + cmd->result = DID_ERROR << 16; + complete_cmd(instance, cmd); + dsprintk(NDEBUG_SELECTION, instance, "IDENTIFY message transfer failed\n"); + cmd = NULL; + goto out; + } + dsprintk(NDEBUG_SELECTION, instance, "nexus established.\n"); - /* XXX need to handle errors here */ hostdata->connected = cmd; hostdata->busy[cmd->device->id] |= 1 << cmd->device->lun; |