1 files changed, 132 insertions, 111 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index ae9d6f385a6c..c701e4d611a9 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -257,6 +257,10 @@ lpfc_ct_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *ctiocb)
 {
         struct lpfc_dmabuf *buf_ptr;
 
+        if (ctiocb->context_un.ndlp) {
+                lpfc_nlp_put(ctiocb->context_un.ndlp);
+                ctiocb->context_un.ndlp = NULL;
+        }
         if (ctiocb->context1) {
                 buf_ptr = (struct lpfc_dmabuf *) ctiocb->context1;
                 lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
@@ -314,6 +318,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
         /* Save for completion so we can release these resources */
         geniocb->context1 = (uint8_t *) inp;
         geniocb->context2 = (uint8_t *) outp;
+        geniocb->context_un.ndlp = ndlp;
 
         /* Fill in payload, bp points to frame payload */
         icmd->ulpCommand = CMD_GEN_REQUEST64_CR;
@@ -341,11 +346,11 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp,
         }
 
         /* Issue GEN REQ IOCB for NPORT <did> */
-        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "%d (%d):0119 Issue GEN REQ IOCB to NPORT x%x "
-                        "Data: x%x x%x\n", phba->brd_no, vport->vpi,
-                        ndlp->nlp_DID, icmd->ulpIoTag,
-                        vport->port_state);
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+                         "0119 Issue GEN REQ IOCB to NPORT x%x "
+                         "Data: x%x x%x\n",
+                         ndlp->nlp_DID, icmd->ulpIoTag,
+                         vport->port_state);
         geniocb->iocb_cmpl = cmpl;
         geniocb->drvrTimeout = icmd->ulpTimeout + LPFC_DRVR_TIMEOUT;
         geniocb->vport = vport;
@@ -390,17 +395,19 @@ lpfc_ct_cmd(struct lpfc_vport *vport, struct lpfc_dmabuf *inmp,
         return 0;
 }
 
-static struct lpfc_vport *
+struct lpfc_vport *
 lpfc_find_vport_by_did(struct lpfc_hba *phba, uint32_t did) {
-
         struct lpfc_vport *vport_curr;
+        unsigned long flags;
 
+        spin_lock_irqsave(&phba->hbalock, flags);
         list_for_each_entry(vport_curr, &phba->port_list, listentry) {
-                if ((vport_curr->fc_myDID) &&
-                        (vport_curr->fc_myDID == did))
+                if ((vport_curr->fc_myDID) && (vport_curr->fc_myDID == did)) {
+                        spin_unlock_irqrestore(&phba->hbalock, flags);
                         return vport_curr;
+                }
         }
-
+        spin_unlock_irqrestore(&phba->hbalock, flags);
         return NULL;
 }
 
