1 files changed, 112 insertions, 45 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 091f68e5cb7..678a4b11059 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1074,6 +1074,12 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
         mempool_free(pmb, phba->mbox_mem_pool);
 
+        /* don't perform discovery for SLI4 loopback diagnostic test */
+        if ((phba->sli_rev == LPFC_SLI_REV4) &&
+            !(phba->hba_flag & HBA_FCOE_MODE) &&
+            (phba->link_flag & LS_LOOPBACK_MODE))
+                return;
+
         if (phba->fc_topology == LPFC_TOPOLOGY_LOOP &&
             vport->fc_flag & FC_PUBLIC_LOOP &&
             !(vport->fc_flag & FC_LBIT)) {
@@ -2646,9 +2652,14 @@ lpfc_init_vfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
 {
         struct lpfc_vport *vport = mboxq->vport;
 
-        /* VFI not supported on interface type 0, just do the flogi */
-        if (mboxq->u.mb.mbxStatus && (bf_get(lpfc_sli_intf_if_type,
-            &phba->sli4_hba.sli_intf) != LPFC_SLI_INTF_IF_TYPE_0)) {
+        /*
+         * VFI not supported on interface type 0, just do the flogi
+         * Also continue if the VFI is in use - just use the same one.
+         */
+        if (mboxq->u.mb.mbxStatus &&
+            (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) !=
+                        LPFC_SLI_INTF_IF_TYPE_0) &&
+            mboxq->u.mb.mbxStatus != MBX_VFI_IN_USE) {
                 lpfc_printf_vlog(vport, KERN_ERR,
                                 LOG_MBOX,
                                 "2891 Init VFI mailbox failed 0x%x\n",
@@ -2842,10 +2853,10 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                         lpfc_disc_list_loopmap(vport);
                         /* Start discovery */
                         lpfc_disc_start(vport);
-                        goto fail_free_mem;
+                        goto out_free_mem;
                 }
                 lpfc_vport_set_state(vport, FC_VPORT_FAILED);
-                goto fail_free_mem;
+                goto out_free_mem;
         }
         /* The VPI is implicitly registered when the VFI is registered */
         spin_lock_irq(shost->host_lock);
@@ -2855,10 +2866,16 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
         vport->fc_flag &= ~FC_VPORT_NEEDS_INIT_VPI;
         spin_unlock_irq(shost->host_lock);
 
+        /* In case SLI4 FC loopback test, we are ready */
+        if ((phba->sli_rev == LPFC_SLI_REV4) &&
+            (phba->link_flag & LS_LOOPBACK_MODE)) {
+                phba->link_state = LPFC_HBA_READY;
+                goto out_free_mem;
+        }
+
         if (vport->port_state == LPFC_FABRIC_CFG_LINK) {
                 /* For private loop just start discovery and we are done. */
                 if ((phba->fc_topology == LPFC_TOPOLOGY_LOOP) &&
-                    (phba->alpa_map[0] == 0) &&
                     !(vport->fc_flag & FC_PUBLIC_LOOP)) {
                         /* Use loop map to make discovery list */
                         lpfc_disc_list_loopmap(vport);
@@ -2870,7 +2887,7 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                 }
         }
 
-fail_free_mem:
+out_free_mem:
         mempool_free(mboxq, phba->mbox_mem_pool);
         lpfc_mbuf_free(phba, dmabuf->virt, dmabuf->phys);
         kfree(dmabuf);
@@ -2923,6 +2940,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
 {
         struct lpfc_vport *vport = phba->pport;
         LPFC_MBOXQ_t *sparam_mbox, *cfglink_mbox = NULL;
+        struct Scsi_Host *shost;
         int i;
         struct lpfc_dmabuf *mp;
         int rc;
@@ -2946,6 +2964,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
         phba->fc_topology = bf_get(lpfc_mbx_read_top_topology, la);
         phba->link_flag &= ~LS_NPIV_FAB_SUPPORTED;
 
+        shost = lpfc_shost_from_vport(vport);
         if (phba->fc_topology == LPFC_TOPOLOGY_LOOP) {
                 phba->sli3_options &= ~LPFC_SLI3_NPIV_ENABLED;
 
@@ -2957,8 +2976,11 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
                                 "1309 Link Up Event npiv not supported in loop "
                                 "topology\n");
                                 /* Get Loop Map information */
-                if (bf_get(lpfc_mbx_read_top_il, la))
+                if (bf_get(lpfc_mbx_read_top_il, la)) {
+                        spin_lock_irq(shost->host_lock);
                         vport->fc_flag |= FC_LBIT;
+                        spin_unlock_irq(shost->host_lock);
+                }
 
                 vport->fc_myDID = bf_get(lpfc_mbx_read_top_alpa_granted, la);
                 i = la->lilpBde64.tus.f.bdeSize;
@@ -3003,11 +3025,13 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)
         } else {
                 if (!(phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)) {
                         if (phba->max_vpi && phba->cfg_enable_npiv &&
-                           (phba->sli_rev == 3))
+                           (phba->sli_rev >= LPFC_SLI_REV3))
                                 phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
                 }
                 vport->fc_myDID = phba->fc_pref_DID;
+                spin_lock_irq(shost->host_lock);
                 vport->fc_flag |= FC_LBIT;
+                spin_unlock_irq(shost->host_lock);
         }
         spin_unlock_irq(&phba->hbalock);
 
