[SCSI] qla2xxx: Update to AER support, do early abort commands.

Currently the IOs are returned back in slot reset, this
could be late and can cause error handler to invoke.
If error handler invokes, eh_abort fails and escalate to
device/bus/host resets causing issues.
The commands need to be returned back to upper layer in
io_error_detected.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

2 files changed, 13 insertions, 9 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 9f71226e0a3e..f2da5c5dacdd 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3835,17 +3835,19 @@ qla2x00_abort_isp_cleanup(scsi_qla_host_t *vha)
                             LOOP_DOWN_TIME);
         }
 
-        /* Make sure for ISP 82XX IO DMA is complete */
-        if (IS_QLA82XX(ha)) {
-                if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0,
-                        WAIT_HOST) == QLA_SUCCESS) {
-                        DEBUG2(qla_printk(KERN_INFO, ha,
-                        "Done wait for pending commands\n"));
+        if (!ha->flags.eeh_busy) {
+                /* Make sure for ISP 82XX IO DMA is complete */
+                if (IS_QLA82XX(ha)) {
+                        if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0,
+                                WAIT_HOST) == QLA_SUCCESS) {
+                                DEBUG2(qla_printk(KERN_INFO, ha,
+                                "Done wait for pending commands\n"));
+                        }
                 }
-        }
 
-        /* Requeue all commands in outstanding command list. */
-        qla2x00_abort_all_cmds(vha, DID_RESET << 16);
+                /* Requeue all commands in outstanding command list. */
+                qla2x00_abort_all_cmds(vha, DID_RESET << 16);
+        }
 }
 
 /*
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index cfa55827a101..e1782f771400 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3773,6 +3773,8 @@ qla2xxx_pci_error_detected(struct pci_dev *pdev, pci_channel_state_t state)
                 }
                 qla2x00_free_irqs(vha);
                 pci_disable_device(pdev);
+                /* Return back all IOs */
+                qla2x00_abort_all_cmds(vha, DID_RESET << 16);
                 return PCI_ERS_RESULT_NEED_RESET;
         case pci_channel_io_perm_failure:
                 ha->flags.pci_channel_io_perm_failure = 1;