summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiridhar Malavali2012-08-22 20:21:33 +0200
committerJames Bottomley2012-09-24 10:10:54 +0200
commitc1114953f62db5d1807fc2b5ba405f71f248177a (patch)
treeba9406f2982947337fb4d1e5a9f2e96e5613c23d
parent[SCSI] qla2xxx: Fix incorrect status reporting on DIF errors. (diff)
downloadkernel-qcow2-linux-c1114953f62db5d1807fc2b5ba405f71f248177a.tar.gz
kernel-qcow2-linux-c1114953f62db5d1807fc2b5ba405f71f248177a.tar.xz
kernel-qcow2-linux-c1114953f62db5d1807fc2b5ba405f71f248177a.zip
[SCSI] qla2xxx: Don't toggle RISC interrupt bits after IRQ lines are attached.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_isr.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index c93cd6508347..2349d2ed48c3 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -2948,21 +2948,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: