aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorGiridhar Malavali <giridhar.malavali@qlogic.com>2011-11-18 09:02:13 -0800
committerJames Bottomley <JBottomley@Parallels.com>2011-12-12 12:34:55 +0400
commit841c5e5cee140115b03355c39e4c3f1798ec34bc (patch)
tree5d5bf0c8b24aa66183792a43e7786764c34345a7 /drivers/scsi
parent0cd33fcfb54f2eb053ead3cca35ad9775fc01301 (diff)
[SCSI] qla2xxx: Stop unconditional completion of mailbox commands issued in interrupt mode during firmware hang.
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_nx.c5
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 94bded5ddce..d2005c3c824 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -4075,7 +4075,10 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
ha->flags.isp82xx_fw_hung = 1;
if (ha->flags.mbox_busy) {
ha->flags.mbox_int = 1;
- complete(&ha->mbx_intr_comp);
+ if (test_bit(MBX_INTR_WAIT,
+ &ha->mbx_cmd_flags)) {
+ complete(&ha->mbx_intr_comp);
+ }
}
break;
}
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 01c87004b21..abec1dd3119 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -4014,7 +4014,10 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
ql_dbg(ql_dbg_aer, vha, 0x9001,
"Due to pci channel io frozen, doing premature "
"completion of mbx command.\n");
- complete(&ha->mbx_intr_comp);
+ if (test_bit(MBX_INTR_WAIT,
+ &ha->mbx_cmd_flags)) {
+ complete(&ha->mbx_intr_comp);
+ }
}
}
qla2x00_free_irqs(vha);