[SCSI] qla2xxx: Perform FCoE context reset before trying adapter reset for ISP82xx.

For certain failures, try to recover first by doing FCoE context reset before
attempting big hammer approach(adpater reset).

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

1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index f040a2a70428..2f039e018eef 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -3612,7 +3612,8 @@ qla2x00_timer(scsi_qla_host_t *vha)
 
         /* Loop down handler. */
         if (atomic_read(&vha->loop_down_timer) > 0 &&
-            !(test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
+            !(test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags)) &&
+            !(test_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags))
                 && vha->flags.online) {
 
                 if (atomic_read(&vha->loop_down_timer) ==
@@ -3648,7 +3649,11 @@ qla2x00_timer(scsi_qla_host_t *vha)
                                         if (!(sfcp->flags & FCF_FCP2_DEVICE))
                                                 continue;
 
-                                        set_bit(ISP_ABORT_NEEDED,
+                                        if (IS_QLA82XX(ha))
+                                                set_bit(FCOE_CTX_RESET_NEEDED,
+                                                        &vha->dpc_flags);
+                                        else
+                                                set_bit(ISP_ABORT_NEEDED,
                                                         &vha->dpc_flags);
                                         break;
                                 }
@@ -3667,7 +3672,12 @@ qla2x00_timer(scsi_qla_host_t *vha)
                                 qla_printk(KERN_WARNING, ha,
                                     "Loop down - aborting ISP.\n");
 
-                                set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+                                if (IS_QLA82XX(ha))
+                                        set_bit(FCOE_CTX_RESET_NEEDED,
+                                                &vha->dpc_flags);
+                                else
+                                        set_bit(ISP_ABORT_NEEDED,
+                                                &vha->dpc_flags);
                         }
                 }
                 DEBUG3(printk("scsi(%ld): Loop Down - seconds remaining %d\n",