@@ -449,10 +456,10 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                          */
                         if ((Did != vport->fc_myDID) &&
                             ((lpfc_find_vport_by_did(phba, Did) == NULL) ||
-                             phba->cfg_peer_port_login)) {
+                             vport->cfg_peer_port_login)) {
                                 if ((vport->port_type != LPFC_NPIV_PORT) ||
                                     (vport->fc_flag & FC_RFF_NOT_SUPPORTED) ||
-                                    (!phba->cfg_vport_restrict_login)) {
+                                    (!vport->cfg_restrict_login)) {
                                         ndlp = lpfc_setup_disc_node(vport, Did);
                                         if (ndlp) {
                                                 lpfc_debugfs_disc_trc(vport,
@@ -462,14 +469,13 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                                 Did, ndlp->nlp_flag,
                                                 vport->fc_flag);
 
-                                                lpfc_printf_log(phba, KERN_INFO,
+                                                lpfc_printf_vlog(vport,
+                                                        KERN_INFO,
                                                         LOG_DISCOVERY,
-                                                        "%d (%d):0238 Process "
+                                                        "0238 Process "
                                                         "x%x NameServer Rsp"
                                                         "Data: x%x x%x x%x\n",
-                                                        phba->brd_no,
-                                                        vport->vpi, Did,
-                                                        ndlp->nlp_flag,
+                                                        Did, ndlp->nlp_flag,
                                                         vport->fc_flag,
                                                         vport->fc_rscn_id_cnt);
                                         } else {
@@ -480,14 +486,13 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                                 Did, vport->fc_flag,
                                                 vport->fc_rscn_id_cnt);
 
-                                                lpfc_printf_log(phba, KERN_INFO,
+                                                lpfc_printf_vlog(vport,
+                                                        KERN_INFO,
                                                         LOG_DISCOVERY,
-                                                        "%d (%d):0239 Skip x%x "
+                                                        "0239 Skip x%x "
                                                         "NameServer Rsp Data: "
                                                         "x%x x%x\n",
-                                                        phba->brd_no,
-                                                        vport->vpi, Did,
-                                                        vport->fc_flag,
+                                                        Did, vport->fc_flag,
                                                         vport->fc_rscn_id_cnt);
                                         }
 
@@ -514,14 +519,13 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                                 Did, vport->fc_flag,
                                                 vport->fc_rscn_id_cnt);
 
-                                                lpfc_printf_log(phba, KERN_INFO,
+                                                lpfc_printf_vlog(vport,
+                                                        KERN_INFO,
                                                         LOG_DISCOVERY,
-                                                        "%d (%d):0245 Skip x%x "
+                                                        "0245 Skip x%x "
                                                         "NameServer Rsp Data: "
                                                         "x%x x%x\n",
-                                                        phba->brd_no,
-                                                        vport->vpi, Did,
-                                                        vport->fc_flag,
+                                                        Did, vport->fc_flag,
                                                         vport->fc_rscn_id_cnt);
                                         }
                                 }
@@ -549,8 +553,12 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         struct lpfc_dmabuf *bmp;
         struct lpfc_dmabuf *outp;
         struct lpfc_sli_ct_request *CTrsp;
+        struct lpfc_nodelist *ndlp;
         int rc;
 
+        /* First save ndlp, before we overwrite it */
+        ndlp = cmdiocb->context_un.ndlp;
+
         /* we pass cmdiocb to state machine which needs rspiocb as well */
         cmdiocb->context_un.rsp_iocb = rspiocb;
 
@@ -568,9 +576,8 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
 
         if (lpfc_els_chk_latt(vport) || lpfc_error_lost_link(irsp)) {
-                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                "%d (%d):0216 Link event during NS query\n",
-                                phba->brd_no, vport->vpi);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0216 Link event during NS query\n");
                 lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                 goto out;
         }
@@ -588,46 +595,61 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                                 goto out;
                 }
                 lpfc_vport_set_state(vport, FC_VPORT_FAILED);
-                lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
-                        "%d (%d):0257 GID_FT Query error: 0x%x 0x%x\n",
-                        phba->brd_no, vport->vpi, irsp->ulpStatus,
-                        vport->fc_ns_retry);
+                lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                 "0257 GID_FT Query error: 0x%x 0x%x\n",
+                                 irsp->ulpStatus, vport->fc_ns_retry);
         } else {
                 /* Good status, continue checking */
                 CTrsp = (struct lpfc_sli_ct_request *) outp->virt;
                 if (CTrsp->CommandResponse.bits.CmdRsp ==
                     be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {
-                        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                        "%d (%d):0208 NameServer Rsp "
-                                        "Data: x%x\n",
-                                        phba->brd_no, vport->vpi,
-                                        vport->fc_flag);
+                        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                         "0208 NameServer Rsp Data: x%x\n",
+                                         vport->fc_flag);
                         lpfc_ns_rsp(vport, outp,
                                     (uint32_t) (irsp->un.genreq64.bdl.bdeSize));
                 } else if (CTrsp->CommandResponse.bits.CmdRsp ==
                            be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) {
                         /* NameServer Rsp Error */
-                        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                        "%d (%d):0240 NameServer Rsp Error "
+                        if ((CTrsp->ReasonCode == SLI_CT_UNABLE_TO_PERFORM_REQ)
+                            && (CTrsp->Explanation == SLI_CT_NO_FC4_TYPES)) {
+                                lpfc_printf_vlog(vport, KERN_INFO,
+                                        LOG_DISCOVERY,
+                                        "0269 No NameServer Entries "
                                         "Data: x%x x%x x%x x%x\n",
-                                        phba->brd_no, vport->vpi,
                                         CTrsp->CommandResponse.bits.CmdRsp,
                                         (uint32_t) CTrsp->ReasonCode,
                                         (uint32_t) CTrsp->Explanation,
                                         vport->fc_flag);
 
-                        lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
+                                lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
+                                "GID_FT no entry  cmd:x%x rsn:x%x exp:x%x",
+                                (uint32_t)CTrsp->CommandResponse.bits.CmdRsp,
+                                (uint32_t) CTrsp->ReasonCode,
+                                (uint32_t) CTrsp->Explanation);
+                        } else {
+                                lpfc_printf_vlog(vport, KERN_INFO,
+                                        LOG_DISCOVERY,
+                                        "0240 NameServer Rsp Error "
+                                        "Data: x%x x%x x%x x%x\n",
+                                        CTrsp->CommandResponse.bits.CmdRsp,
+                                        (uint32_t) CTrsp->ReasonCode,
+                                        (uint32_t) CTrsp->Explanation,
+                                        vport->fc_flag);
+
+                                lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
                                 "GID_FT rsp err1  cmd:x%x rsn:x%x exp:x%x",
                                 (uint32_t)CTrsp->CommandResponse.bits.CmdRsp,
                                 (uint32_t) CTrsp->ReasonCode,
                                 (uint32_t) CTrsp->Explanation);
