From: Finn Thain Date: Thu, 27 Sep 2018 01:17:11 +0000 (+1000) Subject: scsi: NCR5380: Handle BUS FREE during reselection X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7459de2fceee874ba1ba2ba7d825290d9d141a54;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git scsi: NCR5380: Handle BUS FREE during reselection [ Upstream commit ca694afad707cb3ae2fdef3b28454444d9ac726e ] The X3T9.2 specification (draft) says, under "6.1.4.2 RESELECTION time-out procedure", that a target may assert RST or go to BUS FREE phase if the initiator does not respond within 200 us. Something like this has been observed with AztecMonster II target. When it happens, all we can do is wait for the target to try again. Tested-by: Michael Schmitz Signed-off-by: Finn Thain Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 48f123601f57..a85c5155fcf4 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -2045,6 +2045,9 @@ static void NCR5380_reselect(struct Scsi_Host *instance) if (NCR5380_poll_politely(hostdata, STATUS_REG, SR_REQ, SR_REQ, 2 * HZ) < 0) { + if ((NCR5380_read(STATUS_REG) & (SR_BSY | SR_SEL)) == 0) + /* BUS FREE phase */ + return; shost_printk(KERN_ERR, instance, "reselect: REQ timeout\n"); do_abort(instance); return;