@@ -3224,15 +3248,14 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         } else if (bf_get(lpfc_mbx_read_top_att_type, la) ==
                    LPFC_ATT_LINK_DOWN) {
                 phba->fc_stat.LinkDown++;
-                if (phba->link_flag & LS_LOOPBACK_MODE) {
+                if (phba->link_flag & LS_LOOPBACK_MODE)
                         lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                 "1308 Link Down Event in loop back mode "
                                 "x%x received "
                                 "Data: x%x x%x x%x\n",
                                 la->eventTag, phba->fc_eventTag,
                                 phba->pport->port_state, vport->fc_flag);
-                }
-                else {
+                else
                         lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
                                 "1305 Link Down Event x%x received "
                                 "Data: x%x x%x x%x x%x x%x\n",
@@ -3240,7 +3263,6 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                                 phba->pport->port_state, vport->fc_flag,
                                 bf_get(lpfc_mbx_read_top_mm, la),
                                 bf_get(lpfc_mbx_read_top_fa, la));
-                }
                 lpfc_mbx_issue_link_down(phba);
         }
         if ((bf_get(lpfc_mbx_read_top_mm, la)) &&
@@ -3594,6 +3616,7 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         MAILBOX_t *mb = &pmb->u.mb;
         struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);
         struct lpfc_nodelist *ndlp;
+        struct Scsi_Host *shost;
 
         ndlp = (struct lpfc_nodelist *) pmb->context2;
         pmb->context1 = NULL;
@@ -3639,8 +3662,12 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                  * vport discovery */
                 if (!(vport->fc_flag & FC_LOGO_RCVD_DID_CHNG))
                         lpfc_start_fdiscs(phba);
-                else
+                else {
+                        shost = lpfc_shost_from_vport(vport);
+                        spin_lock_irq(shost->host_lock);
                         vport->fc_flag &= ~FC_LOGO_RCVD_DID_CHNG ;
+                        spin_unlock_irq(shost->host_lock);
+                }
                 lpfc_do_scr_ns_plogi(phba, vport);
         }
 
@@ -5353,6 +5380,73 @@ lpfc_findnode_wwpn(struct lpfc_vport *vport, struct lpfc_name *wwpn)
         return ndlp;
 }
 