+                        }
+
 
                 } else {
                         /* NameServer Rsp Error */
-                        lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                        "%d (%d):0241 NameServer Rsp Error "
+                        lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                        "0241 NameServer Rsp Error "
                                         "Data: x%x x%x x%x x%x\n",
-                                        phba->brd_no, vport->vpi,
                                         CTrsp->CommandResponse.bits.CmdRsp,
                                         (uint32_t) CTrsp->ReasonCode,
                                         (uint32_t) CTrsp->Explanation,
@@ -661,11 +683,12 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 lpfc_disc_start(vport);
         }
 out:
+        cmdiocb->context_un.ndlp = ndlp; /* Now restore ndlp for free */
         lpfc_ct_free_iocb(phba, cmdiocb);
         return;
 }
 
-void
+static void
 lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                         struct lpfc_iocbq *rspiocb)
 {
@@ -695,40 +718,37 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                     be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {
                         if ((fbits & FC4_FEATURE_INIT) &&
                             !(fbits & FC4_FEATURE_TARGET)) {
-                                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                                "%d (%d):0245 Skip x%x GFF "
-                                                "NameServer Rsp Data: (init) "
-                                                "x%x x%x\n", phba->brd_no,
-                                                vport->vpi, did, fbits,
-                                                vport->fc_rscn_id_cnt);
+                                lpfc_printf_vlog(vport, KERN_INFO,
+                                                 LOG_DISCOVERY,
+                                                 "0270 Skip x%x GFF "
+                                                 "NameServer Rsp Data: (init) "
+                                                 "x%x x%x\n", did, fbits,
+                                                 vport->fc_rscn_id_cnt);
                                 goto out;
                         }
                 }
         }
         else {
-                lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                "%d (%d):0267 NameServer GFF Rsp"
-                                " x%x Error (%d %d) Data: x%x x%x\n",
-                                phba->brd_no, vport->vpi, did,
-                                irsp->ulpStatus, irsp->un.ulpWord[4],
-                                vport->fc_flag, vport->fc_rscn_id_cnt)
+                lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                 "0267 NameServer GFF Rsp "
+                                 "x%x Error (%d %d) Data: x%x x%x\n",
+                                 did, irsp->ulpStatus, irsp->un.ulpWord[4],
+                                 vport->fc_flag, vport->fc_rscn_id_cnt)
         }
 
         /* This is a target port, unregistered port, or the GFF_ID failed */
         ndlp = lpfc_setup_disc_node(vport, did);
         if (ndlp) {
-                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                "%d (%d):0242 Process x%x GFF "
-                                "NameServer Rsp Data: x%x x%x x%x\n",
-                                phba->brd_no, vport->vpi,
-                                did, ndlp->nlp_flag, vport->fc_flag,
-                                vport->fc_rscn_id_cnt);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0242 Process x%x GFF "
+                                 "NameServer Rsp Data: x%x x%x x%x\n",
+                                 did, ndlp->nlp_flag, vport->fc_flag,
+                                 vport->fc_rscn_id_cnt);
         } else {
-                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                "%d (%d):0243 Skip x%x GFF "
-                                "NameServer Rsp Data: x%x x%x\n",
-                                phba->brd_no, vport->vpi, did,
-                                vport->fc_flag, vport->fc_rscn_id_cnt);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0243 Skip x%x GFF "
+                                 "NameServer Rsp Data: x%x x%x\n", did,
+                                 vport->fc_flag, vport->fc_rscn_id_cnt);
         }
 out:
         /* Link up / RSCN discovery */
