[SCSI] qla2xxx: Stop unconditional completion of mailbox commands issued in...

[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>

drivers/scsi/qla2xxx/qla_nx.c

@@ -4075,8 +4075,11 @@ 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;
+					if (test_bit(MBX_INTR_WAIT,
+					    &ha->mbx_cmd_flags)) {
 						complete(&ha->mbx_intr_comp);
 					}
+				}
 				break;
 			}
 		}

drivers/scsi/qla2xxx/qla_os.c

@@ -4014,9 +4014,12 @@ 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");
+				if (test_bit(MBX_INTR_WAIT,
+				    &ha->mbx_cmd_flags)) {
 					complete(&ha->mbx_intr_comp);
 				}
 			}
+		}
 		qla2x00_free_irqs(vha);
 		pci_disable_device(pdev);
 		/* Return back all IOs */