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

Commit c3b058af authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct staging of RISC while attempting to pause. 



There's no need to reset the RISC prior to pausing.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 05236a05

drivers/scsi/qla2xxx/qla_dbg.c

+10 −13
Original line number Diff line number Diff line
@@ -172,20 +172,17 @@ qla24xx_pause_risc(struct device_reg_24xx __iomem *reg) 
	int rval = QLA_SUCCESS;

	uint32_t cnt;



	if ((RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE) == 0) {

		WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_RESET |

		    HCCRX_CLR_HOST_INT);

		RD_REG_DWORD(&reg->hccr);		/* PCI Posting. */

	if (RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE)

		return rval;



	WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);

		for (cnt = 30000;

		    (RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE) == 0 &&

	for (cnt = 30000; (RD_REG_DWORD(&reg->hccr) & HCCRX_RISC_PAUSE) == 0 &&

	    rval == QLA_SUCCESS; cnt--) {

		if (cnt)

			udelay(100);

		else

			rval = QLA_FUNCTION_TIMEOUT;

	}

	}



	return rval;

}