[SCSI] qla2xxx: Do link initialization on get loop id failure.

To avoid continually doing ISP resets when get loop id fails to
obtain the adapter loop id, first try to do a link initialization.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index bbf5688885f1..97f268433b9f 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2207,6 +2207,7 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
         char            connect_type[22];
         struct qla_hw_data *ha = vha->hw;
         unsigned long flags;
+        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
 
         /* Get host addresses. */
         rval = qla2x00_get_adapter_id(vha,
@@ -2220,6 +2221,13 @@ qla2x00_configure_hba(scsi_qla_host_t *vha)
                 } else {
                         ql_log(ql_log_warn, vha, 0x2009,
                             "Unable to get host loop ID.\n");
+                        if (IS_FWI2_CAPABLE(ha) && (vha == base_vha) &&
+                            (rval == QLA_COMMAND_ERROR && loop_id == 0x1b)) {
+                                ql_log(ql_log_warn, vha, 0x1151,
+                                    "Doing link init.\n");
+                                if (qla24xx_link_initialize(vha) == QLA_SUCCESS)
+                                        return rval;
+                        }
                         set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
                 }
                 return (rval);