From 39751ed301c1a65588e17b69b78e9c4b47e16492 Mon Sep 17 00:00:00 2001 From: Giridhar Malavali Date: Wed, 22 Aug 2012 14:21:33 -0400 Subject: [PATCH] --- yaml --- r: 328865 b: refs/heads/master c: c1114953f62db5d1807fc2b5ba405f71f248177a h: refs/heads/master i: 328863: 420c19fa760424b06260be1810557a7e9120d4d8 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_isr.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 18d8e6557f05..9fcd76768c50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb6e4668320c49d2b7483e6104a674fafcaa30c9 +refs/heads/master: c1114953f62db5d1807fc2b5ba405f71f248177a diff --git a/trunk/drivers/scsi/qla2xxx/qla_isr.c b/trunk/drivers/scsi/qla2xxx/qla_isr.c index c93cd6508347..2349d2ed48c3 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_isr.c +++ b/trunk/drivers/scsi/qla2xxx/qla_isr.c @@ -2948,21 +2948,9 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) 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(®->isp24.hccr, HCCRX_CLR_HOST_INT); - WRT_REG_DWORD(®->isp24.hccr, HCCRX_CLR_RISC_INT); - } else { + if (!IS_FWI2_CAPABLE(ha)) WRT_REG_WORD(®->isp.semaphore, 0); - WRT_REG_WORD(®->isp.hccr, HCCR_CLR_RISC_INT); - WRT_REG_WORD(®->isp.hccr, HCCR_CLR_HOST_INT); - } spin_unlock_irq(&ha->hardware_lock); fail: