scsi: NCR5380: Don't call dsprintk() following reselection interrupt (08267216) · Commits · 戴 / test

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>

drivers/scsi/NCR5380.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2023,8 +2023,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
		@@ -2037,6 +2035,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;
		}
		@@ -2048,6 +2047,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;
		}

Admin message