@@ -766,10 +786,14 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         struct lpfc_dmabuf *outp;
         IOCB_t *irsp;
         struct lpfc_sli_ct_request *CTrsp;
+        struct lpfc_nodelist *ndlp;
         int cmdcode, rc;
         uint8_t retry;
         uint32_t latt;
 
+        /* First save ndlp, before we overwrite it */
+        ndlp = cmdiocb->context_un.ndlp;
+
         /* we pass cmdiocb to state machine which needs rspiocb as well */
         cmdiocb->context_un.rsp_iocb = rspiocb;
 
@@ -784,22 +808,21 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         latt = lpfc_els_chk_latt(vport);
 
         /* RFT request completes status <ulpStatus> CmdRsp <CmdRsp> */
-        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                        "%d (%d):0209 RFT request completes, latt %d, "
-                        "ulpStatus x%x CmdRsp x%x, Context x%x, Tag x%x\n",
-                        phba->brd_no, vport->vpi, latt, irsp->ulpStatus,
-                        CTrsp->CommandResponse.bits.CmdRsp,
-                        cmdiocb->iocb.ulpContext, cmdiocb->iocb.ulpIoTag);
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                         "0209 RFT request completes, latt %d, "
+                         "ulpStatus x%x CmdRsp x%x, Context x%x, Tag x%x\n",
+                         latt, irsp->ulpStatus,
+                         CTrsp->CommandResponse.bits.CmdRsp,
+                         cmdiocb->iocb.ulpContext, cmdiocb->iocb.ulpIoTag);
 
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_CT,
                 "CT cmd cmpl:     status:x%x/x%x cmd:x%x",
                 irsp->ulpStatus, irsp->un.ulpWord[4], cmdcode);
 
         if (irsp->ulpStatus) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                        "%d (%d):0268 NS cmd %x Error (%d %d)\n",
-                        phba->brd_no, vport->vpi, cmdcode,
-                        irsp->ulpStatus, irsp->un.ulpWord[4]);
+                lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                 "0268 NS cmd %x Error (%d %d)\n",
+                                 cmdcode, irsp->ulpStatus, irsp->un.ulpWord[4]);
 
                 if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
                         ((irsp->un.ulpWord[4] == IOERR_SLI_DOWN) ||
@@ -811,15 +834,15 @@ lpfc_cmpl_ct_cmd_rft_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                         goto out;
 
                 retry++;
-                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                "%d (%d):0216 Retrying NS cmd %x\n",
-                                phba->brd_no, vport->vpi, cmdcode);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0216 Retrying NS cmd %x\n", cmdcode);
                 rc = lpfc_ns_cmd(vport, cmdcode, retry, 0);
                 if (rc == 0)
                         goto out;
         }
 
 out:
+        cmdiocb->context_un.ndlp = ndlp; /* Now restore ndlp for free */
         lpfc_ct_free_iocb(phba, cmdiocb);
         return;
 }
@@ -862,7 +885,7 @@ lpfc_cmpl_ct_cmd_rff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         return;
 }
 
-int
+static int
 lpfc_vport_symbolic_port_name(struct lpfc_vport *vport, char *symbol,
         size_t size)
 {
@@ -957,10 +980,9 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         }
 
         /* NameServer Req */
-        lpfc_printf_log(phba, KERN_INFO ,LOG_DISCOVERY,
-                        "%d (%d):0236 NameServer Req Data: x%x x%x x%x\n",
-                        phba->brd_no, vport->vpi, cmdcode, vport->fc_flag,
-                        vport->fc_rscn_id_cnt);
+        lpfc_printf_vlog(vport, KERN_INFO ,LOG_DISCOVERY,
+                         "0236 NameServer Req Data: x%x x%x x%x\n",
+                         cmdcode, vport->fc_flag, vport->fc_rscn_id_cnt);
 
         bpl = (struct ulp_bde64 *) bmp->virt;
         memset(bpl, 0, sizeof(struct ulp_bde64));
@@ -1059,6 +1081,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                 cmpl = lpfc_cmpl_ct_cmd_rff_id;
                 break;
         }
+        lpfc_nlp_get(ndlp);
 
         if (!lpfc_ct_cmd(vport, mp, bmp, ndlp, cmpl, rsp_size, retry)) {
                 /* On success, The cmpl function will free the buffers */
@@ -1069,6 +1092,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
         }
 
         rc=6;
+        lpfc_nlp_put(ndlp);
         lpfc_mbuf_free(phba, bmp->virt, bmp->phys);
 ns_cmd_free_bmp:
         kfree(bmp);