+/*
+ * This routine looks up the ndlp lists for the given RPI. If the rpi
+ * is found, the routine returns the node element list pointer else
+ * return NULL.
+ */
+struct lpfc_nodelist *
+lpfc_findnode_rpi(struct lpfc_vport *vport, uint16_t rpi)
+{
+        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+        struct lpfc_nodelist *ndlp;
+
+        spin_lock_irq(shost->host_lock);
+        ndlp = __lpfc_findnode_rpi(vport, rpi);
+        spin_unlock_irq(shost->host_lock);
+        return ndlp;
+}
+
+/**
+ * lpfc_find_vport_by_vpid - Find a vport on a HBA through vport identifier
+ * @phba: pointer to lpfc hba data structure.
+ * @vpi: the physical host virtual N_Port identifier.
+ *
+ * This routine finds a vport on a HBA (referred by @phba) through a
+ * @vpi. The function walks the HBA's vport list and returns the address
+ * of the vport with the matching @vpi.
+ *
+ * Return code
+ *    NULL - No vport with the matching @vpi found
+ *    Otherwise - Address to the vport with the matching @vpi.
+ **/
+struct lpfc_vport *
+lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)
+{
+        struct lpfc_vport *vport;
+        unsigned long flags;
+        int i = 0;
+
+        /* The physical ports are always vpi 0 - translate is unnecessary. */
+        if (vpi > 0) {
+                /*
+                 * Translate the physical vpi to the logical vpi.  The
+                 * vport stores the logical vpi.
+                 */
+                for (i = 0; i < phba->max_vpi; i++) {
+                        if (vpi == phba->vpi_ids[i])
+                                break;
+                }
+
+                if (i >= phba->max_vpi) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                                         "2936 Could not find Vport mapped "
+                                         "to vpi %d\n", vpi);
+                        return NULL;
+                }
+        }
+
+        spin_lock_irqsave(&phba->hbalock, flags);
+        list_for_each_entry(vport, &phba->port_list, listentry) {
+                if (vport->vpi == i) {
+                        spin_unlock_irqrestore(&phba->hbalock, flags);
+                        return vport;
+                }
+        }
+        spin_unlock_irqrestore(&phba->hbalock, flags);
+        return NULL;
+}
+
 void
 lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
               uint32_t did)
@@ -5599,7 +5693,7 @@ out:
  *
  * This function frees memory associated with the mailbox command.
  */
-static void
+void
 lpfc_unregister_vfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
 {
         struct lpfc_vport *vport = mboxq->vport;
@@ -5651,7 +5745,6 @@ lpfc_unregister_fcfi_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
 int
 lpfc_unregister_fcf_prep(struct lpfc_hba *phba)
 {
-        LPFC_MBOXQ_t *mbox;
         struct lpfc_vport **vports;
         struct lpfc_nodelist *ndlp;
         struct Scsi_Host *shost;
@@ -5687,35 +5780,9 @@ lpfc_unregister_fcf_prep(struct lpfc_hba *phba)
         /* Cleanup any outstanding ELS commands */
         lpfc_els_flush_all_cmd(phba);
 
-        /* Unregister VFI */
-        mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-        if (!mbox) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,
-                                "2556 UNREG_VFI mbox allocation failed"
-                                "HBA state x%x\n", phba->pport->port_state);
-                return -ENOMEM;
-        }
-
-        lpfc_unreg_vfi(mbox, phba->pport);
-        mbox->vport = phba->pport;
-        mbox->mbox_cmpl = lpfc_unregister_vfi_cmpl;
-
-        rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);
-        if (rc == MBX_NOT_FINISHED) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY|LOG_MBOX,
-                                "2557 UNREG_VFI issue mbox failed rc x%x "
-                                "HBA state x%x\n",
-                                rc, phba->pport->port_state);
-                mempool_free(mbox, phba->mbox_mem_pool);
-                return -EIO;
-        }
-
-        shost = lpfc_shost_from_vport(phba->pport);
-        spin_lock_irq(shost->host_lock);
-        phba->pport->fc_flag &= ~FC_VFI_REGISTERED;
-        spin_unlock_irq(shost->host_lock);
-
-        return 0;
+        /* Unregister the physical port VFI */
+        rc = lpfc_issue_unreg_vfi(phba->pport);
+        return rc;
 }
 
 /**