Commit 7061dec4 authored Feb 06, 2015 by Ondrej Zary Committed by James Bottomley Apr 09, 2015

aha1542: Fix bus reset



Bus reset always fails because aha1542_reset waits for the controller to assert
the INIT bit (Mailbox Initialization Required) which it never does. This bit is
asserted only after host reset.

Remove the requirement for INIT bit (we really need only the IDLE bit).

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

parent 1b0224b0

drivers/scsi/aha1542.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -867,7 +867,7 @@ static int aha1542_reset(struct scsi_cmnd *cmd, u8 reset_cmd)
		outb(reset_cmd, CONTROL(cmd->device->host->io_port));

		if (!wait_mask(STATUS(cmd->device->host->io_port),
		STATMASK, INIT \| IDLE, STST \| DIAGF \| INVDCMD \| DF \| CDF, 0)) {
		STATMASK, IDLE, STST \| DIAGF \| INVDCMD \| DF \| CDF, 0)) {
		spin_unlock_irqrestore(sh->host_lock, flags);
		return FAILED;
		}

Admin message