lpfc: Fix Device discovery failures during switch reboot test.

[ Upstream commit 342b59caa66240b670285d519fdfe2c44289b516 ]

When the switch is rebooted, the lpfc driver fails to log
into the fabric, and Unexpected timeout message is seen.

Fix: Do not issue RegVFI if the FLOGI was internally aborted.

Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com>
Signed-off-by: James Smart <james.smart@avagotech.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 0e5b3584e9184dccd8f6290286a1a6bb89faaf60..4da8963315c7b264d4773939fe0243ddd75f675f 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1068,7 +1068,10 @@ stop_rr_fcf_flogi:
                                        lpfc_sli4_unreg_all_rpis(vport);
                                }
                        }
-                       lpfc_issue_reg_vfi(vport);
+
+                       /* Do not register VFI if the driver aborted FLOGI */
+                       if (!lpfc_error_lost_link(irsp))
+                               lpfc_issue_reg_vfi(vport);
                        lpfc_nlp_put(ndlp);
                        goto out;
                }