Oracle bug: 8746702

Based on aed10881129c52f0e5dc1c96ac706b5ce7708a13:
ISP24xx and above must query the host-status register, not HCCR.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

--- linux-2.6.18.i686/drivers/scsi/qla2xxx/qla_dbg.c.orig	2010-03-29 10:35:19.587142000 -0700
+++ linux-2.6.18.i686/drivers/scsi/qla2xxx/qla_dbg.c	2010-03-29 10:42:10.060102000 -0700
@@ -174,7 +174,7 @@ qla24xx_pause_risc(struct device_reg_24x
 
 	WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_PAUSE);
 	for (cnt = 30000;
-	    (RD_REG_DWORD(&reg->host_status) & HCCRX_RISC_PAUSE) == 0 &&
+	    (RD_REG_DWORD(&reg->host_status) & HSRX_RISC_PAUSED) == 0 &&
 	    rval == QLA_SUCCESS; cnt--) {
 		if (cnt)
 			udelay(100);
--- linux-2.6.18.i686/drivers/scsi/qla2xxx/qla_fw.h.orig	2010-03-29 10:35:23.495002000 -0700
+++ linux-2.6.18.i686/drivers/scsi/qla2xxx/qla_fw.h	2010-03-29 10:43:19.609066000 -0700
@@ -864,7 +864,6 @@ struct device_reg_24xx {
 					/* HCCR statuses. */
 #define HCCRX_HOST_INT		BIT_6	/* Host to RISC interrupt bit. */
 #define HCCRX_RISC_RESET	BIT_5	/* RISC Reset mode bit. */
-#define HCCRX_RISC_PAUSE	BIT_4	/* RISC Pause mode bit. */
 					/* HCCR commands. */
 					/* NOOP. */
 #define HCCRX_NOOP		0x00000000