@@ -1077,10 +1101,9 @@ ns_cmd_free_mpvirt:
 ns_cmd_free_mp:
         kfree(mp);
 ns_cmd_exit:
-        lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                "%d (%d):0266 Issue NameServer Req x%x err %d Data: x%x x%x\n",
-                        phba->brd_no, vport->vpi, cmdcode, rc, vport->fc_flag,
-                        vport->fc_rscn_id_cnt);
+        lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                         "0266 Issue NameServer Req x%x err %d Data: x%x x%x\n",
+                         cmdcode, rc, vport->fc_flag, vport->fc_rscn_id_cnt);
         return 1;
 }
 
@@ -1106,12 +1129,11 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                 irsp->ulpStatus, irsp->un.ulpWord[4], latt);
 
         if (latt || irsp->ulpStatus) {
-                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                "%d (%d):0229 FDMI cmd %04x failed, latt = %d "
-                                "ulpStatus: x%x, rid x%x\n",
-                                phba->brd_no, vport->vpi,
-                                be16_to_cpu(fdmi_cmd), latt, irsp->ulpStatus,
-                                irsp->un.ulpWord[4]);
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0229 FDMI cmd %04x failed, latt = %d "
+                                 "ulpStatus: x%x, rid x%x\n",
+                                 be16_to_cpu(fdmi_cmd), latt, irsp->ulpStatus,
+                                 irsp->un.ulpWord[4]);
                 lpfc_ct_free_iocb(phba, cmdiocb);
                 return;
         }
@@ -1119,10 +1141,9 @@ lpfc_cmpl_ct_cmd_fdmi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         ndlp = lpfc_findnode_did(vport, FDMI_DID);
         if (fdmi_rsp == be16_to_cpu(SLI_CT_RESPONSE_FS_RJT)) {
                 /* FDMI rsp failed */
-                lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                "%d (%d):0220 FDMI rsp failed Data: x%x\n",
-                                phba->brd_no, vport->vpi,
-                                be16_to_cpu(fdmi_cmd));
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0220 FDMI rsp failed Data: x%x\n",
+                                 be16_to_cpu(fdmi_cmd));
         }
 
         switch (be16_to_cpu(fdmi_cmd)) {
@@ -1185,11 +1206,9 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
         INIT_LIST_HEAD(&bmp->list);
 
         /* FDMI request */
-        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                        "%d (%d):0218 FDMI Request Data: x%x x%x x%x\n",
-                        phba->brd_no, vport->vpi, vport->fc_flag,
-                        vport->port_state, cmdcode);
-
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                         "0218 FDMI Request Data: x%x x%x x%x\n",
+                         vport->fc_flag, vport->port_state, cmdcode);
         CtReq = (struct lpfc_sli_ct_request *) mp->virt;
 
         memset(CtReq, 0, sizeof(struct lpfc_sli_ct_request));
@@ -1449,7 +1468,7 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
                         pab->ab.EntryCnt++;
                         size += FOURBYTES + len;
 
-                        if (phba->cfg_fdmi_on == 2) {
+                        if (vport->cfg_fdmi_on == 2) {
                                 /* #6 Port attribute entry */
                                 ae = (ATTRIBUTE_ENTRY *) ((uint8_t *) pab +
                                                           size);
@@ -1499,10 +1518,12 @@ lpfc_fdmi_cmd(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, int cmdcode)
         bpl->tus.w = le32_to_cpu(bpl->tus.w);
 
         cmpl = lpfc_cmpl_ct_cmd_fdmi;
+        lpfc_nlp_get(ndlp);
 
         if (!lpfc_ct_cmd(vport, mp, bmp, ndlp, cmpl, FC_MAX_NS_RSP, 0))
                 return 0;
 
+        lpfc_nlp_put(ndlp);
         lpfc_mbuf_free(phba, bmp->virt, bmp->phys);
 fdmi_cmd_free_bmp:
         kfree(bmp);
@@ -1512,9 +1533,9 @@ fdmi_cmd_free_mp:
         kfree(mp);
 fdmi_cmd_exit:
         /* Issue FDMI request failed */
-        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                        "%d (%d):0244 Issue FDMI request failed Data: x%x\n",
-                        phba->brd_no, vport->vpi, cmdcode);
+        lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                         "0244 Issue FDMI request failed Data: x%x\n",
+                         cmdcode);
         return 1;
 }