From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Wed, 8 Aug 2012 14:21:28 +0000 (-0700)
Subject: qla2xxx: Don't toggle RISC interrupt bits after IRQ lines are attached.
X-Git-Tag: v2.6.39-400.9.0~396
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=25c47bab1116c0893a268d79a10526cf953e6eb4;p=users%2Fjedix%2Flinux-maple.git

qla2xxx: Don't toggle RISC interrupt bits after IRQ lines are attached.

JIRA Key: V2632FC-246.

Acked-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 70033a02a547..9131104e700b 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2908,21 +2908,9 @@ skip_msi:
 
 clear_risc_ints:
 
-	/*
-	 * FIXME: Noted that 8014s were being dropped during NK testing.
-	 * Timing deltas during MSI-X/INTa transitions?
-	 */
-	if (IS_QLA81XX(ha) || IS_QLA82XX(ha) || IS_QLA83XX(ha))
-		goto fail;
 	spin_lock_irq(&ha->hardware_lock);
-	if (IS_FWI2_CAPABLE(ha)) {
-		WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_HOST_INT);
-		WRT_REG_DWORD(&reg->isp24.hccr, HCCRX_CLR_RISC_INT);
-	} else {
+	if (!IS_FWI2_CAPABLE(ha))
 		WRT_REG_WORD(&reg->isp.semaphore, 0);
-		WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_RISC_INT);
-		WRT_REG_WORD(&reg->isp.hccr, HCCR_CLR_HOST_INT);
-	}
 	spin_unlock_irq(&ha->hardware_lock);
 
 fail: