| From 350d3c61a29402754c21dea2cdf3b3b09325567d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 27 Sep 2018 11:17:11 +1000 |
| Subject: scsi: NCR5380: Don't call dsprintk() following reselection interrupt |
| |
| From: Finn Thain <fthain@telegraphics.com.au> |
| |
| [ Upstream commit 08267216b3f8aa5adc204bdccf8deb72c1cd7665 ] |
| |
| The X3T9.2 specification (draft) says, under "6.1.4.1 RESELECTION", |
| |
| ... The reselected initiator shall then assert the BSY signal |
| within a selection abort time of its most recent detection of being |
| reselected; this is required for correct operation of the time-out |
| procedure. |
| |
| The selection abort time is only 200 us which may be insufficient time for a |
| printk() call. Move the diagnostics to the error paths. |
| |
| Tested-by: Michael Schmitz <schmitzmic@gmail.com> |
| Signed-off-by: Finn Thain <fthain@telegraphics.com.au> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/scsi/NCR5380.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c |
| index 227ceb5197555..5c3ffb466bb10 100644 |
| --- a/drivers/scsi/NCR5380.c |
| +++ b/drivers/scsi/NCR5380.c |
| @@ -2015,8 +2015,6 @@ static void NCR5380_reselect(struct Scsi_Host *instance) |
| return; |
| } |
| |
| - dsprintk(NDEBUG_RESELECTION, instance, "reselect\n"); |
| - |
| /* |
| * At this point, we have detected that our SCSI ID is on the bus, |
| * SEL is true and BSY was false for at least one bus settle delay |
| @@ -2029,6 +2027,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) |
| NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_BSY); |
| if (NCR5380_poll_politely(hostdata, |
| STATUS_REG, SR_SEL, 0, 2 * HZ) < 0) { |
| + shost_printk(KERN_ERR, instance, "reselect: !SEL timeout\n"); |
| NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); |
| return; |
| } |
| @@ -2040,6 +2039,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) |
| |
| if (NCR5380_poll_politely(hostdata, |
| STATUS_REG, SR_REQ, SR_REQ, 2 * HZ) < 0) { |
| + shost_printk(KERN_ERR, instance, "reselect: REQ timeout\n"); |
| do_abort(instance); |
| return; |
| } |
| -- |
| 2.20.1 |
| |
