scsi: NCR5380: Don't call dsprintk() following reselection interrupt

[ 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>

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index a4856eeac26f6500c29b832b119764764afa4436..03f9ddbc37fbbc689b12df885dcb5e88d9611605 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2109,8 +2109,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
@@ -2123,6 +2121,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
        NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE | ICR_ASSERT_BSY);
        if (NCR5380_poll_politely(instance,
                                  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;
        }
@@ -2134,6 +2133,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance)
 
        if (NCR5380_poll_politely(instance,
                                  STATUS_REG, SR_REQ, SR_REQ, 2 * HZ) < 0) {
+               shost_printk(KERN_ERR, instance, "reselect: REQ timeout\n");
                do_abort(instance);
                return;
        }