Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf13b083 authored Jan 03, 2016 by Finn Thain Committed by Martin K. Petersen Jan 06, 2016

ncr5380: Keep BSY asserted when entering SELECTION phase



NCR5380.c is not compliant with the SCSI-2 standard (at least, not with
the draft revision 10L that I have to refer to). The selection algorithm
in atari_NCR5380.c is correct, so use that.

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>

parent 1f1b0c74

drivers/scsi/NCR5380.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1236,7 +1236,13 @@ static int NCR5380_select(struct Scsi_Host instance, struct scsi_cmnd cmd)
		dprintk(NDEBUG_ARBITRATION, "scsi%d : lost arbitration, deasserting MR_ARBITRATE\n", instance->host_no);
		return -1;
		}
		NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE \| ICR_ASSERT_SEL);

		/* After/during arbitration, BSY should be asserted.
		* IBM DPES-31080 Version S31Q works now
		* Tnx to Thomas_Roesch@m2.maus.de for finding this! (Roman)
		*/
		NCR5380_write(INITIATOR_COMMAND_REG,
		ICR_BASE \| ICR_ASSERT_SEL \| ICR_ASSERT_BSY);

		if (!(hostdata->flags & FLAG_DTC3181E) &&
		/* RvC: DTC3181E has some trouble with this

drivers/scsi/atari_NCR5380.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1480,9 +1480,10 @@ static int NCR5380_select(struct Scsi_Host instance, struct scsi_cmnd cmd)
		return -1;
		}

		/* after/during arbitration, BSY should be asserted.
		IBM DPES-31080 Version S31Q works now */
		/* Tnx to Thomas_Roesch@m2.maus.de for finding this! (Roman) */
		/* After/during arbitration, BSY should be asserted.
		* IBM DPES-31080 Version S31Q works now
		* Tnx to Thomas_Roesch@m2.maus.de for finding this! (Roman)
		*/
		NCR5380_write(INITIATOR_COMMAND_REG,
		ICR_BASE \| ICR_ASSERT_SEL \| ICR_ASSERT_BSY);