[SCSI] lpfc: NPIV: add NPIV support on top of SLI-3
[safe/jmp/linux-2.6] / drivers / scsi / lpfc / lpfc_els.c
index 056f915..f60c85d 100644 (file)
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2005 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
 #include "lpfc.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_crtn.h"
+#include "lpfc_vport.h"
 
 static int lpfc_els_retry(struct lpfc_hba *, struct lpfc_iocbq *,
                          struct lpfc_iocbq *);
+static void lpfc_cmpl_fabric_iocb(struct lpfc_hba *, struct lpfc_iocbq *,
+                       struct lpfc_iocbq *);
+
 static int lpfc_max_els_tries = 3;
 
 static int
-lpfc_els_chk_latt(struct lpfc_hba * phba)
+lpfc_els_chk_latt(struct lpfc_vport *vport)
 {
-       struct lpfc_sli *psli;
-       LPFC_MBOXQ_t *mbox;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        uint32_t ha_copy;
-       int rc;
 
-       psli = &phba->sli;
-
-       if ((phba->hba_state >= LPFC_HBA_READY) ||
-           (phba->hba_state == LPFC_LINK_DOWN))
+       if (vport->port_state >= LPFC_VPORT_READY ||
+           phba->link_state == LPFC_LINK_DOWN)
                return 0;
 
        /* Read the HBA Host Attention Register */
-       spin_lock_irq(phba->host->host_lock);
        ha_copy = readl(phba->HAregaddr);
-       spin_unlock_irq(phba->host->host_lock);
 
        if (!(ha_copy & HA_LATT))
                return 0;
 
        /* Pending Link Event during Discovery */
-       lpfc_printf_log(phba, KERN_WARNING, LOG_DISCOVERY,
-                       "%d:0237 Pending Link Event during "
+       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
+                       "%d (%d):0237 Pending Link Event during "
                        "Discovery: State x%x\n",
-                       phba->brd_no, phba->hba_state);
+                       phba->brd_no, vport->vpi,  phba->pport->port_state);
 
        /* CLEAR_LA should re-enable link attention events and
         * we should then imediately take a LATT event. The
@@ -74,49 +73,34 @@ lpfc_els_chk_latt(struct lpfc_hba * phba)
         * will cleanup any left over in-progress discovery
         * events.
         */
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag |= FC_ABORT_DISCOVERY;
-       spin_unlock_irq(phba->host->host_lock);
-
-       if (phba->hba_state != LPFC_CLEAR_LA) {
-               if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL))) {
-                       phba->hba_state = LPFC_CLEAR_LA;
-                       lpfc_clear_la(phba, mbox);
-                       mbox->mbox_cmpl = lpfc_mbx_cmpl_clear_la;
-                       rc = lpfc_sli_issue_mbox (phba, mbox,
-                                                 (MBX_NOWAIT | MBX_STOP_IOCB));
-                       if (rc == MBX_NOT_FINISHED) {
-                               mempool_free(mbox, phba->mbox_mem_pool);
-                               phba->hba_state = LPFC_HBA_ERROR;
-                       }
-               }
-       }
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag |= FC_ABORT_DISCOVERY;
+       spin_unlock_irq(shost->host_lock);
 
-       return (1);
+       if (phba->link_state != LPFC_CLEAR_LA)
+               lpfc_issue_clear_la(phba, vport);
 
+       return 1;
 }
 
 static struct lpfc_iocbq *
-lpfc_prep_els_iocb(struct lpfc_hba * phba,
-                  uint8_t expectRsp,
-                  uint16_t cmdSize,
-                  uint8_t retry, struct lpfc_nodelist * ndlp, uint32_t elscmd)
+lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp,
+                  uint16_t cmdSize, uint8_t retry,
+                  struct lpfc_nodelist *ndlp, uint32_t did,
+                  uint32_t elscmd)
 {
-       struct lpfc_sli_ring *pring;
+       struct lpfc_hba  *phba = vport->phba;
        struct lpfc_iocbq *elsiocb;
        struct lpfc_dmabuf *pcmd, *prsp, *pbuflist;
        struct ulp_bde64 *bpl;
        IOCB_t *icmd;
 
-       pring = &phba->sli.ring[LPFC_ELS_RING];
 
-       if (phba->hba_state < LPFC_LINK_UP)
-               return  NULL;
+       if (!lpfc_is_link_up(phba))
+               return NULL;
 
        /* Allocate buffer for  command iocb */
-       spin_lock_irq(phba->host->host_lock);
        elsiocb = lpfc_sli_get_iocbq(phba);
-       spin_unlock_irq(phba->host->host_lock);
 
        if (elsiocb == NULL)
                return NULL;
@@ -124,14 +108,12 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
 
        /* fill in BDEs for command */
        /* Allocate buffer for command payload */
-       if (((pcmd = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL)) == 0) ||
+       if (((pcmd = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL)) == 0) ||
            ((pcmd->virt = lpfc_mbuf_alloc(phba,
                                           MEM_PRI, &(pcmd->phys))) == 0)) {
                kfree(pcmd);
 
-               spin_lock_irq(phba->host->host_lock);
                lpfc_sli_release_iocbq(phba, elsiocb);
-               spin_unlock_irq(phba->host->host_lock);
                return NULL;
        }
 
@@ -139,7 +121,7 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
 
        /* Allocate buffer for response payload */
        if (expectRsp) {
-               prsp = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL);
+               prsp = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
                if (prsp)
                        prsp->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                     &prsp->phys);
@@ -147,9 +129,7 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
                        kfree(prsp);
                        lpfc_mbuf_free(phba, pcmd->virt, pcmd->phys);
                        kfree(pcmd);
-                       spin_lock_irq(phba->host->host_lock);
                        lpfc_sli_release_iocbq(phba, elsiocb);
-                       spin_unlock_irq(phba->host->host_lock);
                        return NULL;
                }
                INIT_LIST_HEAD(&prsp->list);
@@ -158,14 +138,12 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
        }
 
        /* Allocate buffer for Buffer ptr list */
-       pbuflist = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL);
+       pbuflist = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
        if (pbuflist)
-           pbuflist->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
-                                            &pbuflist->phys);
+               pbuflist->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
+                                                &pbuflist->phys);
        if (pbuflist == 0 || pbuflist->virt == 0) {
-               spin_lock_irq(phba->host->host_lock);
                lpfc_sli_release_iocbq(phba, elsiocb);
-               spin_unlock_irq(phba->host->host_lock);
                lpfc_mbuf_free(phba, pcmd->virt, pcmd->phys);
                lpfc_mbuf_free(phba, prsp->virt, prsp->phys);
                kfree(pcmd);
@@ -179,19 +157,28 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
        icmd->un.elsreq64.bdl.addrHigh = putPaddrHigh(pbuflist->phys);
        icmd->un.elsreq64.bdl.addrLow = putPaddrLow(pbuflist->phys);
        icmd->un.elsreq64.bdl.bdeFlags = BUFF_TYPE_BDL;
+       icmd->un.elsreq64.remoteID = did;       /* DID */
        if (expectRsp) {
-               icmd->un.elsreq64.bdl.bdeSize = (2 * sizeof (struct ulp_bde64));
-               icmd->un.elsreq64.remoteID = ndlp->nlp_DID;     /* DID */
+               icmd->un.elsreq64.bdl.bdeSize = (2 * sizeof(struct ulp_bde64));
                icmd->ulpCommand = CMD_ELS_REQUEST64_CR;
+               icmd->ulpTimeout = phba->fc_ratov * 2;
        } else {
-               icmd->un.elsreq64.bdl.bdeSize = sizeof (struct ulp_bde64);
+               icmd->un.elsreq64.bdl.bdeSize = sizeof(struct ulp_bde64);
                icmd->ulpCommand = CMD_XMIT_ELS_RSP64_CX;
        }
-
        icmd->ulpBdeCount = 1;
        icmd->ulpLe = 1;
        icmd->ulpClass = CLASS3;
 
+       if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {
+               icmd->un.elsreq64.myID = vport->fc_myDID;
+
+               /* For ELS_REQUEST64_CR, use the VPI by default */
+               icmd->ulpContext = vport->vpi;
+               icmd->ulpCt_h = 0;
+               icmd->ulpCt_l = 1;
+       }
+
        bpl = (struct ulp_bde64 *) pbuflist->virt;
        bpl->addrLow = le32_to_cpu(putPaddrLow(pcmd->phys));
        bpl->addrHigh = le32_to_cpu(putPaddrHigh(pcmd->phys));
@@ -209,10 +196,12 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
        }
 
        /* Save for completion so we can release these resources */
-       elsiocb->context1 = (uint8_t *) ndlp;
-       elsiocb->context2 = (uint8_t *) pcmd;
-       elsiocb->context3 = (uint8_t *) pbuflist;
+       if (elscmd != ELS_CMD_LS_RJT)
+               elsiocb->context1 = lpfc_nlp_get(ndlp);
+       elsiocb->context2 = pcmd;
+       elsiocb->context3 = pbuflist;
        elsiocb->retry = retry;
+       elsiocb->vport = vport;
        elsiocb->drvrTimeout = (phba->fc_ratov << 1) + LPFC_DRVR_TIMEOUT;
 
        if (prsp) {
@@ -222,33 +211,97 @@ lpfc_prep_els_iocb(struct lpfc_hba * phba,
        if (expectRsp) {
                /* Xmit ELS command <elsCmd> to remote NPORT <did> */
                lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                               "%d:0116 Xmit ELS command x%x to remote "
-                               "NPORT x%x Data: x%x x%x\n",
-                               phba->brd_no, elscmd,
-                               ndlp->nlp_DID, icmd->ulpIoTag, phba->hba_state);
+                               "%d (%d):0116 Xmit ELS command x%x to remote "
+                               "NPORT x%x I/O tag: x%x, port state: x%x\n",
+                               phba->brd_no, vport->vpi,  elscmd, did,
+                               elsiocb->iotag, vport->port_state);
        } else {
                /* Xmit ELS response <elsCmd> to remote NPORT <did> */
                lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                               "%d:0117 Xmit ELS response x%x to remote "
-                               "NPORT x%x Data: x%x x%x\n",
-                               phba->brd_no, elscmd,
-                               ndlp->nlp_DID, icmd->ulpIoTag, cmdSize);
+                               "%d (%d):0117 Xmit ELS response x%x to remote "
+                               "NPORT x%x I/O tag: x%x, size: x%x\n",
+                               phba->brd_no, vport->vpi, elscmd,
+                               ndlp->nlp_DID, elsiocb->iotag, cmdSize);
        }
 
-       return (elsiocb);
+       return elsiocb;
 }
 
 
 static int
-lpfc_cmpl_els_flogi_fabric(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
-               struct serv_parm *sp, IOCB_t *irsp)
+lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)
 {
+       struct lpfc_hba  *phba = vport->phba;
        LPFC_MBOXQ_t *mbox;
+       struct lpfc_dmabuf *mp;
+       struct lpfc_nodelist *ndlp;
+       struct serv_parm *sp;
        int rc;
 
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag |= FC_FABRIC;
-       spin_unlock_irq(phba->host->host_lock);
+       sp = &phba->fc_fabparam;
+       ndlp = lpfc_findnode_did(vport, Fabric_DID);
+       if (!ndlp)
+               goto fail;
+
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!mbox)
+               goto fail;
+
+       vport->port_state = LPFC_FABRIC_CFG_LINK;
+       lpfc_config_link(phba, mbox);
+       mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+       mbox->vport = vport;
+
+       rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB);
+       if (rc == MBX_NOT_FINISHED)
+               goto fail_free_mbox;
+
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!mbox)
+               goto fail;
+       rc = lpfc_reg_login(phba, vport->vpi, Fabric_DID, (uint8_t *)sp, mbox,
+                           0);
+       if (rc)
+               goto fail_free_mbox;
+
+       mbox->mbox_cmpl = lpfc_mbx_cmpl_fabric_reg_login;
+       mbox->vport = vport;
+       mbox->context2 = lpfc_nlp_get(ndlp);
+
+       rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB);
+       if (rc == MBX_NOT_FINISHED)
+               goto fail_issue_reg_login;
+
+       return 0;
+
+fail_issue_reg_login:
+       lpfc_nlp_put(ndlp);
+       mp = (struct lpfc_dmabuf *) mbox->context1;
+       lpfc_mbuf_free(phba, mp->virt, mp->phys);
+       kfree(mp);
+fail_free_mbox:
+       mempool_free(mbox, phba->mbox_mem_pool);
+
+fail:
+       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+       lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+               "%d (%d):0249 Cannot issue Register Fabric login\n",
+               phba->brd_no, vport->vpi);
+       return -ENXIO;
+}
+
+static int
+lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          struct serv_parm *sp, IOCB_t *irsp)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_nodelist *np;
+       struct lpfc_nodelist *next_np;
+
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag |= FC_FABRIC;
+       spin_unlock_irq(shost->host_lock);
 
        phba->fc_edtov = be32_to_cpu(sp->cmn.e_d_tov);
        if (sp->cmn.edtovResolution)    /* E_D_TOV ticks are in nanoseconds */
@@ -257,20 +310,20 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
        phba->fc_ratov = (be32_to_cpu(sp->cmn.w2.r_a_tov) + 999) / 1000;
 
        if (phba->fc_topology == TOPOLOGY_LOOP) {
-               spin_lock_irq(phba->host->host_lock);
-               phba->fc_flag |= FC_PUBLIC_LOOP;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag |= FC_PUBLIC_LOOP;
+               spin_unlock_irq(shost->host_lock);
        } else {
                /*
                 * If we are a N-port connected to a Fabric, fixup sparam's so
                 * logins to devices on remote loops work.
                 */
-               phba->fc_sparam.cmn.altBbCredit = 1;
+               vport->fc_sparam.cmn.altBbCredit = 1;
        }
 
-       phba->fc_myDID = irsp->un.ulpWord[4] & Mask_DID;
+       vport->fc_myDID = irsp->un.ulpWord[4] & Mask_DID;
        memcpy(&ndlp->nlp_portname, &sp->portName, sizeof(struct lpfc_name));
-       memcpy(&ndlp->nlp_nodename, &sp->nodeName, sizeof (struct lpfc_name));
+       memcpy(&ndlp->nlp_nodename, &sp->nodeName, sizeof(struct lpfc_name));
        ndlp->nlp_class_sup = 0;
        if (sp->cls1.classValid)
                ndlp->nlp_class_sup |= FC_COS_CLASS1;
@@ -284,67 +337,87 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
                                sp->cmn.bbRcvSizeLsb;
        memcpy(&phba->fc_fabparam, sp, sizeof(struct serv_parm));
 
-       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-       if (!mbox)
-               goto fail;
-
-       phba->hba_state = LPFC_FABRIC_CFG_LINK;
-       lpfc_config_link(phba, mbox);
-       mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
-
-       rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB);
-       if (rc == MBX_NOT_FINISHED)
-               goto fail_free_mbox;
+       if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {
+               if (sp->cmn.response_multiple_NPort) {
+                       lpfc_printf_log(phba, KERN_WARNING, LOG_ELS | LOG_VPORT,
+                                       "%d:1816 FLOGI NPIV supported, "
+                                       "response data 0x%x\n",
+                                       phba->brd_no,
+                                       sp->cmn.response_multiple_NPort);
+                       phba->link_flag |= LS_NPIV_FAB_SUPPORTED;
 
-       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-       if (!mbox)
-               goto fail;
+               } else {
+                       /* Because we asked f/w for NPIV it still expects us
+                          to call reg_vnpid atleast for the physcial host */
+                       lpfc_printf_log(phba, KERN_WARNING, LOG_ELS | LOG_VPORT,
+                                       "%d:1817 Fabric does not support NPIV "
+                                       "- configuring single port mode.\n",
+                                       phba->brd_no);
+                       phba->vpi_cnt = 1;
+                       phba->link_flag &= ~LS_NPIV_FAB_SUPPORTED;
+               }
+       }
 
-       if (lpfc_reg_login(phba, Fabric_DID, (uint8_t *) sp, mbox, 0))
-               goto fail_free_mbox;
+       if ((vport->fc_prevDID != vport->fc_myDID) &&
+               !(vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)) {
 
-       /*
-        * set_slim mailbox command needs to execute first,
-        * queue this command to be processed later.
-        */
-       mbox->mbox_cmpl = lpfc_mbx_cmpl_fabric_reg_login;
-       mbox->context2 = ndlp;
+               /* If our NportID changed, we need to ensure all
+                * remaining NPORTs get unreg_login'ed.
+                */
+               list_for_each_entry_safe(np, next_np,
+                                       &vport->fc_nodes, nlp_listp) {
+                       if ((np->nlp_state != NLP_STE_NPR_NODE) ||
+                                  !(np->nlp_flag & NLP_NPR_ADISC))
+                               continue;
+                       spin_lock_irq(shost->host_lock);
+                       np->nlp_flag &= ~NLP_NPR_ADISC;
+                       spin_unlock_irq(shost->host_lock);
+                       lpfc_unreg_rpi(vport, np);
+               }
+               if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {
+                       lpfc_mbx_unreg_vpi(vport);
+                       vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+               }
+       }
 
-       rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT | MBX_STOP_IOCB);
-       if (rc == MBX_NOT_FINISHED)
-               goto fail_free_mbox;
+       ndlp->nlp_sid = irsp->un.ulpWord[4] & Mask_DID;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_REG_LOGIN_ISSUE);
 
+       if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED &&
+           vport->fc_flag & FC_VPORT_NEEDS_REG_VPI) {
+               lpfc_register_new_vport(phba, vport, ndlp);
+               return 0;
+       }
+       lpfc_issue_fabric_reglogin(vport);
        return 0;
-
- fail_free_mbox:
-       mempool_free(mbox, phba->mbox_mem_pool);
- fail:
-       return -ENXIO;
 }
 
 /*
  * We FLOGIed into an NPort, initiate pt2pt protocol
  */
 static int
-lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
-               struct serv_parm *sp)
+lpfc_cmpl_els_flogi_nport(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         struct serv_parm *sp)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        LPFC_MBOXQ_t *mbox;
        int rc;
 
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
-       spin_unlock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+       phba->vpi_cnt = 1;
+       spin_unlock_irq(shost->host_lock);
 
        phba->fc_edtov = FF_DEF_EDTOV;
        phba->fc_ratov = FF_DEF_RATOV;
-       rc = memcmp(&phba->fc_portname, &sp->portName,
-                       sizeof(struct lpfc_name));
+       rc = memcmp(&vport->fc_portname, &sp->portName,
+                   sizeof(vport->fc_portname));
        if (rc >= 0) {
                /* This side will initiate the PLOGI */
-               spin_lock_irq(phba->host->host_lock);
-               phba->fc_flag |= FC_PT2PT_PLOGI;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag |= FC_PT2PT_PLOGI;
+               spin_unlock_irq(shost->host_lock);
 
                /*
                 * N_Port ID cannot be 0, set our to LocalID the other
@@ -353,7 +426,7 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
 
                /* not equal */
                if (rc)
-                       phba->fc_myDID = PT2PT_LocalID;
+                       vport->fc_myDID = PT2PT_LocalID;
 
                mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
                if (!mbox)
@@ -362,15 +435,16 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
                lpfc_config_link(phba, mbox);
 
                mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+               mbox->vport = vport;
                rc = lpfc_sli_issue_mbox(phba, mbox,
-                               MBX_NOWAIT | MBX_STOP_IOCB);
+                                        MBX_NOWAIT | MBX_STOP_IOCB);
                if (rc == MBX_NOT_FINISHED) {
                        mempool_free(mbox, phba->mbox_mem_pool);
                        goto fail;
                }
-               mempool_free(ndlp, phba->nlp_mem_pool);
+               lpfc_nlp_put(ndlp);
 
-               ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, PT2PT_RemoteID);
+               ndlp = lpfc_findnode_did(vport, PT2PT_RemoteID);
                if (!ndlp) {
                        /*
                         * Cannot find existing Fabric ndlp, so allocate a
@@ -380,36 +454,39 @@ lpfc_cmpl_els_flogi_nport(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
                        if (!ndlp)
                                goto fail;
 
-                       lpfc_nlp_init(phba, ndlp, PT2PT_RemoteID);
+                       lpfc_nlp_init(vport, ndlp, PT2PT_RemoteID);
                }
 
                memcpy(&ndlp->nlp_portname, &sp->portName,
-                               sizeof(struct lpfc_name));
+                      sizeof(struct lpfc_name));
                memcpy(&ndlp->nlp_nodename, &sp->nodeName,
-                               sizeof(struct lpfc_name));
-               ndlp->nlp_state = NLP_STE_NPR_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                      sizeof(struct lpfc_name));
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag |= NLP_NPR_2B_DISC;
+               spin_unlock_irq(shost->host_lock);
        } else {
                /* This side will wait for the PLOGI */
-               mempool_free( ndlp, phba->nlp_mem_pool);
+               lpfc_nlp_put(ndlp);
        }
 
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag |= FC_PT2PT;
-       spin_unlock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag |= FC_PT2PT;
+       spin_unlock_irq(shost->host_lock);
 
        /* Start discovery - this should just do CLEAR_LA */
-       lpfc_disc_start(phba);
+       lpfc_disc_start(vport);
        return 0;
- fail:
+fail:
        return -ENXIO;
 }
 
 static void
-lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
-                   struct lpfc_iocbq * cmdiocb, struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                   struct lpfc_iocbq *rspiocb)
 {
+       struct lpfc_vport *vport = cmdiocb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        IOCB_t *irsp = &rspiocb->iocb;
        struct lpfc_nodelist *ndlp = cmdiocb->context1;
        struct lpfc_dmabuf *pcmd = cmdiocb->context2, *prsp;
@@ -417,38 +494,37 @@ lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
        int rc;
 
        /* Check to see if link went down during discovery */
-       if (lpfc_els_chk_latt(phba)) {
-               lpfc_nlp_remove(phba, ndlp);
+       if (lpfc_els_chk_latt(vport)) {
+               lpfc_nlp_put(ndlp);
                goto out;
        }
 
        if (irsp->ulpStatus) {
                /* Check for retry */
-               if (lpfc_els_retry(phba, cmdiocb, rspiocb)) {
-                       /* ELS command is being retried */
+               if (lpfc_els_retry(phba, cmdiocb, rspiocb))
                        goto out;
-               }
+
                /* FLOGI failed, so there is no fabric */
-               spin_lock_irq(phba->host->host_lock);
-               phba->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
-               spin_unlock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+               phba->vpi_cnt = 1;
+               spin_unlock_irq(shost->host_lock);
 
-               /* If private loop, then allow max outstandting els to be
+               /* If private loop, then allow max outstanding els to be
                 * LPFC_MAX_DISC_THREADS (32). Scanning in the case of no
                 * alpa map would take too long otherwise.
                 */
                if (phba->alpa_map[0] == 0) {
-                       phba->cfg_discovery_threads =
-                           LPFC_MAX_DISC_THREADS;
+                       phba->cfg_discovery_threads = LPFC_MAX_DISC_THREADS;
                }
 
                /* FLOGI failure */
-               lpfc_printf_log(phba,
-                               KERN_INFO,
-                               LOG_ELS,
-                               "%d:0100 FLOGI failure Data: x%x x%x\n",
-                               phba->brd_no,
-                               irsp->ulpStatus, irsp->un.ulpWord[4]);
+               lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+                               "%d (%d):0100 FLOGI failure Data: x%x x%x "
+                               "x%x\n",
+                               phba->brd_no, vport->vpi,
+                               irsp->ulpStatus, irsp->un.ulpWord[4],
+                               irsp->ulpTimeout);
                goto flogifail;
        }
 
@@ -462,37 +538,38 @@ lpfc_cmpl_els_flogi(struct lpfc_hba * phba,
 
        /* FLOGI completes successfully */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0101 FLOGI completes sucessfully "
+                       "%d (%d):0101 FLOGI completes sucessfully "
                        "Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
+                       phba->brd_no, vport->vpi,
                        irsp->un.ulpWord[4], sp->cmn.e_d_tov,
                        sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution);
 
-       if (phba->hba_state == LPFC_FLOGI) {
+       if (vport->port_state == LPFC_FLOGI) {
                /*
                 * If Common Service Parameters indicate Nport
                 * we are point to point, if Fport we are Fabric.
                 */
                if (sp->cmn.fPort)
-                       rc = lpfc_cmpl_els_flogi_fabric(phba, ndlp, sp, irsp);
+                       rc = lpfc_cmpl_els_flogi_fabric(vport, ndlp, sp, irsp);
                else
-                       rc = lpfc_cmpl_els_flogi_nport(phba, ndlp, sp);
+                       rc = lpfc_cmpl_els_flogi_nport(vport, ndlp, sp);
 
                if (!rc)
                        goto out;
        }
 
 flogifail:
-       lpfc_nlp_remove(phba, ndlp);
+       lpfc_nlp_put(ndlp);
+       phba->vpi_cnt = 1;
 
        if (irsp->ulpStatus != IOSTAT_LOCAL_REJECT ||
            (irsp->un.ulpWord[4] != IOERR_SLI_ABORTED &&
             irsp->un.ulpWord[4] != IOERR_SLI_DOWN)) {
                /* FLOGI failed, so just use loop map to make discovery list */
-               lpfc_disc_list_loopmap(phba);
+               lpfc_disc_list_loopmap(vport);
 
                /* Start discovery */
-               lpfc_disc_start(phba);
+               lpfc_disc_start(vport);
        }
 
 out:
@@ -500,9 +577,10 @@ out:
 }
 
 static int
-lpfc_issue_els_flogi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
+lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                     uint8_t retry)
 {
+       struct lpfc_hba  *phba = vport->phba;
        struct serv_parm *sp;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
@@ -514,19 +592,20 @@ lpfc_issue_els_flogi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
 
        pring = &phba->sli.ring[LPFC_ELS_RING];
 
-       cmdsize = (sizeof (uint32_t) + sizeof (struct serv_parm));
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_FLOGI)) == 0) {
-               return (1);
-       }
+       cmdsize = (sizeof(uint32_t) + sizeof(struct serv_parm));
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_FLOGI);
+
+       if (!elsiocb)
+               return 1;
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        /* For FLOGI request, remainder of payload is service parameters */
        *((uint32_t *) (pcmd)) = ELS_CMD_FLOGI;
-       pcmd += sizeof (uint32_t);
-       memcpy(pcmd, &phba->fc_sparam, sizeof (struct serv_parm));
+       pcmd += sizeof(uint32_t);
+       memcpy(pcmd, &vport->fc_sparam, sizeof(struct serv_parm));
        sp = (struct serv_parm *) pcmd;
 
        /* Setup CSPs accordingly for Fabric */
@@ -540,25 +619,31 @@ lpfc_issue_els_flogi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
        if (sp->cmn.fcphHigh < FC_PH3)
                sp->cmn.fcphHigh = FC_PH3;
 
+       if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {
+               sp->cmn.request_multiple_Nport = 1;
+
+               /* For FLOGI, Let FLOGI rsp set the NPortID for VPI 0 */
+               icmd->ulpCt_h = 1;
+               icmd->ulpCt_l = 0;
+       }
+
        tmo = phba->fc_ratov;
        phba->fc_ratov = LPFC_DISC_FLOGI_TMO;
-       lpfc_set_disctmo(phba);
+       lpfc_set_disctmo(vport);
        phba->fc_ratov = tmo;
 
        phba->fc_stat.elsXmitFLOGI++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_flogi;
-       spin_lock_irq(phba->host->host_lock);
-       rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
-       spin_unlock_irq(phba->host->host_lock);
+       rc = lpfc_issue_fabric_iocb(phba, elsiocb);
        if (rc == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       return (0);
+       return 0;
 }
 
 int
-lpfc_els_abort_flogi(struct lpfc_hba * phba)
+lpfc_els_abort_flogi(struct lpfc_hba *phba)
 {
        struct lpfc_sli_ring *pring;
        struct lpfc_iocbq *iocb, *next_iocb;
@@ -576,127 +661,193 @@ lpfc_els_abort_flogi(struct lpfc_hba * phba)
         * Check the txcmplq for an iocb that matches the nport the driver is
         * searching for.
         */
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(&phba->hbalock);
        list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq, list) {
                icmd = &iocb->iocb;
-               if (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) {
+               if (icmd->ulpCommand == CMD_ELS_REQUEST64_CR &&
+                   icmd->un.elsreq64.bdl.ulpIoTag32) {
                        ndlp = (struct lpfc_nodelist *)(iocb->context1);
                        if (ndlp && (ndlp->nlp_DID == Fabric_DID)) {
-                               list_del(&iocb->list);
-                               pring->txcmplq_cnt--;
-
-                               if ((icmd->un.elsreq64.bdl.ulpIoTag32)) {
-                                       lpfc_sli_issue_abort_iotag32
-                                               (phba, pring, iocb);
-                               }
-                               if (iocb->iocb_cmpl) {
-                                       icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                                       icmd->un.ulpWord[4] =
-                                           IOERR_SLI_ABORTED;
-                                       spin_unlock_irq(phba->host->host_lock);
-                                       (iocb->iocb_cmpl) (phba, iocb, iocb);
-                                       spin_lock_irq(phba->host->host_lock);
-                               } else
-                                       lpfc_sli_release_iocbq(phba, iocb);
+                               lpfc_sli_issue_abort_iotag(phba, pring, iocb);
                        }
                }
        }
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
 
        return 0;
 }
 
 int
-lpfc_initial_flogi(struct lpfc_hba * phba)
+lpfc_initial_flogi(struct lpfc_vport *vport)
 {
+       struct lpfc_hba *phba = vport->phba;
        struct lpfc_nodelist *ndlp;
 
-       /* First look for Fabric ndlp on the unmapped list */
-
-       if ((ndlp =
-            lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED,
-                              Fabric_DID)) == 0) {
+       /* First look for the Fabric ndlp */
+       ndlp = lpfc_findnode_did(vport, Fabric_DID);
+       if (!ndlp) {
                /* Cannot find existing Fabric ndlp, so allocate a new one */
-               if ((ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL))
-                   == 0) {
-                       return (0);
-               }
-               lpfc_nlp_init(phba, ndlp, Fabric_DID);
-       }
-       else {
-               phba->fc_unmap_cnt--;
-               list_del(&ndlp->nlp_listp);
-               spin_lock_irq(phba->host->host_lock);
-               ndlp->nlp_flag &= ~NLP_LIST_MASK;
-               spin_unlock_irq(phba->host->host_lock);
+               ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+               if (!ndlp)
+                       return 0;
+               lpfc_nlp_init(vport, ndlp, Fabric_DID);
+       } else {
+               lpfc_dequeue_node(vport, ndlp);
        }
-       if (lpfc_issue_els_flogi(phba, ndlp, 0)) {
-               mempool_free( ndlp, phba->nlp_mem_pool);
+       if (lpfc_issue_els_flogi(vport, ndlp, 0)) {
+               lpfc_nlp_put(ndlp);
        }
-       return (1);
+       return 1;
 }
 
+int
+lpfc_initial_fdisc(struct lpfc_vport *vport)
+{
+       struct lpfc_hba *phba = vport->phba;
+       struct lpfc_nodelist *ndlp;
+
+       /* First look for the Fabric ndlp */
+       ndlp = lpfc_findnode_did(vport, Fabric_DID);
+       if (!ndlp) {
+               /* Cannot find existing Fabric ndlp, so allocate a new one */
+               ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+               if (!ndlp)
+                       return 0;
+               lpfc_nlp_init(vport, ndlp, Fabric_DID);
+       } else {
+               lpfc_dequeue_node(vport, ndlp);
+       }
+       if (lpfc_issue_els_fdisc(vport, ndlp, 0)) {
+               lpfc_nlp_put(ndlp);
+       }
+       return 1;
+}
 static void
-lpfc_more_plogi(struct lpfc_hba * phba)
+lpfc_more_plogi(struct lpfc_vport *vport)
 {
        int sentplogi;
+       struct lpfc_hba *phba = vport->phba;
 
-       if (phba->num_disc_nodes)
-               phba->num_disc_nodes--;
+       if (vport->num_disc_nodes)
+               vport->num_disc_nodes--;
 
        /* Continue discovery with <num_disc_nodes> PLOGIs to go */
        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                       "%d:0232 Continue discovery with %d PLOGIs to go "
+                       "%d (%d):0232 Continue discovery with %d PLOGIs to go "
                        "Data: x%x x%x x%x\n",
-                       phba->brd_no, phba->num_disc_nodes, phba->fc_plogi_cnt,
-                       phba->fc_flag, phba->hba_state);
+                       phba->brd_no, vport->vpi, vport->num_disc_nodes,
+                       vport->fc_plogi_cnt, vport->fc_flag, vport->port_state);
 
        /* Check to see if there are more PLOGIs to be sent */
-       if (phba->fc_flag & FC_NLP_MORE) {
-               /* go thru NPR list and issue any remaining ELS PLOGIs */
-               sentplogi = lpfc_els_disc_plogi(phba);
-       }
+       if (vport->fc_flag & FC_NLP_MORE)
+               /* go thru NPR nodes and issue any remaining ELS PLOGIs */
+               sentplogi = lpfc_els_disc_plogi(vport);
+
        return;
 }
 
+static struct lpfc_nodelist *
+lpfc_plogi_confirm_nport(struct lpfc_hba *phba, uint32_t *prsp,
+                        struct lpfc_nodelist *ndlp)
+{
+       struct lpfc_vport    *vport = ndlp->vport;
+       struct lpfc_nodelist *new_ndlp;
+       struct serv_parm *sp;
+       uint8_t  name[sizeof(struct lpfc_name)];
+       uint32_t rc;
+
+       /* Fabric nodes can have the same WWPN so we don't bother searching
+        * by WWPN.  Just return the ndlp that was given to us.
+        */
+       if (ndlp->nlp_type & NLP_FABRIC)
+               return ndlp;
+
+       sp = (struct serv_parm *) ((uint8_t *) prsp + sizeof(uint32_t));
+       memset(name, 0, sizeof(struct lpfc_name));
+
+       /* Now we find out if the NPort we are logging into, matches the WWPN
+        * we have for that ndlp. If not, we have some work to do.
+        */
+       new_ndlp = lpfc_findnode_wwpn(vport, &sp->portName);
+
+       if (new_ndlp == ndlp)
+               return ndlp;
+
+       if (!new_ndlp) {
+               rc = memcmp(&ndlp->nlp_portname, name,
+                           sizeof(struct lpfc_name));
+               if (!rc)
+                       return ndlp;
+               new_ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_ATOMIC);
+               if (!new_ndlp)
+                       return ndlp;
+
+               lpfc_nlp_init(vport, new_ndlp, ndlp->nlp_DID);
+       }
+
+       lpfc_unreg_rpi(vport, new_ndlp);
+       new_ndlp->nlp_DID = ndlp->nlp_DID;
+       new_ndlp->nlp_prev_state = ndlp->nlp_prev_state;
+       lpfc_nlp_set_state(vport, new_ndlp, ndlp->nlp_state);
+
+       /* Move this back to NPR state */
+       if (memcmp(&ndlp->nlp_portname, name, sizeof(struct lpfc_name)) == 0)
+               lpfc_drop_node(vport, ndlp);
+       else {
+               lpfc_unreg_rpi(vport, ndlp);
+               ndlp->nlp_DID = 0; /* Two ndlps cannot have the same did */
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       }
+       return new_ndlp;
+}
+
 static void
-lpfc_cmpl_els_plogi(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                   struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_plogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                   struct lpfc_iocbq *rspiocb)
 {
+       struct lpfc_vport *vport = cmdiocb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        IOCB_t *irsp;
-       struct lpfc_sli *psli;
        struct lpfc_nodelist *ndlp;
+       struct lpfc_dmabuf *prsp;
        int disc, rc, did, type;
 
-       psli = &phba->sli;
-
        /* we pass cmdiocb to state machine which needs rspiocb as well */
        cmdiocb->context_un.rsp_iocb = rspiocb;
 
        irsp = &rspiocb->iocb;
-       ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_PLOGI_SND;
-       spin_unlock_irq(phba->host->host_lock);
+       ndlp = lpfc_findnode_did(vport, irsp->un.elsreq64.remoteID);
+       if (!ndlp) {
+               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                       "%d (%d):0136 PLOGI completes to NPort x%x "
+                       "with no ndlp. Data: x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi, irsp->un.elsreq64.remoteID,
+                       irsp->ulpStatus, irsp->un.ulpWord[4], irsp->ulpIoTag);
+               goto out;
+       }
 
        /* Since ndlp can be freed in the disc state machine, note if this node
         * is being used during discovery.
         */
+       spin_lock_irq(shost->host_lock);
        disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);
+       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+       spin_unlock_irq(shost->host_lock);
        rc   = 0;
 
        /* PLOGI completes to NPort <nlp_DID> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0102 PLOGI completes to NPort x%x "
-                       "Data: x%x x%x x%x x%x\n",
-                       phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
-                       irsp->un.ulpWord[4], disc, phba->num_disc_nodes);
+                       "%d (%d):0102 PLOGI completes to NPort x%x "
+                       "Data: x%x x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi, ndlp->nlp_DID,
+                       irsp->ulpStatus, irsp->un.ulpWord[4],
+                       irsp->ulpTimeout, disc, vport->num_disc_nodes);
 
        /* Check to see if link went down during discovery */
-       if (lpfc_els_chk_latt(phba)) {
-               spin_lock_irq(phba->host->host_lock);
+       if (lpfc_els_chk_latt(vport)) {
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag |= NLP_NPR_2B_DISC;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
                goto out;
        }
 
@@ -709,68 +860,66 @@ lpfc_cmpl_els_plogi(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                if (lpfc_els_retry(phba, cmdiocb, rspiocb)) {
                        /* ELS command is being retried */
                        if (disc) {
-                               spin_lock_irq(phba->host->host_lock);
+                               spin_lock_irq(shost->host_lock);
                                ndlp->nlp_flag |= NLP_NPR_2B_DISC;
-                               spin_unlock_irq(phba->host->host_lock);
+                               spin_unlock_irq(shost->host_lock);
                        }
                        goto out;
                }
 
                /* PLOGI failed */
+               if (ndlp->nlp_DID == NameServer_DID) {
+                       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+                       lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                               "%d (%d):0250 Nameserver login error: "
+                               "0x%x / 0x%x\n",
+                               phba->brd_no, vport->vpi,
+                               irsp->ulpStatus, irsp->un.ulpWord[4]);
+               }
+
                /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-                  ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
-                  (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
-                  (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
-                       disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);
-               }
-               else {
-                       rc = lpfc_disc_state_machine(phba, ndlp, cmdiocb,
-                                       NLP_EVT_CMPL_PLOGI);
+                   ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                    (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
+                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
+                       rc = NLP_STE_FREED_NODE;
+               } else {
+                       rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                                    NLP_EVT_CMPL_PLOGI);
                }
        } else {
                /* Good status, call state machine */
-               rc = lpfc_disc_state_machine(phba, ndlp, cmdiocb,
-                                       NLP_EVT_CMPL_PLOGI);
-       }
-
-       if (type & NLP_FABRIC) {
-               /* If we cannot login to Nameserver, kick off discovery now */
-               if ((did == NameServer_DID) && (rc == NLP_STE_FREED_NODE)) {
-                       lpfc_disc_start(phba);
-               }
-               goto out;
+               prsp = list_entry(((struct lpfc_dmabuf *)
+                                  cmdiocb->context2)->list.next,
+                                 struct lpfc_dmabuf, list);
+               ndlp = lpfc_plogi_confirm_nport(phba, prsp->virt, ndlp);
+               rc = lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                            NLP_EVT_CMPL_PLOGI);
        }
 
-       if (disc && phba->num_disc_nodes) {
+       if (disc && vport->num_disc_nodes) {
                /* Check to see if there are more PLOGIs to be sent */
-               lpfc_more_plogi(phba);
-       }
-
-       if (rc != NLP_STE_FREED_NODE) {
-               spin_lock_irq(phba->host->host_lock);
-               ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-               spin_unlock_irq(phba->host->host_lock);
-       }
-
-       if (phba->num_disc_nodes == 0) {
-               if(disc) {
-                       spin_lock_irq(phba->host->host_lock);
-                       phba->fc_flag &= ~FC_NDISC_ACTIVE;
-                       spin_unlock_irq(phba->host->host_lock);
-               }
-               lpfc_can_disctmo(phba);
-               if (phba->fc_flag & FC_RSCN_MODE) {
-                       /* Check to see if more RSCNs came in while we were
-                        * processing this one.
-                        */
-                       if ((phba->fc_rscn_id_cnt == 0) &&
-                           (!(phba->fc_flag & FC_RSCN_DISCOVERY))) {
-                               spin_lock_irq(phba->host->host_lock);
-                               phba->fc_flag &= ~FC_RSCN_MODE;
-                               spin_unlock_irq(phba->host->host_lock);
-                       } else {
-                               lpfc_els_handle_rscn(phba);
+               lpfc_more_plogi(vport);
+
+               if (vport->num_disc_nodes == 0) {
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag &= ~FC_NDISC_ACTIVE;
+                       spin_unlock_irq(shost->host_lock);
+
+                       lpfc_can_disctmo(vport);
+                       if (vport->fc_flag & FC_RSCN_MODE) {
+                               /*
+                                * Check to see if more RSCNs came in while
+                                * we were processing this one.
+                                */
+                               if ((vport->fc_rscn_id_cnt == 0) &&
+                                   (!(vport->fc_flag & FC_RSCN_DISCOVERY))) {
+                                       spin_lock_irq(shost->host_lock);
+                                       vport->fc_flag &= ~FC_RSCN_MODE;
+                                       spin_unlock_irq(shost->host_lock);
+                               } else {
+                                       lpfc_els_handle_rscn(vport);
+                               }
                        }
                }
        }
@@ -781,9 +930,9 @@ out:
 }
 
 int
-lpfc_issue_els_plogi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
-                    uint8_t retry)
+lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry)
 {
+       struct lpfc_hba  *phba = vport->phba;
        struct serv_parm *sp;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
@@ -791,23 +940,24 @@ lpfc_issue_els_plogi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
        struct lpfc_sli *psli;
        uint8_t *pcmd;
        uint16_t cmdsize;
+       int ret;
 
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
 
-       cmdsize = (sizeof (uint32_t) + sizeof (struct serv_parm));
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_PLOGI)) == 0) {
-               return (1);
-       }
+       cmdsize = (sizeof(uint32_t) + sizeof(struct serv_parm));
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, NULL, did,
+                                    ELS_CMD_PLOGI);
+       if (!elsiocb)
+               return 1;
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        /* For PLOGI request, remainder of payload is service parameters */
        *((uint32_t *) (pcmd)) = ELS_CMD_PLOGI;
-       pcmd += sizeof (uint32_t);
-       memcpy(pcmd, &phba->fc_sparam, sizeof (struct serv_parm));
+       pcmd += sizeof(uint32_t);
+       memcpy(pcmd, &vport->fc_sparam, sizeof(struct serv_parm));
        sp = (struct serv_parm *) pcmd;
 
        if (sp->cmn.fcphLow < FC_PH_4_3)
@@ -818,22 +968,21 @@ lpfc_issue_els_plogi(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
 
        phba->fc_stat.elsXmitPLOGI++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_plogi;
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag |= NLP_PLOGI_SND;
-       if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
-               ndlp->nlp_flag &= ~NLP_PLOGI_SND;
-               spin_unlock_irq(phba->host->host_lock);
+       ret = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
+
+       if (ret == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       spin_unlock_irq(phba->host->host_lock);
-       return (0);
+       return 0;
 }
 
 static void
-lpfc_cmpl_els_prli(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                  struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_prli(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                  struct lpfc_iocbq *rspiocb)
 {
+       struct lpfc_vport *vport = cmdiocb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        IOCB_t *irsp;
        struct lpfc_sli *psli;
        struct lpfc_nodelist *ndlp;
@@ -844,20 +993,21 @@ lpfc_cmpl_els_prli(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 
        irsp = &(rspiocb->iocb);
        ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag &= ~NLP_PRLI_SND;
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(shost->host_lock);
 
        /* PRLI completes to NPort <nlp_DID> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0103 PRLI completes to NPort x%x "
-                       "Data: x%x x%x x%x\n",
-                       phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
-                       irsp->un.ulpWord[4], phba->num_disc_nodes);
+                       "%d (%d):0103 PRLI completes to NPort x%x "
+                       "Data: x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi, ndlp->nlp_DID,
+                       irsp->ulpStatus, irsp->un.ulpWord[4], irsp->ulpTimeout,
+                       vport->num_disc_nodes);
 
-       phba->fc_prli_sent--;
+       vport->fc_prli_sent--;
        /* Check to see if link went down during discovery */
-       if (lpfc_els_chk_latt(phba))
+       if (lpfc_els_chk_latt(vport))
                goto out;
 
        if (irsp->ulpStatus) {
@@ -869,18 +1019,18 @@ lpfc_cmpl_els_prli(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                /* PRLI failed */
                /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-                  ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
-                  (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
-                  (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
+                   ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                   (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
+                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
                        goto out;
-               }
-               else {
-                       lpfc_disc_state_machine(phba, ndlp, cmdiocb,
-                                       NLP_EVT_CMPL_PRLI);
+               } else {
+                       lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                               NLP_EVT_CMPL_PRLI);
                }
        } else {
                /* Good status, call state machine */
-               lpfc_disc_state_machine(phba, ndlp, cmdiocb, NLP_EVT_CMPL_PRLI);
+               lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                       NLP_EVT_CMPL_PRLI);
        }
 
 out:
@@ -889,9 +1039,11 @@ out:
 }
 
 int
-lpfc_issue_els_prli(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
+lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                    uint8_t retry)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba *phba = vport->phba;
        PRLI *npr;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
@@ -903,19 +1055,19 @@ lpfc_issue_els_prli(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
 
-       cmdsize = (sizeof (uint32_t) + sizeof (PRLI));
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_PRLI)) == 0) {
-               return (1);
-       }
+       cmdsize = (sizeof(uint32_t) + sizeof(PRLI));
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_PRLI);
+       if (!elsiocb)
+               return 1;
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        /* For PRLI request, remainder of payload is service parameters */
-       memset(pcmd, 0, (sizeof (PRLI) + sizeof (uint32_t)));
+       memset(pcmd, 0, (sizeof(PRLI) + sizeof(uint32_t)));
        *((uint32_t *) (pcmd)) = ELS_CMD_PRLI;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        /* For PRLI, remainder of payload is PRLI parameter page */
        npr = (PRLI *) pcmd;
@@ -937,106 +1089,108 @@ lpfc_issue_els_prli(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
 
        phba->fc_stat.elsXmitPRLI++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_prli;
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_PRLI_SND;
+       spin_unlock_irq(shost->host_lock);
        if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag &= ~NLP_PRLI_SND;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       spin_unlock_irq(phba->host->host_lock);
-       phba->fc_prli_sent++;
-       return (0);
+       vport->fc_prli_sent++;
+       return 0;
 }
 
 static void
-lpfc_more_adisc(struct lpfc_hba * phba)
+lpfc_more_adisc(struct lpfc_vport *vport)
 {
        int sentadisc;
+       struct lpfc_hba *phba = vport->phba;
 
-       if (phba->num_disc_nodes)
-               phba->num_disc_nodes--;
+       if (vport->num_disc_nodes)
+               vport->num_disc_nodes--;
 
        /* Continue discovery with <num_disc_nodes> ADISCs to go */
        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                       "%d:0210 Continue discovery with %d ADISCs to go "
+                       "%d (%d):0210 Continue discovery with %d ADISCs to go "
                        "Data: x%x x%x x%x\n",
-                       phba->brd_no, phba->num_disc_nodes, phba->fc_adisc_cnt,
-                       phba->fc_flag, phba->hba_state);
+                       phba->brd_no, vport->vpi, vport->num_disc_nodes,
+                       vport->fc_adisc_cnt, vport->fc_flag, vport->port_state);
 
        /* Check to see if there are more ADISCs to be sent */
-       if (phba->fc_flag & FC_NLP_MORE) {
-               lpfc_set_disctmo(phba);
-
-               /* go thru NPR list and issue any remaining ELS ADISCs */
-               sentadisc = lpfc_els_disc_adisc(phba);
+       if (vport->fc_flag & FC_NLP_MORE) {
+               lpfc_set_disctmo(vport);
+               /* go thru NPR nodes and issue any remaining ELS ADISCs */
+               sentadisc = lpfc_els_disc_adisc(vport);
        }
        return;
 }
 
 static void
-lpfc_rscn_disc(struct lpfc_hba * phba)
+lpfc_rscn_disc(struct lpfc_vport *vport)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
        /* RSCN discovery */
-       /* go thru NPR list and issue ELS PLOGIs */
-       if (phba->fc_npr_cnt) {
-               if (lpfc_els_disc_plogi(phba))
+       /* go thru NPR nodes and issue ELS PLOGIs */
+       if (vport->fc_npr_cnt)
+               if (lpfc_els_disc_plogi(vport))
                        return;
-       }
-       if (phba->fc_flag & FC_RSCN_MODE) {
+
+       if (vport->fc_flag & FC_RSCN_MODE) {
                /* Check to see if more RSCNs came in while we were
                 * processing this one.
                 */
-               if ((phba->fc_rscn_id_cnt == 0) &&
-                   (!(phba->fc_flag & FC_RSCN_DISCOVERY))) {
-                       spin_lock_irq(phba->host->host_lock);
-                       phba->fc_flag &= ~FC_RSCN_MODE;
-                       spin_unlock_irq(phba->host->host_lock);
+               if ((vport->fc_rscn_id_cnt == 0) &&
+                   (!(vport->fc_flag & FC_RSCN_DISCOVERY))) {
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag &= ~FC_RSCN_MODE;
+                       spin_unlock_irq(shost->host_lock);
                } else {
-                       lpfc_els_handle_rscn(phba);
+                       lpfc_els_handle_rscn(vport);
                }
        }
 }
 
 static void
-lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                   struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_adisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                   struct lpfc_iocbq *rspiocb)
 {
+       struct lpfc_vport *vport = cmdiocb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        IOCB_t *irsp;
-       struct lpfc_sli *psli;
        struct lpfc_nodelist *ndlp;
-       LPFC_MBOXQ_t *mbox;
-       int disc, rc;
-
-       psli = &phba->sli;
+       int  disc;
 
        /* we pass cmdiocb to state machine which needs rspiocb as well */
        cmdiocb->context_un.rsp_iocb = rspiocb;
 
        irsp = &(rspiocb->iocb);
        ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_ADISC_SND;
-       spin_unlock_irq(phba->host->host_lock);
 
        /* Since ndlp can be freed in the disc state machine, note if this node
         * is being used during discovery.
         */
+       spin_lock_irq(shost->host_lock);
        disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);
+       ndlp->nlp_flag &= ~(NLP_ADISC_SND | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
 
        /* ADISC completes to NPort <nlp_DID> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0104 ADISC completes to NPort x%x "
-                       "Data: x%x x%x x%x x%x\n",
-                       phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
-                       irsp->un.ulpWord[4], disc, phba->num_disc_nodes);
+                       "%d (%d):0104 ADISC completes to NPort x%x "
+                       "Data: x%x x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi, ndlp->nlp_DID,
+                       irsp->ulpStatus, irsp->un.ulpWord[4], irsp->ulpTimeout,
+                       disc, vport->num_disc_nodes);
 
        /* Check to see if link went down during discovery */
-       if (lpfc_els_chk_latt(phba)) {
-               spin_lock_irq(phba->host->host_lock);
+       if (lpfc_els_chk_latt(vport)) {
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag |= NLP_NPR_2B_DISC;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
                goto out;
        }
 
@@ -1045,184 +1199,190 @@ lpfc_cmpl_els_adisc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                if (lpfc_els_retry(phba, cmdiocb, rspiocb)) {
                        /* ELS command is being retried */
                        if (disc) {
-                               spin_lock_irq(phba->host->host_lock);
+                               spin_lock_irq(shost->host_lock);
                                ndlp->nlp_flag |= NLP_NPR_2B_DISC;
-                               spin_unlock_irq(phba->host->host_lock);
-                               lpfc_set_disctmo(phba);
+                               spin_unlock_irq(shost->host_lock);
+                               lpfc_set_disctmo(vport);
                        }
                        goto out;
                }
                /* ADISC failed */
                /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
-               if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-                  ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
-                  (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
-                  (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
-                       disc = (ndlp->nlp_flag & NLP_NPR_2B_DISC);
-               }
-               else {
-                       lpfc_disc_state_machine(phba, ndlp, cmdiocb,
+               if ((irsp->ulpStatus != IOSTAT_LOCAL_REJECT) ||
+                  ((irsp->un.ulpWord[4] != IOERR_SLI_ABORTED) &&
+                  (irsp->un.ulpWord[4] != IOERR_LINK_DOWN) &&
+                  (irsp->un.ulpWord[4] != IOERR_SLI_DOWN))) {
+                       lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                        NLP_EVT_CMPL_ADISC);
                }
        } else {
                /* Good status, call state machine */
-               lpfc_disc_state_machine(phba, ndlp, cmdiocb,
+               lpfc_disc_state_machine(vport, ndlp, cmdiocb,
                                        NLP_EVT_CMPL_ADISC);
        }
 
-       if (disc && phba->num_disc_nodes) {
+       if (disc && vport->num_disc_nodes) {
                /* Check to see if there are more ADISCs to be sent */
-               lpfc_more_adisc(phba);
+               lpfc_more_adisc(vport);
 
                /* Check to see if we are done with ADISC authentication */
-               if (phba->num_disc_nodes == 0) {
-                       lpfc_can_disctmo(phba);
-                       /* If we get here, there is nothing left to wait for */
-                       if ((phba->hba_state < LPFC_HBA_READY) &&
-                           (phba->hba_state != LPFC_CLEAR_LA)) {
-                               /* Link up discovery */
-                               if ((mbox = mempool_alloc(phba->mbox_mem_pool,
-                                                         GFP_KERNEL))) {
-                                       phba->hba_state = LPFC_CLEAR_LA;
-                                       lpfc_clear_la(phba, mbox);
-                                       mbox->mbox_cmpl =
-                                           lpfc_mbx_cmpl_clear_la;
-                                       rc = lpfc_sli_issue_mbox
-                                               (phba, mbox,
-                                                (MBX_NOWAIT | MBX_STOP_IOCB));
-                                       if (rc == MBX_NOT_FINISHED) {
-                                               mempool_free(mbox,
-                                                    phba->mbox_mem_pool);
-                                               lpfc_disc_flush_list(phba);
-                                               psli->ring[(psli->ip_ring)].
-                                                   flag &=
-                                                   ~LPFC_STOP_IOCB_EVENT;
-                                               psli->ring[(psli->fcp_ring)].
-                                                   flag &=
-                                                   ~LPFC_STOP_IOCB_EVENT;
-                                               psli->ring[(psli->next_ring)].
-                                                   flag &=
-                                                   ~LPFC_STOP_IOCB_EVENT;
-                                               phba->hba_state =
-                                                   LPFC_HBA_READY;
+               if (vport->num_disc_nodes == 0) {
+                       /* If we get here, there is nothing left to ADISC */
+                       /*
+                        * For NPIV, cmpl_reg_vpi will set port_state to READY,
+                        * and continue discovery.
+                        */
+                       if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+                          !(vport->fc_flag & FC_RSCN_MODE)) {
+                               lpfc_issue_reg_vpi(phba, vport);
+                               goto out;
+                       }
+                       /*
+                        * For SLI2, we need to set port_state to READY
+                        * and continue discovery.
+                        */
+                       if (vport->port_state < LPFC_VPORT_READY) {
+                               /* If we get here, there is nothing to ADISC */
+                               if (vport->port_type == LPFC_PHYSICAL_PORT)
+                                       lpfc_issue_clear_la(phba, vport);
+
+                               if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
+                                       vport->num_disc_nodes = 0;
+                                       /* go thru NPR list, issue ELS PLOGIs */
+                                       if (vport->fc_npr_cnt)
+                                               lpfc_els_disc_plogi(vport);
+
+                                       if (!vport->num_disc_nodes) {
+                                               spin_lock_irq(shost->host_lock);
+                                               vport->fc_flag &=
+                                                       ~FC_NDISC_ACTIVE;
+                                               spin_unlock_irq(
+                                                       shost->host_lock);
+                                               lpfc_can_disctmo(vport);
                                        }
                                }
+                               vport->port_state = LPFC_VPORT_READY;
                        } else {
-                               lpfc_rscn_disc(phba);
+                               lpfc_rscn_disc(vport);
                        }
                }
        }
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
 out:
        lpfc_els_free_iocb(phba, cmdiocb);
        return;
 }
 
 int
-lpfc_issue_els_adisc(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
+lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                     uint8_t retry)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        ADISC *ap;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
-       struct lpfc_sli_ring *pring;
-       struct lpfc_sli *psli;
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];
        uint8_t *pcmd;
        uint16_t cmdsize;
 
-       psli = &phba->sli;
-       pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
-
-       cmdsize = (sizeof (uint32_t) + sizeof (ADISC));
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_ADISC)) == 0) {
-               return (1);
-       }
+       cmdsize = (sizeof(uint32_t) + sizeof(ADISC));
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_ADISC);
+       if (!elsiocb)
+               return 1;
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        /* For ADISC request, remainder of payload is service parameters */
        *((uint32_t *) (pcmd)) = ELS_CMD_ADISC;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        /* Fill in ADISC payload */
        ap = (ADISC *) pcmd;
        ap->hardAL_PA = phba->fc_pref_ALPA;
-       memcpy(&ap->portName, &phba->fc_portname, sizeof (struct lpfc_name));
-       memcpy(&ap->nodeName, &phba->fc_nodename, sizeof (struct lpfc_name));
-       ap->DID = be32_to_cpu(phba->fc_myDID);
+       memcpy(&ap->portName, &vport->fc_portname, sizeof(struct lpfc_name));
+       memcpy(&ap->nodeName, &vport->fc_nodename, sizeof(struct lpfc_name));
+       ap->DID = be32_to_cpu(vport->fc_myDID);
 
        phba->fc_stat.elsXmitADISC++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_adisc;
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_ADISC_SND;
+       spin_unlock_irq(shost->host_lock);
        if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag &= ~NLP_ADISC_SND;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       spin_unlock_irq(phba->host->host_lock);
-       return (0);
+       return 0;
 }
 
 static void
-lpfc_cmpl_els_logo(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                  struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                  struct lpfc_iocbq *rspiocb)
 {
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
+       struct lpfc_vport *vport = ndlp->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        IOCB_t *irsp;
        struct lpfc_sli *psli;
-       struct lpfc_nodelist *ndlp;
 
        psli = &phba->sli;
        /* we pass cmdiocb to state machine which needs rspiocb as well */
        cmdiocb->context_un.rsp_iocb = rspiocb;
 
        irsp = &(rspiocb->iocb);
-       ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag &= ~NLP_LOGO_SND;
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(shost->host_lock);
 
        /* LOGO completes to NPort <nlp_DID> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0105 LOGO completes to NPort x%x "
-                       "Data: x%x x%x x%x\n",
-                       phba->brd_no, ndlp->nlp_DID, irsp->ulpStatus,
-                       irsp->un.ulpWord[4], phba->num_disc_nodes);
+                       "%d (%d):0105 LOGO completes to NPort x%x "
+                       "Data: x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi, ndlp->nlp_DID,
+                       irsp->ulpStatus, irsp->un.ulpWord[4], irsp->ulpTimeout,
+                       vport->num_disc_nodes);
 
        /* Check to see if link went down during discovery */
-       if (lpfc_els_chk_latt(phba))
+       if (lpfc_els_chk_latt(vport))
+               goto out;
+
+       if (ndlp->nlp_flag & NLP_TARGET_REMOVE) {
+               /* NLP_EVT_DEVICE_RM should unregister the RPI
+                * which should abort all outstanding IOs.
+                */
+               lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                       NLP_EVT_DEVICE_RM);
                goto out;
+       }
 
        if (irsp->ulpStatus) {
                /* Check for retry */
-               if (lpfc_els_retry(phba, cmdiocb, rspiocb)) {
+               if (lpfc_els_retry(phba, cmdiocb, rspiocb))
                        /* ELS command is being retried */
                        goto out;
-               }
                /* LOGO failed */
                /* Do not call DSM for lpfc_els_abort'ed ELS cmds */
                if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-                  ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
-                  (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
-                  (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
+                   ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                    (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
+                    (irsp->un.ulpWord[4] == IOERR_SLI_DOWN))) {
                        goto out;
-               }
-               else {
-                       lpfc_disc_state_machine(phba, ndlp, cmdiocb,
-                                       NLP_EVT_CMPL_LOGO);
+               } else {
+                       lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                               NLP_EVT_CMPL_LOGO);
                }
        } else {
-               /* Good status, call state machine */
-               lpfc_disc_state_machine(phba, ndlp, cmdiocb, NLP_EVT_CMPL_LOGO);
-
-               if (ndlp->nlp_flag & NLP_DELAY_TMO) {
-                       lpfc_unreg_rpi(phba, ndlp);
-               }
+               /* Good status, call state machine.
+                * This will unregister the rpi if needed.
+                */
+               lpfc_disc_state_machine(vport, ndlp, cmdiocb,
+                                       NLP_EVT_CMPL_LOGO);
        }
 
 out:
@@ -1231,74 +1391,82 @@ out:
 }
 
 int
-lpfc_issue_els_logo(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
+lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                    uint8_t retry)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
        struct lpfc_sli_ring *pring;
        struct lpfc_sli *psli;
        uint8_t *pcmd;
        uint16_t cmdsize;
+       int rc;
 
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];
 
-       cmdsize = 2 * (sizeof (uint32_t) + sizeof (struct lpfc_name));
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_LOGO)) == 0) {
-               return (1);
-       }
+       cmdsize = (2 * sizeof(uint32_t)) + sizeof(struct lpfc_name);
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_LOGO);
+       if (!elsiocb)
+               return 1;
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
        *((uint32_t *) (pcmd)) = ELS_CMD_LOGO;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        /* Fill in LOGO payload */
-       *((uint32_t *) (pcmd)) = be32_to_cpu(phba->fc_myDID);
-       pcmd += sizeof (uint32_t);
-       memcpy(pcmd, &phba->fc_portname, sizeof (struct lpfc_name));
+       *((uint32_t *) (pcmd)) = be32_to_cpu(vport->fc_myDID);
+       pcmd += sizeof(uint32_t);
+       memcpy(pcmd, &vport->fc_portname, sizeof(struct lpfc_name));
 
        phba->fc_stat.elsXmitLOGO++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_LOGO_SND;
-       if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
+       spin_unlock_irq(shost->host_lock);
+       rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
+
+       if (rc == IOCB_ERROR) {
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag &= ~NLP_LOGO_SND;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       spin_unlock_irq(phba->host->host_lock);
-       return (0);
+       return 0;
 }
 
 static void
-lpfc_cmpl_els_cmd(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                 struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_cmd(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_iocbq *rspiocb)
 {
+       struct lpfc_vport *vport = cmdiocb->vport;
        IOCB_t *irsp;
 
        irsp = &rspiocb->iocb;
 
        /* ELS cmd tag <ulpIoTag> completes */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_ELS,
-                       "%d:0106 ELS cmd tag x%x completes Data: x%x x%x\n",
-                       phba->brd_no,
-                       irsp->ulpIoTag, irsp->ulpStatus, irsp->un.ulpWord[4]);
+       lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+                       "%d (%d):0106 ELS cmd tag x%x completes Data: x%x x%x "
+                       "x%x\n",
+                       phba->brd_no, vport->vpi,
+                       irsp->ulpIoTag, irsp->ulpStatus,
+                       irsp->un.ulpWord[4], irsp->ulpTimeout);
 
        /* Check to see if link went down during discovery */
-       lpfc_els_chk_latt(phba);
+       lpfc_els_chk_latt(vport);
        lpfc_els_free_iocb(phba, cmdiocb);
        return;
 }
 
 int
-lpfc_issue_els_scr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
+lpfc_issue_els_scr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
 {
+       struct lpfc_hba  *phba = vport->phba;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
        struct lpfc_sli_ring *pring;
@@ -1309,46 +1477,46 @@ lpfc_issue_els_scr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
 
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
-       cmdsize = (sizeof (uint32_t) + sizeof (SCR));
-       if ((ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL)) == 0) {
-               return (1);
-       }
+       cmdsize = (sizeof(uint32_t) + sizeof(SCR));
+       ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+       if (!ndlp)
+               return 1;
 
-       lpfc_nlp_init(phba, ndlp, nportid);
+       lpfc_nlp_init(vport, ndlp, nportid);
 
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_SCR)) == 0) {
-               mempool_free( ndlp, phba->nlp_mem_pool);
-               return (1);
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_SCR);
+
+       if (!elsiocb) {
+               lpfc_nlp_put(ndlp);
+               return 1;
        }
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        *((uint32_t *) (pcmd)) = ELS_CMD_SCR;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        /* For SCR, remainder of payload is SCR parameter page */
-       memset(pcmd, 0, sizeof (SCR));
+       memset(pcmd, 0, sizeof(SCR));
        ((SCR *) pcmd)->Function = SCR_FUNC_FULL;
 
        phba->fc_stat.elsXmitSCR++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd;
-       spin_lock_irq(phba->host->host_lock);
        if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
-               spin_unlock_irq(phba->host->host_lock);
-               mempool_free( ndlp, phba->nlp_mem_pool);
+               lpfc_nlp_put(ndlp);
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       spin_unlock_irq(phba->host->host_lock);
-       mempool_free( ndlp, phba->nlp_mem_pool);
-       return (0);
+       lpfc_nlp_put(ndlp);
+       return 0;
 }
 
 static int
-lpfc_issue_els_farpr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
+lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry)
 {
+       struct lpfc_hba  *phba = vport->phba;
        IOCB_t *icmd;
        struct lpfc_iocbq *elsiocb;
        struct lpfc_sli_ring *pring;
@@ -1362,71 +1530,129 @@ lpfc_issue_els_farpr(struct lpfc_hba * phba, uint32_t nportid, uint8_t retry)
 
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
-       cmdsize = (sizeof (uint32_t) + sizeof (FARP));
-       if ((ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL)) == 0) {
-               return (1);
-       }
-       lpfc_nlp_init(phba, ndlp, nportid);
+       cmdsize = (sizeof(uint32_t) + sizeof(FARP));
+       ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+       if (!ndlp)
+               return 1;
 
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 1, cmdsize, retry,
-                                         ndlp, ELS_CMD_RNID)) == 0) {
-               mempool_free( ndlp, phba->nlp_mem_pool);
-               return (1);
+       lpfc_nlp_init(vport, ndlp, nportid);
+
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_RNID);
+       if (!elsiocb) {
+               lpfc_nlp_put(ndlp);
+               return 1;
        }
 
        icmd = &elsiocb->iocb;
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        *((uint32_t *) (pcmd)) = ELS_CMD_FARPR;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        /* Fill in FARPR payload */
        fp = (FARP *) (pcmd);
-       memset(fp, 0, sizeof (FARP));
+       memset(fp, 0, sizeof(FARP));
        lp = (uint32_t *) pcmd;
        *lp++ = be32_to_cpu(nportid);
-       *lp++ = be32_to_cpu(phba->fc_myDID);
+       *lp++ = be32_to_cpu(vport->fc_myDID);
        fp->Rflags = 0;
        fp->Mflags = (FARP_MATCH_PORT | FARP_MATCH_NODE);
 
-       memcpy(&fp->RportName, &phba->fc_portname, sizeof (struct lpfc_name));
-       memcpy(&fp->RnodeName, &phba->fc_nodename, sizeof (struct lpfc_name));
-       if ((ondlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, nportid))) {
+       memcpy(&fp->RportName, &vport->fc_portname, sizeof(struct lpfc_name));
+       memcpy(&fp->RnodeName, &vport->fc_nodename, sizeof(struct lpfc_name));
+       ondlp = lpfc_findnode_did(vport, nportid);
+       if (ondlp) {
                memcpy(&fp->OportName, &ondlp->nlp_portname,
-                      sizeof (struct lpfc_name));
+                      sizeof(struct lpfc_name));
                memcpy(&fp->OnodeName, &ondlp->nlp_nodename,
-                      sizeof (struct lpfc_name));
+                      sizeof(struct lpfc_name));
        }
 
        phba->fc_stat.elsXmitFARPR++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd;
-       spin_lock_irq(phba->host->host_lock);
        if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
-               spin_unlock_irq(phba->host->host_lock);
-               mempool_free( ndlp, phba->nlp_mem_pool);
+               lpfc_nlp_put(ndlp);
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
+       }
+       lpfc_nlp_put(ndlp);
+       return 0;
+}
+
+static void
+lpfc_end_rscn(struct lpfc_vport *vport)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       if (vport->fc_flag & FC_RSCN_MODE) {
+               /*
+                * Check to see if more RSCNs came in while we were
+                * processing this one.
+                */
+               if (vport->fc_rscn_id_cnt ||
+                   (vport->fc_flag & FC_RSCN_DISCOVERY) != 0)
+                       lpfc_els_handle_rscn(vport);
+               else {
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag &= ~FC_RSCN_MODE;
+                       spin_unlock_irq(shost->host_lock);
+               }
        }
-       spin_unlock_irq(phba->host->host_lock);
-       mempool_free( ndlp, phba->nlp_mem_pool);
-       return (0);
 }
 
 void
-lpfc_els_retry_delay(unsigned long ptr)
+lpfc_cancel_retry_delay_tmo(struct lpfc_vport *vport, struct lpfc_nodelist *nlp)
 {
-       struct lpfc_nodelist *ndlp;
-       struct lpfc_hba *phba;
-       unsigned long iflag;
-       struct lpfc_work_evt  *evtp;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       spin_lock_irq(shost->host_lock);
+       nlp->nlp_flag &= ~NLP_DELAY_TMO;
+       spin_unlock_irq(shost->host_lock);
+       del_timer_sync(&nlp->nlp_delayfunc);
+       nlp->nlp_last_elscmd = 0;
+
+       if (!list_empty(&nlp->els_retry_evt.evt_listp))
+               list_del_init(&nlp->els_retry_evt.evt_listp);
+
+       if (nlp->nlp_flag & NLP_NPR_2B_DISC) {
+               spin_lock_irq(shost->host_lock);
+               nlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+               spin_unlock_irq(shost->host_lock);
+               if (vport->num_disc_nodes) {
+                       /* Check to see if there are more
+                        * PLOGIs to be sent
+                        */
+                       lpfc_more_plogi(vport);
+
+                       if (vport->num_disc_nodes == 0) {
+                               spin_lock_irq(shost->host_lock);
+                               vport->fc_flag &= ~FC_NDISC_ACTIVE;
+                               spin_unlock_irq(shost->host_lock);
+                               lpfc_can_disctmo(vport);
+                               lpfc_end_rscn(vport);
+                       }
+               }
+       }
+       return;
+}
 
-       ndlp = (struct lpfc_nodelist *)ptr;
-       phba = ndlp->nlp_phba;
+void
+lpfc_els_retry_delay(unsigned long ptr)
+{
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) ptr;
+       struct lpfc_vport *vport = ndlp->vport;
+       struct lpfc_hba   *phba = vport->phba;
+       unsigned long flags;
+       struct lpfc_work_evt  *evtp = &ndlp->els_retry_evt;
+
+       ndlp = (struct lpfc_nodelist *) ptr;
+       phba = ndlp->vport->phba;
        evtp = &ndlp->els_retry_evt;
 
-       spin_lock_irqsave(phba->host->host_lock, iflag);
+       spin_lock_irqsave(&phba->hbalock, flags);
        if (!list_empty(&evtp->evt_listp)) {
-               spin_unlock_irqrestore(phba->host->host_lock, iflag);
+               spin_unlock_irqrestore(&phba->hbalock, flags);
                return;
        }
 
@@ -1434,86 +1660,90 @@ lpfc_els_retry_delay(unsigned long ptr)
        evtp->evt       = LPFC_EVT_ELS_RETRY;
        list_add_tail(&evtp->evt_listp, &phba->work_list);
        if (phba->work_wait)
-               wake_up(phba->work_wait);
+               lpfc_worker_wake_up(phba);
 
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
+       spin_unlock_irqrestore(&phba->hbalock, flags);
        return;
 }
 
 void
 lpfc_els_retry_delay_handler(struct lpfc_nodelist *ndlp)
 {
-       struct lpfc_hba *phba;
-       uint32_t cmd;
-       uint32_t did;
-       uint8_t retry;
+       struct lpfc_vport *vport = ndlp->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       uint32_t cmd, did, retry;
 
-       phba = ndlp->nlp_phba;
-       spin_lock_irq(phba->host->host_lock);
-       did = (uint32_t) (ndlp->nlp_DID);
-       cmd = (uint32_t) (ndlp->nlp_last_elscmd);
+       spin_lock_irq(shost->host_lock);
+       did = ndlp->nlp_DID;
+       cmd = ndlp->nlp_last_elscmd;
+       ndlp->nlp_last_elscmd = 0;
 
        if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
                return;
        }
 
        ndlp->nlp_flag &= ~NLP_DELAY_TMO;
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(shost->host_lock);
+       /*
+        * If a discovery event readded nlp_delayfunc after timer
+        * firing and before processing the timer, cancel the
+        * nlp_delayfunc.
+        */
+       del_timer_sync(&ndlp->nlp_delayfunc);
        retry = ndlp->nlp_retry;
 
        switch (cmd) {
        case ELS_CMD_FLOGI:
-               lpfc_issue_els_flogi(phba, ndlp, retry);
+               lpfc_issue_els_flogi(vport, ndlp, retry);
                break;
        case ELS_CMD_PLOGI:
-               if (!lpfc_issue_els_plogi(phba, ndlp, retry)) {
-                       ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
+               if (!lpfc_issue_els_plogi(vport, ndlp->nlp_DID, retry)) {
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
                }
                break;
        case ELS_CMD_ADISC:
-               if (!lpfc_issue_els_adisc(phba, ndlp, retry)) {
-                       ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
+               if (!lpfc_issue_els_adisc(vport, ndlp, retry)) {
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_ADISC_ISSUE);
                }
                break;
        case ELS_CMD_PRLI:
-               if (!lpfc_issue_els_prli(phba, ndlp, retry)) {
-                       ndlp->nlp_state = NLP_STE_PRLI_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST);
+               if (!lpfc_issue_els_prli(vport, ndlp, retry)) {
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PRLI_ISSUE);
                }
                break;
        case ELS_CMD_LOGO:
-               if (!lpfc_issue_els_logo(phba, ndlp, retry)) {
-                       ndlp->nlp_state = NLP_STE_NPR_NODE;
-                       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+               if (!lpfc_issue_els_logo(vport, ndlp, retry)) {
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
                }
                break;
+       case ELS_CMD_FDISC:
+               lpfc_issue_els_fdisc(vport, ndlp, retry);
+               break;
        }
        return;
 }
 
 static int
-lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-              struct lpfc_iocbq * rspiocb)
+lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+              struct lpfc_iocbq *rspiocb)
 {
-       IOCB_t *irsp;
-       struct lpfc_dmabuf *pcmd;
-       struct lpfc_nodelist *ndlp;
+       struct lpfc_vport *vport = cmdiocb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       IOCB_t *irsp = &rspiocb->iocb;
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
+       struct lpfc_dmabuf *pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
        uint32_t *elscmd;
        struct ls_rjt stat;
-       int retry, maxretry;
-       int delay;
-       uint32_t cmd;
+       int retry = 0, maxretry = lpfc_max_els_tries, delay = 0;
+       uint32_t cmd = 0;
+       uint32_t did;
+
 
-       retry = 0;
-       delay = 0;
-       maxretry = lpfc_max_els_tries;
-       irsp = &rspiocb->iocb;
-       ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
-       pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
-       cmd = 0;
        /* Note: context2 may be 0 for internal driver abort
         * of delays ELS command.
         */
@@ -1523,6 +1753,16 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                cmd = *elscmd++;
        }
 
+       if (ndlp)
+               did = ndlp->nlp_DID;
+       else {
+               /* We should only hit this case for retrying PLOGI */
+               did = irsp->un.elsreq64.remoteID;
+               ndlp = lpfc_findnode_did(vport, did);
+               if (!ndlp && (cmd != ELS_CMD_PLOGI))
+                       return 1;
+       }
+
        switch (irsp->ulpStatus) {
        case IOSTAT_FCP_RSP_ERROR:
        case IOSTAT_REMOTE_STOP:
@@ -1531,27 +1771,30 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
        case IOSTAT_LOCAL_REJECT:
                switch ((irsp->un.ulpWord[4] & 0xff)) {
                case IOERR_LOOP_OPEN_FAILURE:
-                       if (cmd == ELS_CMD_PLOGI) {
-                               if (cmdiocb->retry == 0) {
-                                       delay = 1;
-                               }
-                       }
+                       if (cmd == ELS_CMD_PLOGI && cmdiocb->retry == 0)
+                               delay = 1000;
                        retry = 1;
                        break;
 
                case IOERR_SEQUENCE_TIMEOUT:
                        retry = 1;
-                       if ((cmd == ELS_CMD_FLOGI)
-                           && (phba->fc_topology != TOPOLOGY_LOOP)) {
-                               delay = 1;
-                               maxretry = 48;
+                       break;
+
+               case IOERR_ILLEGAL_COMMAND:
+                       if ((phba->sli3_options & LPFC_SLI3_VPORT_TEARDOWN) &&
+                           (cmd == ELS_CMD_FDISC)) {
+                               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                               "%d (%d):0124 FDISC failed (3/6) retrying...\n",
+                                       phba->brd_no, vport->vpi);
+                               lpfc_mbx_unreg_vpi(vport);
+                               retry = 1;
+                               /* Always retry for this case */
+                               cmdiocb->retry = 0;
                        }
                        break;
 
                case IOERR_NO_RESOURCES:
-                       if (cmd == ELS_CMD_PLOGI) {
-                               delay = 1;
-                       }
+                       delay = 100;
                        retry = 1;
                        break;
 
@@ -1584,27 +1827,56 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                        if (stat.un.b.lsRjtRsnCodeExp ==
                            LSEXP_CMD_IN_PROGRESS) {
                                if (cmd == ELS_CMD_PLOGI) {
-                                       delay = 1;
+                                       delay = 1000;
                                        maxretry = 48;
                                }
                                retry = 1;
                                break;
                        }
                        if (cmd == ELS_CMD_PLOGI) {
-                               delay = 1;
+                               delay = 1000;
                                maxretry = lpfc_max_els_tries + 1;
                                retry = 1;
                                break;
                        }
+                       if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+                         (cmd == ELS_CMD_FDISC) &&
+                         (stat.un.b.lsRjtRsnCodeExp == LSEXP_OUT_OF_RESOURCE)){
+                               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                               "%d (%d):0125 FDISC Failed (x%x)."
+                               " Fabric out of resources\n",
+                               phba->brd_no, vport->vpi, stat.un.lsRjtError);
+                               lpfc_vport_set_state(vport,
+                                                    FC_VPORT_NO_FABRIC_RSCS);
+                       }
                        break;
 
                case LSRJT_LOGICAL_BSY:
                        if (cmd == ELS_CMD_PLOGI) {
-                               delay = 1;
+                               delay = 1000;
                                maxretry = 48;
+                       } else if (cmd == ELS_CMD_FDISC) {
+                               /* Always retry for this case */
+                               cmdiocb->retry = 0;
                        }
                        retry = 1;
                        break;
+
+               case LSRJT_LOGICAL_ERR:
+               case LSRJT_PROTOCOL_ERR:
+                       if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+                         (cmd == ELS_CMD_FDISC) &&
+                         ((stat.un.b.lsRjtRsnCodeExp == LSEXP_INVALID_PNAME) ||
+                         (stat.un.b.lsRjtRsnCodeExp == LSEXP_INVALID_NPORT_ID))
+                         ) {
+                               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                               "%d (%d):0123 FDISC Failed (x%x)."
+                               " Fabric Detected Bad WWN\n",
+                               phba->brd_no, vport->vpi, stat.un.lsRjtError);
+                               lpfc_vport_set_state(vport,
+                                                    FC_VPORT_FABRIC_REJ_WWN);
+                       }
+                       break;
                }
                break;
 
@@ -1616,88 +1888,103 @@ lpfc_els_retry(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
                break;
        }
 
-       if (ndlp->nlp_DID == FDMI_DID) {
+       if (did == FDMI_DID)
                retry = 1;
-       }
 
        if ((++cmdiocb->retry) >= maxretry) {
                phba->fc_stat.elsRetryExceeded++;
                retry = 0;
        }
 
+       if ((vport->load_flag & FC_UNLOADING) != 0)
+               retry = 0;
+
        if (retry) {
 
                /* Retry ELS command <elsCmd> to remote NPORT <did> */
                lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                               "%d:0107 Retry ELS command x%x to remote "
+                               "%d (%d):0107 Retry ELS command x%x to remote "
                                "NPORT x%x Data: x%x x%x\n",
-                               phba->brd_no,
-                               cmd, ndlp->nlp_DID, cmdiocb->retry, delay);
+                               phba->brd_no, vport->vpi,
+                               cmd, did, cmdiocb->retry, delay);
 
                if ((cmd == ELS_CMD_PLOGI) || (cmd == ELS_CMD_ADISC)) {
                        /* If discovery / RSCN timer is running, reset it */
-                       if (timer_pending(&phba->fc_disctmo) ||
-                             (phba->fc_flag & FC_RSCN_MODE)) {
-                               lpfc_set_disctmo(phba);
-                       }
+                       if (timer_pending(&vport->fc_disctmo) ||
+                           (vport->fc_flag & FC_RSCN_MODE))
+                               lpfc_set_disctmo(vport);
                }
 
                phba->fc_stat.elsXmitRetry++;
-               if (delay) {
+               if (ndlp && delay) {
                        phba->fc_stat.elsDelayRetry++;
                        ndlp->nlp_retry = cmdiocb->retry;
 
-                       mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+                       /* delay is specified in milliseconds */
+                       mod_timer(&ndlp->nlp_delayfunc,
+                               jiffies + msecs_to_jiffies(delay));
+                       spin_lock_irq(shost->host_lock);
                        ndlp->nlp_flag |= NLP_DELAY_TMO;
+                       spin_unlock_irq(shost->host_lock);
 
-                       ndlp->nlp_state = NLP_STE_NPR_NODE;
-                       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
                        ndlp->nlp_last_elscmd = cmd;
 
-                       return (1);
+                       return 1;
                }
                switch (cmd) {
                case ELS_CMD_FLOGI:
-                       lpfc_issue_els_flogi(phba, ndlp, cmdiocb->retry);
-                       return (1);
+                       lpfc_issue_els_flogi(vport, ndlp, cmdiocb->retry);
+                       return 1;
+               case ELS_CMD_FDISC:
+                       lpfc_issue_els_fdisc(vport, ndlp, cmdiocb->retry);
+                       return 1;
                case ELS_CMD_PLOGI:
-                       ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-                       lpfc_issue_els_plogi(phba, ndlp, cmdiocb->retry);
-                       return (1);
+                       if (ndlp) {
+                               ndlp->nlp_prev_state = ndlp->nlp_state;
+                               lpfc_nlp_set_state(vport, ndlp,
+                                                  NLP_STE_PLOGI_ISSUE);
+                       }
+                       lpfc_issue_els_plogi(vport, did, cmdiocb->retry);
+                       return 1;
                case ELS_CMD_ADISC:
-                       ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
-                       lpfc_issue_els_adisc(phba, ndlp, cmdiocb->retry);
-                       return (1);
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_ADISC_ISSUE);
+                       lpfc_issue_els_adisc(vport, ndlp, cmdiocb->retry);
+                       return 1;
                case ELS_CMD_PRLI:
-                       ndlp->nlp_state = NLP_STE_PRLI_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST);
-                       lpfc_issue_els_prli(phba, ndlp, cmdiocb->retry);
-                       return (1);
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PRLI_ISSUE);
+                       lpfc_issue_els_prli(vport, ndlp, cmdiocb->retry);
+                       return 1;
                case ELS_CMD_LOGO:
-                       ndlp->nlp_state = NLP_STE_NPR_NODE;
-                       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-                       lpfc_issue_els_logo(phba, ndlp, cmdiocb->retry);
-                       return (1);
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+                       lpfc_issue_els_logo(vport, ndlp, cmdiocb->retry);
+                       return 1;
                }
        }
 
        /* No retry ELS command <elsCmd> to remote NPORT <did> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0108 No retry ELS command x%x to remote NPORT x%x "
-                       "Data: x%x x%x\n",
-                       phba->brd_no,
-                       cmd, ndlp->nlp_DID, cmdiocb->retry, ndlp->nlp_flag);
+                       "%d (%d):0108 No retry ELS command x%x to remote "
+                       "NPORT x%x Data: x%x\n",
+                       phba->brd_no, vport->vpi,
+                       cmd, did, cmdiocb->retry);
 
-       return (0);
+       return 0;
 }
 
 int
-lpfc_els_free_iocb(struct lpfc_hba * phba, struct lpfc_iocbq * elsiocb)
+lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb)
 {
        struct lpfc_dmabuf *buf_ptr, *buf_ptr1;
 
+       if (elsiocb->context1) {
+               lpfc_nlp_put(elsiocb->context1);
+               elsiocb->context1 = NULL;
+       }
        /* context2  = cmd,  context2->next = rsp, context3 = bpl */
        if (elsiocb->context2) {
                buf_ptr1 = (struct lpfc_dmabuf *) elsiocb->context2;
@@ -1718,37 +2005,30 @@ lpfc_els_free_iocb(struct lpfc_hba * phba, struct lpfc_iocbq * elsiocb)
                lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
                kfree(buf_ptr);
        }
-       spin_lock_irq(phba->host->host_lock);
        lpfc_sli_release_iocbq(phba, elsiocb);
-       spin_unlock_irq(phba->host->host_lock);
        return 0;
 }
 
 static void
-lpfc_cmpl_els_logo_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                      struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                      struct lpfc_iocbq *rspiocb)
 {
-       struct lpfc_nodelist *ndlp;
-
-       ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
+       struct lpfc_vport *vport = cmdiocb->vport;
 
        /* ACC to LOGO completes to NPort <nlp_DID> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0109 ACC to LOGO completes to NPort x%x "
+                       "%d (%d):0109 ACC to LOGO completes to NPort x%x "
                        "Data: x%x x%x x%x\n",
-                       phba->brd_no, ndlp->nlp_DID, ndlp->nlp_flag,
-                       ndlp->nlp_state, ndlp->nlp_rpi);
-
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_LOGO_ACC;
-       spin_unlock_irq(phba->host->host_lock);
+                       phba->brd_no, vport->vpi, ndlp->nlp_DID,
+                       ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
        switch (ndlp->nlp_state) {
        case NLP_STE_UNUSED_NODE:       /* node is just allocated */
-               lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+               lpfc_drop_node(vport, ndlp);
                break;
        case NLP_STE_NPR_NODE:          /* NPort Recovery mode */
-               lpfc_unreg_rpi(phba, ndlp);
+               lpfc_unreg_rpi(vport, ndlp);
                break;
        default:
                break;
@@ -1758,75 +2038,98 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 }
 
 static void
-lpfc_cmpl_els_acc(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                 struct lpfc_iocbq * rspiocb)
+lpfc_cmpl_els_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_iocbq *rspiocb)
 {
-       struct lpfc_nodelist *ndlp;
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
+       struct lpfc_vport *vport = ndlp ? ndlp->vport : NULL;
+       struct Scsi_Host  *shost = vport ? lpfc_shost_from_vport(vport) : NULL;
+       IOCB_t *irsp;
        LPFC_MBOXQ_t *mbox = NULL;
+       struct lpfc_dmabuf *mp = NULL;
+
+       irsp = &rspiocb->iocb;
 
-       ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
        if (cmdiocb->context_un.mbox)
                mbox = cmdiocb->context_un.mbox;
 
-
        /* Check to see if link went down during discovery */
-       if ((lpfc_els_chk_latt(phba)) || !ndlp) {
+       if (!ndlp || lpfc_els_chk_latt(vport)) {
                if (mbox) {
-                       mempool_free( mbox, phba->mbox_mem_pool);
+                       mp = (struct lpfc_dmabuf *) mbox->context1;
+                       if (mp) {
+                               lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                               kfree(mp);
+                       }
+                       mempool_free(mbox, phba->mbox_mem_pool);
                }
                goto out;
        }
 
        /* ELS response tag <ulpIoTag> completes */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0110 ELS response tag x%x completes "
-                       "Data: x%x x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
+                       "%d (%d):0110 ELS response tag x%x completes "
+                       "Data: x%x x%x x%x x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi,
                        cmdiocb->iocb.ulpIoTag, rspiocb->iocb.ulpStatus,
-                       rspiocb->iocb.un.ulpWord[4], ndlp->nlp_DID,
-                       ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
+                       rspiocb->iocb.un.ulpWord[4], rspiocb->iocb.ulpTimeout,
+                       ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,
+                       ndlp->nlp_rpi);
 
        if (mbox) {
                if ((rspiocb->iocb.ulpStatus == 0)
                    && (ndlp->nlp_flag & NLP_ACC_REGLOGIN)) {
-                       /* set_slim mailbox command needs to execute first,
-                        * queue this command to be processed later.
-                        */
-                       lpfc_unreg_rpi(phba, ndlp);
+                       lpfc_unreg_rpi(vport, ndlp);
                        mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
-                       mbox->context2 = ndlp;
-                       ndlp->nlp_state = NLP_STE_REG_LOGIN_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_REGLOGIN_LIST);
+                       mbox->context2 = lpfc_nlp_get(ndlp);
+                       mbox->vport = vport;
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp,
+                                          NLP_STE_REG_LOGIN_ISSUE);
                        if (lpfc_sli_issue_mbox(phba, mbox,
                                                (MBX_NOWAIT | MBX_STOP_IOCB))
                            != MBX_NOT_FINISHED) {
                                goto out;
                        }
+                       lpfc_nlp_put(ndlp);
                        /* NOTE: we should have messages for unsuccessful
                           reglogin */
-                       mempool_free( mbox, phba->mbox_mem_pool);
                } else {
-                       mempool_free( mbox, phba->mbox_mem_pool);
-                       if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {
-                               lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
+                       /* Do not call NO_LIST for lpfc_els_abort'ed ELS cmds */
+                       if (!((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
+                             ((irsp->un.ulpWord[4] == IOERR_SLI_ABORTED) ||
+                              (irsp->un.ulpWord[4] == IOERR_LINK_DOWN) ||
+                              (irsp->un.ulpWord[4] == IOERR_SLI_DOWN)))) {
+                               if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {
+                                       lpfc_drop_node(vport, ndlp);
+                                       ndlp = NULL;
+                               }
                        }
                }
+               mp = (struct lpfc_dmabuf *) mbox->context1;
+               if (mp) {
+                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                       kfree(mp);
+               }
+               mempool_free(mbox, phba->mbox_mem_pool);
        }
 out:
        if (ndlp) {
-               spin_lock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag &= ~NLP_ACC_REGLOGIN;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
        }
        lpfc_els_free_iocb(phba, cmdiocb);
        return;
 }
 
 int
-lpfc_els_rsp_acc(struct lpfc_hba * phba, uint32_t flag,
-                struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp,
-                LPFC_MBOXQ_t * mbox, uint8_t newnode)
+lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag,
+                struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp,
+                LPFC_MBOXQ_t *mbox, uint8_t newnode)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        IOCB_t *icmd;
        IOCB_t *oldcmd;
        struct lpfc_iocbq *elsiocb;
@@ -1835,6 +2138,7 @@ lpfc_els_rsp_acc(struct lpfc_hba * phba, uint32_t flag,
        uint8_t *pcmd;
        uint16_t cmdsize;
        int rc;
+       ELS_PKT *els_pkt_ptr;
 
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
@@ -1842,25 +2146,29 @@ lpfc_els_rsp_acc(struct lpfc_hba * phba, uint32_t flag,
 
        switch (flag) {
        case ELS_CMD_ACC:
-               cmdsize = sizeof (uint32_t);
-               if ((elsiocb =
-                    lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                                       ndlp, ELS_CMD_ACC)) == 0) {
-                       return (1);
+               cmdsize = sizeof(uint32_t);
+               elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry,
+                                            ndlp, ndlp->nlp_DID, ELS_CMD_ACC);
+               if (!elsiocb) {
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag &= ~NLP_LOGO_ACC;
+                       spin_unlock_irq(shost->host_lock);
+                       return 1;
                }
+
                icmd = &elsiocb->iocb;
                icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
                pcmd = (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
                *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
-               pcmd += sizeof (uint32_t);
+               pcmd += sizeof(uint32_t);
                break;
        case ELS_CMD_PLOGI:
-               cmdsize = (sizeof (struct serv_parm) + sizeof (uint32_t));
-               if ((elsiocb =
-                    lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                                       ndlp, ELS_CMD_ACC)) == 0) {
-                       return (1);
-               }
+               cmdsize = (sizeof(struct serv_parm) + sizeof(uint32_t));
+               elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry,
+                                            ndlp, ndlp->nlp_DID, ELS_CMD_ACC);
+               if (!elsiocb)
+                       return 1;
+
                icmd = &elsiocb->iocb;
                icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
                pcmd = (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
@@ -1869,46 +2177,66 @@ lpfc_els_rsp_acc(struct lpfc_hba * phba, uint32_t flag,
                        elsiocb->context_un.mbox = mbox;
 
                *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
-               pcmd += sizeof (uint32_t);
-               memcpy(pcmd, &phba->fc_sparam, sizeof (struct serv_parm));
+               pcmd += sizeof(uint32_t);
+               memcpy(pcmd, &vport->fc_sparam, sizeof(struct serv_parm));
+               break;
+       case ELS_CMD_PRLO:
+               cmdsize = sizeof(uint32_t) + sizeof(PRLO);
+               elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry,
+                                            ndlp, ndlp->nlp_DID, ELS_CMD_PRLO);
+               if (!elsiocb)
+                       return 1;
+
+               icmd = &elsiocb->iocb;
+               icmd->ulpContext = oldcmd->ulpContext; /* Xri */
+               pcmd = (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
+
+               memcpy(pcmd, ((struct lpfc_dmabuf *) oldiocb->context2)->virt,
+                      sizeof(uint32_t) + sizeof(PRLO));
+               *((uint32_t *) (pcmd)) = ELS_CMD_PRLO_ACC;
+               els_pkt_ptr = (ELS_PKT *) pcmd;
+               els_pkt_ptr->un.prlo.acceptRspCode = PRLO_REQ_EXECUTED;
                break;
        default:
-               return (1);
+               return 1;
        }
 
-       if (newnode)
+       if (newnode) {
+               lpfc_nlp_put(ndlp);
                elsiocb->context1 = NULL;
+       }
 
        /* Xmit ELS ACC response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0128 Xmit ELS ACC response tag x%x "
-                       "Data: x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0128 Xmit ELS ACC response tag x%x, XRI: x%x, "
+                       "DID: x%x, nlp_flag: x%x nlp_state: x%x RPI: x%x\n",
+                       phba->brd_no, vport->vpi, elsiocb->iotag,
                        elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                        ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
        if (ndlp->nlp_flag & NLP_LOGO_ACC) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag &= ~NLP_LOGO_ACC;
+               spin_unlock_irq(shost->host_lock);
                elsiocb->iocb_cmpl = lpfc_cmpl_els_logo_acc;
        } else {
                elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
        }
 
        phba->fc_stat.elsXmitACC++;
-       spin_lock_irq(phba->host->host_lock);
        rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
-       spin_unlock_irq(phba->host->host_lock);
        if (rc == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       return (0);
+       return 0;
 }
 
 int
-lpfc_els_rsp_reject(struct lpfc_hba * phba, uint32_t rejectError,
-                   struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError,
+                   struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)
 {
+       struct lpfc_hba  *phba = vport->phba;
        IOCB_t *icmd;
        IOCB_t *oldcmd;
        struct lpfc_iocbq *elsiocb;
@@ -1921,11 +2249,11 @@ lpfc_els_rsp_reject(struct lpfc_hba * phba, uint32_t rejectError,
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
 
-       cmdsize = 2 * sizeof (uint32_t);
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                                         ndlp, ELS_CMD_LS_RJT)) == 0) {
-               return (1);
-       }
+       cmdsize = 2 * sizeof(uint32_t);
+       elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_LS_RJT);
+       if (!elsiocb)
+               return 1;
 
        icmd = &elsiocb->iocb;
        oldcmd = &oldiocb->iocb;
@@ -1933,92 +2261,86 @@ lpfc_els_rsp_reject(struct lpfc_hba * phba, uint32_t rejectError,
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        *((uint32_t *) (pcmd)) = ELS_CMD_LS_RJT;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
        *((uint32_t *) (pcmd)) = rejectError;
 
        /* Xmit ELS RJT <err> response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0129 Xmit ELS RJT x%x response tag x%x "
-                       "Data: x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       rejectError, elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0129 Xmit ELS RJT x%x response tag x%x "
+                       "xri x%x, did x%x, nlp_flag x%x, nlp_state x%x, "
+                       "rpi x%x\n",
+                       phba->brd_no, vport->vpi, rejectError, elsiocb->iotag,
                        elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                        ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
        phba->fc_stat.elsXmitLSRJT++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
-       spin_lock_irq(phba->host->host_lock);
        rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
-       spin_unlock_irq(phba->host->host_lock);
        if (rc == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       return (0);
+       return 0;
 }
 
 int
-lpfc_els_rsp_adisc_acc(struct lpfc_hba * phba,
-                      struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
+                      struct lpfc_nodelist *ndlp)
 {
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_sli  *psli = &phba->sli;
+       struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];
        ADISC *ap;
-       IOCB_t *icmd;
-       IOCB_t *oldcmd;
+       IOCB_t *icmd, *oldcmd;
        struct lpfc_iocbq *elsiocb;
-       struct lpfc_sli_ring *pring;
-       struct lpfc_sli *psli;
        uint8_t *pcmd;
        uint16_t cmdsize;
        int rc;
 
-       psli = &phba->sli;
-       pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
+       cmdsize = sizeof(uint32_t) + sizeof(ADISC);
+       elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_ACC);
+       if (!elsiocb)
+               return 1;
 
-       cmdsize = sizeof (uint32_t) + sizeof (ADISC);
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                                         ndlp, ELS_CMD_ACC)) == 0) {
-               return (1);
-       }
+       icmd = &elsiocb->iocb;
+       oldcmd = &oldiocb->iocb;
+       icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
 
        /* Xmit ADISC ACC response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0130 Xmit ADISC ACC response tag x%x "
-                       "Data: x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0130 Xmit ADISC ACC response iotag x%x xri: "
+                       "x%x, did x%x, nlp_flag x%x, nlp_state x%x rpi x%x\n",
+                       phba->brd_no, vport->vpi, elsiocb->iotag,
                        elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                        ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
-       icmd = &elsiocb->iocb;
-       oldcmd = &oldiocb->iocb;
-       icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        ap = (ADISC *) (pcmd);
        ap->hardAL_PA = phba->fc_pref_ALPA;
-       memcpy(&ap->portName, &phba->fc_portname, sizeof (struct lpfc_name));
-       memcpy(&ap->nodeName, &phba->fc_nodename, sizeof (struct lpfc_name));
-       ap->DID = be32_to_cpu(phba->fc_myDID);
+       memcpy(&ap->portName, &vport->fc_portname, sizeof(struct lpfc_name));
+       memcpy(&ap->nodeName, &vport->fc_nodename, sizeof(struct lpfc_name));
+       ap->DID = be32_to_cpu(vport->fc_myDID);
 
        phba->fc_stat.elsXmitACC++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
-       spin_lock_irq(phba->host->host_lock);
        rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
-       spin_unlock_irq(phba->host->host_lock);
        if (rc == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       return (0);
+       return 0;
 }
 
 int
-lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,
-                     struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb,
+                     struct lpfc_nodelist *ndlp)
 {
+       struct lpfc_hba  *phba = vport->phba;
        PRLI *npr;
        lpfc_vpd_t *vpd;
        IOCB_t *icmd;
@@ -2033,34 +2355,31 @@ lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
 
-       cmdsize = sizeof (uint32_t) + sizeof (PRLI);
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                                         ndlp,
-                                         (ELS_CMD_ACC |
-                                          (ELS_CMD_PRLI & ~ELS_RSP_MASK)))) ==
-           0) {
-               return (1);
-       }
+       cmdsize = sizeof(uint32_t) + sizeof(PRLI);
+       elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
+               ndlp->nlp_DID, (ELS_CMD_ACC | (ELS_CMD_PRLI & ~ELS_RSP_MASK)));
+       if (!elsiocb)
+               return 1;
+
+       icmd = &elsiocb->iocb;
+       oldcmd = &oldiocb->iocb;
+       icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
 
        /* Xmit PRLI ACC response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0131 Xmit PRLI ACC response tag x%x "
-                       "Data: x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0131 Xmit PRLI ACC response tag x%x xri x%x, "
+                       "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",
+                       phba->brd_no, vport->vpi, elsiocb->iotag,
                        elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                        ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
-       icmd = &elsiocb->iocb;
-       oldcmd = &oldiocb->iocb;
-       icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        *((uint32_t *) (pcmd)) = (ELS_CMD_ACC | (ELS_CMD_PRLI & ~ELS_RSP_MASK));
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
        /* For PRLI, remainder of payload is PRLI parameter page */
-       memset(pcmd, 0, sizeof (PRLI));
+       memset(pcmd, 0, sizeof(PRLI));
 
        npr = (PRLI *) pcmd;
        vpd = &phba->vpd;
@@ -2085,24 +2404,21 @@ lpfc_els_rsp_prli_acc(struct lpfc_hba * phba,
        phba->fc_stat.elsXmitACC++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
 
-       spin_lock_irq(phba->host->host_lock);
        rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
-       spin_unlock_irq(phba->host->host_lock);
        if (rc == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       return (0);
+       return 0;
 }
 
 static int
-lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
-                     uint8_t format,
-                     struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format,
+                     struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)
 {
+       struct lpfc_hba  *phba = vport->phba;
        RNID *rn;
-       IOCB_t *icmd;
-       IOCB_t *oldcmd;
+       IOCB_t *icmd, *oldcmd;
        struct lpfc_iocbq *elsiocb;
        struct lpfc_sli_ring *pring;
        struct lpfc_sli *psli;
@@ -2113,46 +2429,46 @@ lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
        psli = &phba->sli;
        pring = &psli->ring[LPFC_ELS_RING];
 
-       cmdsize = sizeof (uint32_t) + sizeof (uint32_t)
-               + (2 * sizeof (struct lpfc_name));
+       cmdsize = sizeof(uint32_t) + sizeof(uint32_t)
+                                       + (2 * sizeof(struct lpfc_name));
        if (format)
-               cmdsize += sizeof (RNID_TOP_DISC);
+               cmdsize += sizeof(RNID_TOP_DISC);
 
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                                         ndlp, ELS_CMD_ACC)) == 0) {
-               return (1);
-       }
+       elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_ACC);
+       if (!elsiocb)
+               return 1;
+
+       icmd = &elsiocb->iocb;
+       oldcmd = &oldiocb->iocb;
+       icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
 
        /* Xmit RNID ACC response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0132 Xmit RNID ACC response tag x%x "
-                       "Data: x%x\n",
-                       phba->brd_no,
-                       elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0132 Xmit RNID ACC response tag x%x "
+                       "xri x%x\n",
+                       phba->brd_no, vport->vpi, elsiocb->iotag,
                        elsiocb->iocb.ulpContext);
 
-       icmd = &elsiocb->iocb;
-       oldcmd = &oldiocb->iocb;
-       icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
 
        *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
-       pcmd += sizeof (uint32_t);
+       pcmd += sizeof(uint32_t);
 
-       memset(pcmd, 0, sizeof (RNID));
+       memset(pcmd, 0, sizeof(RNID));
        rn = (RNID *) (pcmd);
        rn->Format = format;
-       rn->CommonLen = (2 * sizeof (struct lpfc_name));
-       memcpy(&rn->portName, &phba->fc_portname, sizeof (struct lpfc_name));
-       memcpy(&rn->nodeName, &phba->fc_nodename, sizeof (struct lpfc_name));
+       rn->CommonLen = (2 * sizeof(struct lpfc_name));
+       memcpy(&rn->portName, &vport->fc_portname, sizeof(struct lpfc_name));
+       memcpy(&rn->nodeName, &vport->fc_nodename, sizeof(struct lpfc_name));
        switch (format) {
        case 0:
                rn->SpecificLen = 0;
                break;
        case RNID_TOPOLOGY_DISC:
-               rn->SpecificLen = sizeof (RNID_TOP_DISC);
+               rn->SpecificLen = sizeof(RNID_TOP_DISC);
                memcpy(&rn->un.topologyDisc.portName,
-                      &phba->fc_portname, sizeof (struct lpfc_name));
+                      &vport->fc_portname, sizeof(struct lpfc_name));
                rn->un.topologyDisc.unitType = RNID_HBA;
                rn->un.topologyDisc.physPort = 0;
                rn->un.topologyDisc.attachedNodes = 0;
@@ -2165,380 +2481,410 @@ lpfc_els_rsp_rnid_acc(struct lpfc_hba * phba,
 
        phba->fc_stat.elsXmitACC++;
        elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
+       lpfc_nlp_put(ndlp);
        elsiocb->context1 = NULL;  /* Don't need ndlp for cmpl,
                                    * it could be freed */
 
-       spin_lock_irq(phba->host->host_lock);
        rc = lpfc_sli_issue_iocb(phba, pring, elsiocb, 0);
-       spin_unlock_irq(phba->host->host_lock);
        if (rc == IOCB_ERROR) {
                lpfc_els_free_iocb(phba, elsiocb);
-               return (1);
+               return 1;
        }
-       return (0);
+       return 0;
 }
 
 int
-lpfc_els_disc_adisc(struct lpfc_hba * phba)
+lpfc_els_disc_adisc(struct lpfc_vport *vport)
 {
-       int sentadisc;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
        struct lpfc_nodelist *ndlp, *next_ndlp;
-
-       sentadisc = 0;
-       /* go thru NPR list and issue any remaining ELS ADISCs */
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                       nlp_listp) {
-               if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
-                       if (ndlp->nlp_flag & NLP_NPR_ADISC) {
-                               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
-                               ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
-                               lpfc_nlp_list(phba, ndlp,
-                                       NLP_ADISC_LIST);
-                               lpfc_issue_els_adisc(phba, ndlp, 0);
-                               sentadisc++;
-                               phba->num_disc_nodes++;
-                               if (phba->num_disc_nodes >=
-                                   phba->cfg_discovery_threads) {
-                                       spin_lock_irq(phba->host->host_lock);
-                                       phba->fc_flag |= FC_NLP_MORE;
-                                       spin_unlock_irq(phba->host->host_lock);
-                                       break;
-                               }
+       int sentadisc = 0;
+
+       /* go thru NPR nodes and issue any remaining ELS ADISCs */
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+               if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
+                   (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
+                   (ndlp->nlp_flag & NLP_NPR_ADISC) != 0) {
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                       spin_unlock_irq(shost->host_lock);
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_ADISC_ISSUE);
+                       lpfc_issue_els_adisc(vport, ndlp, 0);
+                       sentadisc++;
+                       vport->num_disc_nodes++;
+                       if (vport->num_disc_nodes >=
+                           vport->phba->cfg_discovery_threads) {
+                               spin_lock_irq(shost->host_lock);
+                               vport->fc_flag |= FC_NLP_MORE;
+                               spin_unlock_irq(shost->host_lock);
+                               break;
                        }
                }
        }
        if (sentadisc == 0) {
-               spin_lock_irq(phba->host->host_lock);
-               phba->fc_flag &= ~FC_NLP_MORE;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~FC_NLP_MORE;
+               spin_unlock_irq(shost->host_lock);
        }
-       return(sentadisc);
+       return sentadisc;
 }
 
 int
-lpfc_els_disc_plogi(struct lpfc_hba * phba)
+lpfc_els_disc_plogi(struct lpfc_vport *vport)
 {
-       int sentplogi;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
        struct lpfc_nodelist *ndlp, *next_ndlp;
-
-       sentplogi = 0;
-       /* go thru NPR list and issue any remaining ELS PLOGIs */
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                               nlp_listp) {
-               if ((ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
-                  (!(ndlp->nlp_flag & NLP_DELAY_TMO))) {
-                       if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
-                               ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                               lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-                               lpfc_issue_els_plogi(phba, ndlp, 0);
-                               sentplogi++;
-                               phba->num_disc_nodes++;
-                               if (phba->num_disc_nodes >=
-                                   phba->cfg_discovery_threads) {
-                                       spin_lock_irq(phba->host->host_lock);
-                                       phba->fc_flag |= FC_NLP_MORE;
-                                       spin_unlock_irq(phba->host->host_lock);
-                                       break;
-                               }
+       int sentplogi = 0;
+
+       /* go thru NPR nodes and issue any remaining ELS PLOGIs */
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+               if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
+                   (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
+                   (ndlp->nlp_flag & NLP_DELAY_TMO) == 0 &&
+                   (ndlp->nlp_flag & NLP_NPR_ADISC) == 0) {
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
+                       lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
+                       sentplogi++;
+                       vport->num_disc_nodes++;
+                       if (vport->num_disc_nodes >=
+                           vport->phba->cfg_discovery_threads) {
+                               spin_lock_irq(shost->host_lock);
+                               vport->fc_flag |= FC_NLP_MORE;
+                               spin_unlock_irq(shost->host_lock);
+                               break;
                        }
                }
        }
        if (sentplogi == 0) {
-               spin_lock_irq(phba->host->host_lock);
-               phba->fc_flag &= ~FC_NLP_MORE;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~FC_NLP_MORE;
+               spin_unlock_irq(shost->host_lock);
        }
-       return(sentplogi);
+       return sentplogi;
 }
 
-int
-lpfc_els_flush_rscn(struct lpfc_hba * phba)
+void
+lpfc_els_flush_rscn(struct lpfc_vport *vport)
 {
-       struct lpfc_dmabuf *mp;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        int i;
 
-       for (i = 0; i < phba->fc_rscn_id_cnt; i++) {
-               mp = phba->fc_rscn_id_list[i];
-               lpfc_mbuf_free(phba, mp->virt, mp->phys);
-               kfree(mp);
-               phba->fc_rscn_id_list[i] = NULL;
+       for (i = 0; i < vport->fc_rscn_id_cnt; i++) {
+               lpfc_in_buf_free(phba, vport->fc_rscn_id_list[i]);
+               vport->fc_rscn_id_list[i] = NULL;
        }
-       phba->fc_rscn_id_cnt = 0;
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag &= ~(FC_RSCN_MODE | FC_RSCN_DISCOVERY);
-       spin_unlock_irq(phba->host->host_lock);
-       lpfc_can_disctmo(phba);
-       return (0);
+       spin_lock_irq(shost->host_lock);
+       vport->fc_rscn_id_cnt = 0;
+       vport->fc_flag &= ~(FC_RSCN_MODE | FC_RSCN_DISCOVERY);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_can_disctmo(vport);
 }
 
 int
-lpfc_rscn_payload_check(struct lpfc_hba * phba, uint32_t did)
+lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did)
 {
        D_ID ns_did;
        D_ID rscn_did;
-       struct lpfc_dmabuf *mp;
        uint32_t *lp;
-       uint32_t payload_len, cmd, i, match;
+       uint32_t payload_len, i;
+       struct lpfc_hba *phba = vport->phba;
 
        ns_did.un.word = did;
-       match = 0;
 
        /* Never match fabric nodes for RSCNs */
        if ((did & Fabric_DID_MASK) == Fabric_DID_MASK)
-               return(0);
+               return 0;
 
        /* If we are doing a FULL RSCN rediscovery, match everything */
-       if (phba->fc_flag & FC_RSCN_DISCOVERY) {
-               return (did);
-       }
+       if (vport->fc_flag & FC_RSCN_DISCOVERY)
+               return did;
 
-       for (i = 0; i < phba->fc_rscn_id_cnt; i++) {
-               mp = phba->fc_rscn_id_list[i];
-               lp = (uint32_t *) mp->virt;
-               cmd = *lp++;
-               payload_len = be32_to_cpu(cmd) & 0xffff; /* payload length */
-               payload_len -= sizeof (uint32_t);       /* take off word 0 */
+       for (i = 0; i < vport->fc_rscn_id_cnt; i++) {
+               lp = vport->fc_rscn_id_list[i]->virt;
+               payload_len = be32_to_cpu(*lp++ & ~ELS_CMD_MASK);
+               payload_len -= sizeof(uint32_t);        /* take off word 0 */
                while (payload_len) {
-                       rscn_did.un.word = *lp++;
-                       rscn_did.un.word = be32_to_cpu(rscn_did.un.word);
-                       payload_len -= sizeof (uint32_t);
+                       rscn_did.un.word = be32_to_cpu(*lp++);
+                       payload_len -= sizeof(uint32_t);
                        switch (rscn_did.un.b.resv) {
                        case 0: /* Single N_Port ID effected */
-                               if (ns_did.un.word == rscn_did.un.word) {
-                                       match = did;
-                               }
+                               if (ns_did.un.word == rscn_did.un.word)
+                                       return did;
                                break;
                        case 1: /* Whole N_Port Area effected */
                                if ((ns_did.un.b.domain == rscn_did.un.b.domain)
                                    && (ns_did.un.b.area == rscn_did.un.b.area))
-                                       {
-                                               match = did;
-                                       }
+                                       return did;
                                break;
                        case 2: /* Whole N_Port Domain effected */
                                if (ns_did.un.b.domain == rscn_did.un.b.domain)
-                                       {
-                                               match = did;
-                                       }
-                               break;
-                       case 3: /* Whole Fabric effected */
-                               match = did;
+                                       return did;
                                break;
                        default:
-                               /* Unknown Identifier in RSCN list */
+                               /* Unknown Identifier in RSCN node */
                                lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                               "%d:0217 Unknown Identifier in "
-                                               "RSCN payload Data: x%x\n",
-                                               phba->brd_no, rscn_did.un.word);
-                               break;
-                       }
-                       if (match) {
-                               break;
+                                               "%d (%d):0217 Unknown "
+                                               "Identifier in RSCN payload "
+                                               "Data: x%x\n",
+                                               phba->brd_no, vport->vpi,
+                                               rscn_did.un.word);
+                       case 3: /* Whole Fabric effected */
+                               return did;
                        }
                }
        }
-       return (match);
+       return 0;
 }
 
 static int
-lpfc_rscn_recovery_check(struct lpfc_hba * phba)
+lpfc_rscn_recovery_check(struct lpfc_vport *vport)
 {
-       struct lpfc_nodelist *ndlp = NULL, *next_ndlp;
-       struct list_head *listp;
-       struct list_head *node_list[7];
-       int i;
+       struct lpfc_nodelist *ndlp = NULL;
 
        /* Look at all nodes effected by pending RSCNs and move
-        * them to NPR list.
+        * them to NPR state.
         */
-       node_list[0] = &phba->fc_npr_list;  /* MUST do this list first */
-       node_list[1] = &phba->fc_nlpmap_list;
-       node_list[2] = &phba->fc_nlpunmap_list;
-       node_list[3] = &phba->fc_prli_list;
-       node_list[4] = &phba->fc_reglogin_list;
-       node_list[5] = &phba->fc_adisc_list;
-       node_list[6] = &phba->fc_plogi_list;
-       for (i = 0; i < 7; i++) {
-               listp = node_list[i];
-               if (list_empty(listp))
+
+       list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
+               if (ndlp->nlp_state == NLP_STE_UNUSED_NODE ||
+                   lpfc_rscn_payload_check(vport, ndlp->nlp_DID) == 0)
                        continue;
 
-               list_for_each_entry_safe(ndlp, next_ndlp, listp, nlp_listp) {
-                       if (!(lpfc_rscn_payload_check(phba, ndlp->nlp_DID)))
-                               continue;
+               lpfc_disc_state_machine(vport, ndlp, NULL,
+                                               NLP_EVT_DEVICE_RECOVERY);
 
-                       lpfc_disc_state_machine(phba, ndlp, NULL,
-                                       NLP_EVT_DEVICE_RECOVERY);
-                       if (ndlp->nlp_flag & NLP_DELAY_TMO) {
-                               ndlp->nlp_flag &= ~NLP_DELAY_TMO;
-                               del_timer_sync(&ndlp->nlp_delayfunc);
-                               if (!list_empty(&ndlp->
-                                               els_retry_evt.evt_listp))
-                                       list_del_init(&ndlp->
-                                               els_retry_evt.evt_listp);
-                       }
-               }
+               /*
+                * Make sure NLP_DELAY_TMO is NOT running after a device
+                * recovery event.
+                */
+               if (ndlp->nlp_flag & NLP_DELAY_TMO)
+                       lpfc_cancel_retry_delay_tmo(vport, ndlp);
        }
-       return (0);
+
+       return 0;
 }
 
 static int
-lpfc_els_rcv_rscn(struct lpfc_hba * phba,
-                 struct lpfc_iocbq * cmdiocb,
-                 struct lpfc_nodelist * ndlp, uint8_t newnode)
+lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_nodelist *ndlp, uint8_t newnode)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        struct lpfc_dmabuf *pcmd;
-       uint32_t *lp;
+       struct lpfc_vport *next_vport;
+       uint32_t *lp, *datap;
        IOCB_t *icmd;
-       uint32_t payload_len, cmd;
+       uint32_t payload_len, length, nportid, *cmd;
+       int rscn_cnt = vport->fc_rscn_id_cnt;
+       int rscn_id = 0, hba_id = 0;
+       int i;
 
        icmd = &cmdiocb->iocb;
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
        lp = (uint32_t *) pcmd->virt;
 
-       cmd = *lp++;
-       payload_len = be32_to_cpu(cmd) & 0xffff;        /* payload length */
-       payload_len -= sizeof (uint32_t);       /* take off word 0 */
-       cmd &= ELS_CMD_MASK;
+       payload_len = be32_to_cpu(*lp++ & ~ELS_CMD_MASK);
+       payload_len -= sizeof(uint32_t);        /* take off word 0 */
 
        /* RSCN received */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_DISCOVERY,
-                       "%d:0214 RSCN received Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       phba->fc_flag, payload_len, *lp, phba->fc_rscn_id_cnt);
+       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
+                       "%d (%d):0214 RSCN received Data: x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi, vport->fc_flag, payload_len,
+                       *lp, rscn_cnt);
+
+       for (i = 0; i < payload_len/sizeof(uint32_t); i++)
+               fc_host_post_event(shost, fc_get_event_number(),
+                       FCH_EVT_RSCN, lp[i]);
 
        /* If we are about to begin discovery, just ACC the RSCN.
         * Discovery processing will satisfy it.
         */
-       if (phba->hba_state < LPFC_NS_QRY) {
-               lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL,
-                                                               newnode);
-               return (0);
+       if (vport->port_state <= LPFC_NS_QRY) {
+               lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL,
+                                newnode);
+               return 0;
+       }
+
+       /* If this RSCN just contains NPortIDs for other vports on this HBA,
+        * just ACC and ignore it.
+        */
+       if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+               !(phba->cfg_peer_port_login)) {
+               i = payload_len;
+               datap = lp;
+               while (i > 0) {
+                       nportid = *datap++;
+                       nportid = ((be32_to_cpu(nportid)) & Mask_DID);
+                       i -= sizeof(uint32_t);
+                       rscn_id++;
+                       list_for_each_entry(next_vport, &phba->port_list,
+                               listentry) {
+                               if (nportid == next_vport->fc_myDID) {
+                                       hba_id++;
+                                       break;
+                               }
+                       }
+               }
+               if (rscn_id == hba_id) {
+                       /* ALL NPortIDs in RSCN are on HBA */
+                       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
+                         "%d (%d):0214 Ignore RSCN Data: x%x x%x x%x x%x\n",
+                         phba->brd_no, vport->vpi, vport->fc_flag, payload_len,
+                         *lp, rscn_cnt);
+                       lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb,
+                               ndlp, NULL, newnode);
+                       return 0;
+               }
        }
 
        /* If we are already processing an RSCN, save the received
         * RSCN payload buffer, cmdiocb->context2 to process later.
         */
-       if (phba->fc_flag & (FC_RSCN_MODE | FC_NDISC_ACTIVE)) {
-               if ((phba->fc_rscn_id_cnt < FC_MAX_HOLD_RSCN) &&
-                   !(phba->fc_flag & FC_RSCN_DISCOVERY)) {
-                       spin_lock_irq(phba->host->host_lock);
-                       phba->fc_flag |= FC_RSCN_MODE;
-                       spin_unlock_irq(phba->host->host_lock);
-                       phba->fc_rscn_id_list[phba->fc_rscn_id_cnt++] = pcmd;
-
-                       /* If we zero, cmdiocb->context2, the calling
-                        * routine will not try to free it.
-                        */
-                       cmdiocb->context2 = NULL;
+       if (vport->fc_flag & (FC_RSCN_MODE | FC_NDISC_ACTIVE)) {
+               vport->fc_flag |= FC_RSCN_DEFERRED;
+               if ((rscn_cnt < FC_MAX_HOLD_RSCN) &&
+                   !(vport->fc_flag & FC_RSCN_DISCOVERY)) {
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag |= FC_RSCN_MODE;
+                       spin_unlock_irq(shost->host_lock);
+                       if (rscn_cnt) {
+                               cmd = vport->fc_rscn_id_list[rscn_cnt-1]->virt;
+                               length = be32_to_cpu(*cmd & ~ELS_CMD_MASK);
+                       }
+                       if ((rscn_cnt) &&
+                           (payload_len + length <= LPFC_BPL_SIZE)) {
+                               *cmd &= ELS_CMD_MASK;
+                               *cmd |= be32_to_cpu(payload_len + length);
+                               memcpy(((uint8_t *)cmd) + length, lp,
+                                      payload_len);
+                       } else {
+                               vport->fc_rscn_id_list[rscn_cnt] = pcmd;
+                               vport->fc_rscn_id_cnt++;
+                               /* If we zero, cmdiocb->context2, the calling
+                                * routine will not try to free it.
+                                */
+                               cmdiocb->context2 = NULL;
+                       }
 
                        /* Deferred RSCN */
                        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                       "%d:0235 Deferred RSCN "
+                                       "%d (%d):0235 Deferred RSCN "
                                        "Data: x%x x%x x%x\n",
-                                       phba->brd_no, phba->fc_rscn_id_cnt,
-                                       phba->fc_flag, phba->hba_state);
+                                       phba->brd_no, vport->vpi,
+                                       vport->fc_rscn_id_cnt, vport->fc_flag,
+                                       vport->port_state);
                } else {
-                       spin_lock_irq(phba->host->host_lock);
-                       phba->fc_flag |= FC_RSCN_DISCOVERY;
-                       spin_unlock_irq(phba->host->host_lock);
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag |= FC_RSCN_DISCOVERY;
+                       spin_unlock_irq(shost->host_lock);
                        /* ReDiscovery RSCN */
                        lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                                       "%d:0234 ReDiscovery RSCN "
+                                       "%d (%d):0234 ReDiscovery RSCN "
                                        "Data: x%x x%x x%x\n",
-                                       phba->brd_no, phba->fc_rscn_id_cnt,
-                                       phba->fc_flag, phba->hba_state);
+                                       phba->brd_no, vport->vpi,
+                                       vport->fc_rscn_id_cnt, vport->fc_flag,
+                                       vport->port_state);
                }
                /* Send back ACC */
-               lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL,
+               lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL,
                                                                newnode);
 
                /* send RECOVERY event for ALL nodes that match RSCN payload */
-               lpfc_rscn_recovery_check(phba);
-               return (0);
+               lpfc_rscn_recovery_check(vport);
+               vport->fc_flag &= ~FC_RSCN_DEFERRED;
+               return 0;
        }
 
-       phba->fc_flag |= FC_RSCN_MODE;
-       phba->fc_rscn_id_list[phba->fc_rscn_id_cnt++] = pcmd;
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag |= FC_RSCN_MODE;
+       spin_unlock_irq(shost->host_lock);
+       vport->fc_rscn_id_list[vport->fc_rscn_id_cnt++] = pcmd;
        /*
         * If we zero, cmdiocb->context2, the calling routine will
         * not try to free it.
         */
        cmdiocb->context2 = NULL;
 
-       lpfc_set_disctmo(phba);
+       lpfc_set_disctmo(vport);
 
        /* Send back ACC */
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, newnode);
+       lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL, newnode);
 
        /* send RECOVERY event for ALL nodes that match RSCN payload */
-       lpfc_rscn_recovery_check(phba);
+       lpfc_rscn_recovery_check(vport);
 
-       return (lpfc_els_handle_rscn(phba));
+       return lpfc_els_handle_rscn(vport);
 }
 
 int
-lpfc_els_handle_rscn(struct lpfc_hba * phba)
+lpfc_els_handle_rscn(struct lpfc_vport *vport)
 {
        struct lpfc_nodelist *ndlp;
+       struct lpfc_hba *phba = vport->phba;
+
+       /* Ignore RSCN if the port is being torn down. */
+       if (vport->load_flag & FC_UNLOADING) {
+               lpfc_els_flush_rscn(vport);
+               return 0;
+       }
 
        /* Start timer for RSCN processing */
-       lpfc_set_disctmo(phba);
+       lpfc_set_disctmo(vport);
 
        /* RSCN processed */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_DISCOVERY,
-                       "%d:0215 RSCN processed Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       phba->fc_flag, 0, phba->fc_rscn_id_cnt,
-                       phba->hba_state);
+       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
+                       "%d (%d):0215 RSCN processed Data: x%x x%x x%x x%x\n",
+                       phba->brd_no, vport->vpi,
+                       vport->fc_flag, 0, vport->fc_rscn_id_cnt,
+                       vport->port_state);
 
        /* To process RSCN, first compare RSCN data with NameServer */
-       phba->fc_ns_retry = 0;
-       if ((ndlp = lpfc_findnode_did(phba, NLP_SEARCH_UNMAPPED,
-                                     NameServer_DID))) {
+       vport->fc_ns_retry = 0;
+       ndlp = lpfc_findnode_did(vport, NameServer_DID);
+       if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
                /* Good ndlp, issue CT Request to NameServer */
-               if (lpfc_ns_cmd(phba, ndlp, SLI_CTNS_GID_FT) == 0) {
+               if (lpfc_ns_cmd(vport, SLI_CTNS_GID_FT, 0, 0) == 0)
                        /* Wait for NameServer query cmpl before we can
                           continue */
-                       return (1);
-               }
+                       return 1;
        } else {
                /* If login to NameServer does not exist, issue one */
                /* Good status, issue PLOGI to NameServer */
-               if ((ndlp =
-                    lpfc_findnode_did(phba, NLP_SEARCH_ALL, NameServer_DID))) {
+               ndlp = lpfc_findnode_did(vport, NameServer_DID);
+               if (ndlp)
                        /* Wait for NameServer login cmpl before we can
                           continue */
-                       return (1);
-               }
-               if ((ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL))
-                   == 0) {
-                       lpfc_els_flush_rscn(phba);
-                       return (0);
+                       return 1;
+
+               ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+               if (!ndlp) {
+                       lpfc_els_flush_rscn(vport);
+                       return 0;
                } else {
-                       lpfc_nlp_init(phba, ndlp, NameServer_DID);
+                       lpfc_nlp_init(vport, ndlp, NameServer_DID);
                        ndlp->nlp_type |= NLP_FABRIC;
-                       ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                       lpfc_issue_els_plogi(phba, ndlp, 0);
+                       ndlp->nlp_prev_state = ndlp->nlp_state;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
+                       lpfc_issue_els_plogi(vport, NameServer_DID, 0);
                        /* Wait for NameServer login cmpl before we can
                           continue */
-                       return (1);
+                       return 1;
                }
        }
 
-       lpfc_els_flush_rscn(phba);
-       return (0);
+       lpfc_els_flush_rscn(vport);
+       return 0;
 }
 
 static int
-lpfc_els_rcv_flogi(struct lpfc_hba * phba,
-                  struct lpfc_iocbq * cmdiocb,
-                  struct lpfc_nodelist * ndlp, uint8_t newnode)
+lpfc_els_rcv_flogi(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                  struct lpfc_nodelist *ndlp, uint8_t newnode)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
        struct lpfc_dmabuf *pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
        uint32_t *lp = (uint32_t *) pcmd->virt;
        IOCB_t *icmd = &cmdiocb->iocb;
@@ -2553,7 +2899,7 @@ lpfc_els_rcv_flogi(struct lpfc_hba * phba,
 
        /* FLOGI received */
 
-       lpfc_set_disctmo(phba);
+       lpfc_set_disctmo(vport);
 
        if (phba->fc_topology == TOPOLOGY_LOOP) {
                /* We should never receive a FLOGI in loop mode, ignore it */
@@ -2562,66 +2908,69 @@ lpfc_els_rcv_flogi(struct lpfc_hba * phba,
                /* An FLOGI ELS command <elsCmd> was received from DID <did> in
                   Loop Mode */
                lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
-                               "%d:0113 An FLOGI ELS command x%x was received "
-                               "from DID x%x in Loop Mode\n",
-                               phba->brd_no, cmd, did);
-               return (1);
+                               "%d (%d):0113 An FLOGI ELS command x%x was "
+                               "received from DID x%x in Loop Mode\n",
+                               phba->brd_no, vport->vpi, cmd, did);
+               return 1;
        }
 
        did = Fabric_DID;
 
-       if ((lpfc_check_sparm(phba, ndlp, sp, CLASS3))) {
+       if ((lpfc_check_sparm(vport, ndlp, sp, CLASS3))) {
                /* For a FLOGI we accept, then if our portname is greater
                 * then the remote portname we initiate Nport login.
                 */
 
-               rc = memcmp(&phba->fc_portname, &sp->portName,
-                           sizeof (struct lpfc_name));
+               rc = memcmp(&vport->fc_portname, &sp->portName,
+                           sizeof(struct lpfc_name));
 
                if (!rc) {
-                       if ((mbox = mempool_alloc(phba->mbox_mem_pool,
-                                                 GFP_KERNEL)) == 0) {
-                               return (1);
-                       }
+                       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+                       if (!mbox)
+                               return 1;
+
                        lpfc_linkdown(phba);
                        lpfc_init_link(phba, mbox,
                                       phba->cfg_topology,
                                       phba->cfg_link_speed);
                        mbox->mb.un.varInitLnk.lipsr_AL_PA = 0;
                        mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                       mbox->vport = vport;
                        rc = lpfc_sli_issue_mbox
                                (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB));
+                       lpfc_set_loopback_flag(phba);
                        if (rc == MBX_NOT_FINISHED) {
-                               mempool_free( mbox, phba->mbox_mem_pool);
+                               mempool_free(mbox, phba->mbox_mem_pool);
                        }
-                       return (1);
-               }
-               else if (rc > 0) {      /* greater than */
-                       spin_lock_irq(phba->host->host_lock);
-                       phba->fc_flag |= FC_PT2PT_PLOGI;
-                       spin_unlock_irq(phba->host->host_lock);
+                       return 1;
+               } else if (rc > 0) {    /* greater than */
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag |= FC_PT2PT_PLOGI;
+                       spin_unlock_irq(shost->host_lock);
                }
-               phba->fc_flag |= FC_PT2PT;
-               phba->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag |= FC_PT2PT;
+               vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+               spin_unlock_irq(shost->host_lock);
        } else {
                /* Reject this request because invalid parameters */
                stat.un.b.lsRjtRsvd0 = 0;
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_SPARM_OPTIONS;
                stat.un.b.vendorUnique = 0;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-               return (1);
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp);
+               return 1;
        }
 
        /* Send back ACC */
-       lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, newnode);
+       lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, newnode);
 
-       return (0);
+       return 0;
 }
 
 static int
-lpfc_els_rcv_rnid(struct lpfc_hba * phba,
-                 struct lpfc_iocbq * cmdiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_rnid(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_nodelist *ndlp)
 {
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
@@ -2644,7 +2993,7 @@ lpfc_els_rcv_rnid(struct lpfc_hba * phba,
        case 0:
        case RNID_TOPOLOGY_DISC:
                /* Send back ACC */
-               lpfc_els_rsp_rnid_acc(phba, rn->Format, cmdiocb, ndlp);
+               lpfc_els_rsp_rnid_acc(vport, rn->Format, cmdiocb, ndlp);
                break;
        default:
                /* Reject this request because format not supported */
@@ -2652,14 +3001,14 @@ lpfc_els_rcv_rnid(struct lpfc_hba * phba,
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
                stat.un.b.vendorUnique = 0;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp);
        }
-       return (0);
+       return 0;
 }
 
 static int
-lpfc_els_rcv_lirr(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_lirr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_nodelist *ndlp)
 {
        struct ls_rjt stat;
 
@@ -2668,15 +3017,15 @@ lpfc_els_rcv_lirr(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
        stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
        stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
        stat.un.b.vendorUnique = 0;
-       lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
+       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp);
        return 0;
 }
 
-void
-lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
+static void
+lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
-       struct lpfc_sli *psli;
-       struct lpfc_sli_ring *pring;
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];
        MAILBOX_t *mb;
        IOCB_t *icmd;
        RPS_RSP *rps_rsp;
@@ -2686,40 +3035,40 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
        uint16_t xri, status;
        uint32_t cmdsize;
 
-       psli = &phba->sli;
-       pring = &psli->ring[LPFC_ELS_RING];
        mb = &pmb->mb;
 
        ndlp = (struct lpfc_nodelist *) pmb->context2;
        xri = (uint16_t) ((unsigned long)(pmb->context1));
-       pmb->context1 = 0;
-       pmb->context2 = 0;
+       pmb->context1 = NULL;
+       pmb->context2 = NULL;
 
        if (mb->mbxStatus) {
-               mempool_free( pmb, phba->mbox_mem_pool);
+               mempool_free(pmb, phba->mbox_mem_pool);
                return;
        }
 
        cmdsize = sizeof(RPS_RSP) + sizeof(uint32_t);
-       mempool_free( pmb, phba->mbox_mem_pool);
-       if ((elsiocb = lpfc_prep_els_iocb(phba, 0, cmdsize, 3,
-                                         ndlp, ELS_CMD_ACC)) == 0) {
+       mempool_free(pmb, phba->mbox_mem_pool);
+       elsiocb = lpfc_prep_els_iocb(phba->pport, 0, cmdsize,
+                                    lpfc_max_els_tries, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_ACC);
+       lpfc_nlp_put(ndlp);
+       if (!elsiocb)
                return;
-       }
 
        icmd = &elsiocb->iocb;
        icmd->ulpContext = xri;
 
        pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
        *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
-       pcmd += sizeof (uint32_t); /* Skip past command */
+       pcmd += sizeof(uint32_t); /* Skip past command */
        rps_rsp = (RPS_RSP *)pcmd;
 
        if (phba->fc_topology != TOPOLOGY_LOOP)
                status = 0x10;
        else
                status = 0x8;
-       if (phba->fc_flag & FC_FABRIC)
+       if (phba->pport->fc_flag & FC_FABRIC)
                status |= 0x4;
 
        rps_rsp->rsvd1 = 0;
@@ -2733,25 +3082,25 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmb)
 
        /* Xmit ELS RPS ACC response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0128 Xmit ELS RPS ACC response tag x%x "
-                       "Data: x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0118 Xmit ELS RPS ACC response tag x%x "
+                       "xri x%x, did x%x, nlp_flag x%x, nlp_state x%x, "
+                       "rpi x%x\n",
+                       phba->brd_no, ndlp->vport->vpi, elsiocb->iotag,
                        elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                        ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
        elsiocb->iocb_cmpl = lpfc_cmpl_els_acc;
        phba->fc_stat.elsXmitACC++;
-       if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
+       if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR)
                lpfc_els_free_iocb(phba, elsiocb);
-       }
        return;
 }
 
 static int
-lpfc_els_rcv_rps(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                struct lpfc_nodelist *ndlp)
 {
+       struct lpfc_hba *phba = vport->phba;
        uint32_t *lp;
        uint8_t flag;
        LPFC_MBOXQ_t *mbox;
@@ -2759,13 +3108,13 @@ lpfc_els_rcv_rps(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
        RPS *rps;
        struct ls_rjt stat;
 
-       if((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
-          (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
+       if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
+           (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
                stat.un.b.lsRjtRsvd0 = 0;
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
                stat.un.b.vendorUnique = 0;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp);
        }
 
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
@@ -2775,19 +3124,25 @@ lpfc_els_rcv_rps(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
 
        if ((flag == 0) ||
            ((flag == 1) && (be32_to_cpu(rps->un.portNum) == 0)) ||
-           ((flag == 2) && (memcmp(&rps->un.portName, &phba->fc_portname,
-                          sizeof (struct lpfc_name)) == 0))) {
-               if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC))) {
+           ((flag == 2) && (memcmp(&rps->un.portName, &vport->fc_portname,
+                                   sizeof(struct lpfc_name)) == 0))) {
+
+               printk("Fix me....\n");
+               dump_stack();
+               mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC);
+               if (mbox) {
                        lpfc_read_lnk_stat(phba, mbox);
                        mbox->context1 =
-                           (void *)((unsigned long)cmdiocb->iocb.ulpContext);
-                       mbox->context2 = ndlp;
+                           (void *)((unsigned long) cmdiocb->iocb.ulpContext);
+                       mbox->context2 = lpfc_nlp_get(ndlp);
+                       mbox->vport = vport;
                        mbox->mbox_cmpl = lpfc_els_rsp_rps_acc;
                        if (lpfc_sli_issue_mbox (phba, mbox,
-                           (MBX_NOWAIT | MBX_STOP_IOCB)) != MBX_NOT_FINISHED) {
+                           (MBX_NOWAIT | MBX_STOP_IOCB)) != MBX_NOT_FINISHED)
                                /* Mbox completion will send ELS Response */
                                return 0;
-                       }
+
+                       lpfc_nlp_put(ndlp);
                        mempool_free(mbox, phba->mbox_mem_pool);
                }
        }
@@ -2795,37 +3150,35 @@ lpfc_els_rcv_rps(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
        stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
        stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
        stat.un.b.vendorUnique = 0;
-       lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
+       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp);
        return 0;
 }
 
-int
-lpfc_els_rsp_rpl_acc(struct lpfc_hba * phba, uint16_t cmdsize,
-                struct lpfc_iocbq * oldiocb, struct lpfc_nodelist * ndlp)
+static int
+lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize,
+                    struct lpfc_iocbq *oldiocb, struct lpfc_nodelist *ndlp)
 {
-       IOCB_t *icmd;
-       IOCB_t *oldcmd;
+       struct lpfc_hba *phba = vport->phba;
+       IOCB_t *icmd, *oldcmd;
        RPL_RSP rpl_rsp;
        struct lpfc_iocbq *elsiocb;
-       struct lpfc_sli_ring *pring;
-       struct lpfc_sli *psli;
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];
        uint8_t *pcmd;
 
-       psli = &phba->sli;
-       pring = &psli->ring[LPFC_ELS_RING];     /* ELS ring */
+       elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,
+                                    ndlp->nlp_DID, ELS_CMD_ACC);
 
-       if ((elsiocb =
-            lpfc_prep_els_iocb(phba, 0, cmdsize, oldiocb->retry,
-                               ndlp, ELS_CMD_ACC)) == 0) {
+       if (!elsiocb)
                return 1;
-       }
+
        icmd = &elsiocb->iocb;
        oldcmd = &oldiocb->iocb;
        icmd->ulpContext = oldcmd->ulpContext;  /* Xri */
 
        pcmd = (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
        *((uint32_t *) (pcmd)) = ELS_CMD_ACC;
-       pcmd += sizeof (uint16_t);
+       pcmd += sizeof(uint16_t);
        *((uint16_t *)(pcmd)) = be16_to_cpu(cmdsize);
        pcmd += sizeof(uint16_t);
 
@@ -2833,8 +3186,8 @@ lpfc_els_rsp_rpl_acc(struct lpfc_hba * phba, uint16_t cmdsize,
        rpl_rsp.listLen = be32_to_cpu(1);
        rpl_rsp.index = 0;
        rpl_rsp.port_num_blk.portNum = 0;
-       rpl_rsp.port_num_blk.portID = be32_to_cpu(phba->fc_myDID);
-       memcpy(&rpl_rsp.port_num_blk.portName, &phba->fc_portname,
+       rpl_rsp.port_num_blk.portID = be32_to_cpu(vport->fc_myDID);
+       memcpy(&rpl_rsp.port_num_blk.portName, &vport->fc_portname,
            sizeof(struct lpfc_name));
 
        memcpy(pcmd, &rpl_rsp, cmdsize - sizeof(uint32_t));
@@ -2842,10 +3195,10 @@ lpfc_els_rsp_rpl_acc(struct lpfc_hba * phba, uint16_t cmdsize,
 
        /* Xmit ELS RPL ACC response tag <ulpIoTag> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0128 Xmit ELS RPL ACC response tag x%x "
-                       "Data: x%x x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       elsiocb->iocb.ulpIoTag,
+                       "%d (%d):0120 Xmit ELS RPL ACC response tag x%x "
+                       "xri x%x, did x%x, nlp_flag x%x, nlp_state x%x, "
+                       "rpi x%x\n",
+                       phba->brd_no, vport->vpi, elsiocb->iotag,
                        elsiocb->iocb.ulpContext, ndlp->nlp_DID,
                        ndlp->nlp_flag, ndlp->nlp_state, ndlp->nlp_rpi);
 
@@ -2860,8 +3213,8 @@ lpfc_els_rsp_rpl_acc(struct lpfc_hba * phba, uint16_t cmdsize,
 }
 
 static int
-lpfc_els_rcv_rpl(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_rpl(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                struct lpfc_nodelist *ndlp)
 {
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
@@ -2870,13 +3223,13 @@ lpfc_els_rcv_rpl(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
        RPL *rpl;
        struct ls_rjt stat;
 
-       if((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
-          (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
+       if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&
+           (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
                stat.un.b.lsRjtRsvd0 = 0;
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_CANT_GIVE_DATA;
                stat.un.b.vendorUnique = 0;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp);
        }
 
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
@@ -2890,19 +3243,19 @@ lpfc_els_rcv_rpl(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
            ((maxsize == 0) ||
             ((maxsize * sizeof(uint32_t)) >= sizeof(RPL_RSP)))) {
                cmdsize = sizeof(uint32_t) + sizeof(RPL_RSP);
-       }
-       else {
+       } else {
                cmdsize = sizeof(uint32_t) + maxsize * sizeof(uint32_t);
        }
-       lpfc_els_rsp_rpl_acc(phba, cmdsize, cmdiocb, ndlp);
+       lpfc_els_rsp_rpl_acc(vport, cmdsize, cmdiocb, ndlp);
 
        return 0;
 }
 
 static int
-lpfc_els_rcv_farp(struct lpfc_hba * phba,
-                 struct lpfc_iocbq * cmdiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                 struct lpfc_nodelist *ndlp)
 {
+       struct lpfc_hba *phba = vport->phba;
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
        IOCB_t *icmd;
@@ -2918,29 +3271,27 @@ lpfc_els_rcv_farp(struct lpfc_hba * phba,
        fp = (FARP *) lp;
 
        /* FARP-REQ received from DID <did> */
-       lpfc_printf_log(phba,
-                        KERN_INFO,
-                        LOG_IP,
-                        "%d:0601 FARP-REQ received from DID x%x\n",
-                        phba->brd_no, did);
+       lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+                       "%d (%d):0601 FARP-REQ received from DID x%x\n",
+                       phba->brd_no, vport->vpi, did);
 
        /* We will only support match on WWPN or WWNN */
        if (fp->Mflags & ~(FARP_MATCH_NODE | FARP_MATCH_PORT)) {
-               return (0);
+               return 0;
        }
 
        cnt = 0;
        /* If this FARP command is searching for my portname */
        if (fp->Mflags & FARP_MATCH_PORT) {
-               if (memcmp(&fp->RportName, &phba->fc_portname,
-                          sizeof (struct lpfc_name)) == 0)
+               if (memcmp(&fp->RportName, &vport->fc_portname,
+                          sizeof(struct lpfc_name)) == 0)
                        cnt = 1;
        }
 
        /* If this FARP command is searching for my nodename */
        if (fp->Mflags & FARP_MATCH_NODE) {
-               if (memcmp(&fp->RnodeName, &phba->fc_nodename,
-                          sizeof (struct lpfc_name)) == 0)
+               if (memcmp(&fp->RnodeName, &vport->fc_nodename,
+                          sizeof(struct lpfc_name)) == 0)
                        cnt = 1;
        }
 
@@ -2949,28 +3300,29 @@ lpfc_els_rcv_farp(struct lpfc_hba * phba,
                   (ndlp->nlp_state == NLP_STE_MAPPED_NODE)) {
                        /* Log back into the node before sending the FARP. */
                        if (fp->Rflags & FARP_REQUEST_PLOGI) {
-                               ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                               lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-                               lpfc_issue_els_plogi(phba, ndlp, 0);
+                               ndlp->nlp_prev_state = ndlp->nlp_state;
+                               lpfc_nlp_set_state(vport, ndlp,
+                                                  NLP_STE_PLOGI_ISSUE);
+                               lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
                        }
 
                        /* Send a FARP response to that node */
-                       if (fp->Rflags & FARP_REQUEST_FARPR) {
-                               lpfc_issue_els_farpr(phba, did, 0);
-                       }
+                       if (fp->Rflags & FARP_REQUEST_FARPR)
+                               lpfc_issue_els_farpr(vport, did, 0);
                }
        }
-       return (0);
+       return 0;
 }
 
 static int
-lpfc_els_rcv_farpr(struct lpfc_hba * phba,
-                  struct lpfc_iocbq * cmdiocb, struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_farpr(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                  struct lpfc_nodelist  *ndlp)
 {
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
        IOCB_t *icmd;
        uint32_t cmd, did;
+       struct lpfc_hba *phba = vport->phba;
 
        icmd = &cmdiocb->iocb;
        did = icmd->un.elsreq64.remoteID;
@@ -2979,187 +3331,220 @@ lpfc_els_rcv_farpr(struct lpfc_hba * phba,
 
        cmd = *lp++;
        /* FARP-RSP received from DID <did> */
-       lpfc_printf_log(phba,
-                        KERN_INFO,
-                        LOG_IP,
-                        "%d:0600 FARP-RSP received from DID x%x\n",
-                        phba->brd_no, did);
-
+       lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+                       "%d (%d):0600 FARP-RSP received from DID x%x\n",
+                       phba->brd_no, vport->vpi, did);
        /* ACCEPT the Farp resp request */
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
+       lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
 
        return 0;
 }
 
 static int
-lpfc_els_rcv_fan(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb,
-                struct lpfc_nodelist * ndlp)
+lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,
+                struct lpfc_nodelist *fan_ndlp)
 {
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
        IOCB_t *icmd;
-       FAN *fp;
        uint32_t cmd, did;
+       FAN *fp;
+       struct lpfc_nodelist *ndlp, *next_ndlp;
+       struct lpfc_hba *phba = vport->phba;
+
+       /* FAN received */
+       lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+                       "%d (%d):0265 FAN received\n",
+                       phba->brd_no, vport->vpi);
 
        icmd = &cmdiocb->iocb;
        did = icmd->un.elsreq64.remoteID;
-       pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
-       lp = (uint32_t *) pcmd->virt;
+       pcmd = (struct lpfc_dmabuf *)cmdiocb->context2;
+       lp = (uint32_t *)pcmd->virt;
 
        cmd = *lp++;
        fp = (FAN *) lp;
 
-       /* FAN received */
+       /* FAN received; Fan does not have a reply sequence */
 
-       /* ACCEPT the FAN request */
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
+       if (phba->pport->port_state == LPFC_LOCAL_CFG_LINK) {
+               if ((memcmp(&phba->fc_fabparam.nodeName, &fp->FnodeName,
+                       sizeof(struct lpfc_name)) != 0) ||
+                   (memcmp(&phba->fc_fabparam.portName, &fp->FportName,
+                       sizeof(struct lpfc_name)) != 0)) {
+                       /*
+                        * This node has switched fabrics.  FLOGI is required
+                        * Clean up the old rpi's
+                        */
+
+                       list_for_each_entry_safe(ndlp, next_ndlp,
+                                                &vport->fc_nodes, nlp_listp) {
+                               if (ndlp->nlp_state != NLP_STE_NPR_NODE)
+                                       continue;
+                               if (ndlp->nlp_type & NLP_FABRIC) {
+                                       /*
+                                        * Clean up old Fabric, Nameserver and
+                                        * other NLP_FABRIC logins
+                                        */
+                                       lpfc_drop_node(vport, ndlp);
+                               } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
+                                       /* Fail outstanding I/O now since this
+                                        * device is marked for PLOGI
+                                        */
+                                       lpfc_unreg_rpi(vport, ndlp);
+                               }
+                       }
 
-       if (phba->hba_state == LPFC_LOCAL_CFG_LINK) {
-               /* The discovery state machine needs to take a different
-                * action if this node has switched fabrics
+                       vport->port_state = LPFC_FLOGI;
+                       lpfc_set_disctmo(vport);
+                       lpfc_initial_flogi(vport);
+                       return 0;
+               }
+               /* Discovery not needed,
+                * move the nodes to their original state.
                 */
-               if ((memcmp(&fp->FportName, &phba->fc_fabparam.portName,
-                           sizeof (struct lpfc_name)) != 0)
-                   ||
-                   (memcmp(&fp->FnodeName, &phba->fc_fabparam.nodeName,
-                           sizeof (struct lpfc_name)) != 0)) {
-                       /* This node has switched fabrics.  An FLOGI is required
-                        * after the timeout
-                        */
-                       return (0);
+               list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes,
+                                        nlp_listp) {
+                       if (ndlp->nlp_state != NLP_STE_NPR_NODE)
+                               continue;
+
+                       switch (ndlp->nlp_prev_state) {
+                       case NLP_STE_UNMAPPED_NODE:
+                               ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
+                               lpfc_nlp_set_state(vport, ndlp,
+                                                  NLP_STE_UNMAPPED_NODE);
+                               break;
+
+                       case NLP_STE_MAPPED_NODE:
+                               ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
+                               lpfc_nlp_set_state(vport, ndlp,
+                                                  NLP_STE_MAPPED_NODE);
+                               break;
+
+                       default:
+                               break;
+                       }
                }
 
-               /* Start discovery */
-               lpfc_disc_start(phba);
+               /* Start discovery - this should just do CLEAR_LA */
+               lpfc_disc_start(vport);
        }
-
-       return (0);
+       return 0;
 }
 
 void
 lpfc_els_timeout(unsigned long ptr)
 {
-       struct lpfc_hba *phba;
+       struct lpfc_vport *vport = (struct lpfc_vport *) ptr;
+       struct lpfc_hba   *phba = vport->phba;
        unsigned long iflag;
 
-       phba = (struct lpfc_hba *)ptr;
-       if (phba == 0)
-               return;
-       spin_lock_irqsave(phba->host->host_lock, iflag);
-       if (!(phba->work_hba_events & WORKER_ELS_TMO)) {
-               phba->work_hba_events |= WORKER_ELS_TMO;
+       spin_lock_irqsave(&vport->work_port_lock, iflag);
+       if ((vport->work_port_events & WORKER_ELS_TMO) == 0) {
+               vport->work_port_events |= WORKER_ELS_TMO;
+               spin_unlock_irqrestore(&vport->work_port_lock, iflag);
+
+               spin_lock_irqsave(&phba->hbalock, iflag);
                if (phba->work_wait)
-                       wake_up(phba->work_wait);
+                       lpfc_worker_wake_up(phba);
+               spin_unlock_irqrestore(&phba->hbalock, iflag);
        }
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
+       else
+               spin_unlock_irqrestore(&vport->work_port_lock, iflag);
        return;
 }
 
 void
-lpfc_els_timeout_handler(struct lpfc_hba *phba)
+lpfc_els_timeout_handler(struct lpfc_vport *vport)
 {
+       struct lpfc_hba  *phba = vport->phba;
        struct lpfc_sli_ring *pring;
        struct lpfc_iocbq *tmp_iocb, *piocb;
        IOCB_t *cmd = NULL;
        struct lpfc_dmabuf *pcmd;
-       struct list_head *dlp;
-       uint32_t *elscmd;
-       uint32_t els_command;
+       uint32_t els_command = 0;
        uint32_t timeout;
-       uint32_t remote_ID;
+       uint32_t remote_ID = 0xffffffff;
 
-       if (phba == 0)
-               return;
-       spin_lock_irq(phba->host->host_lock);
        /* If the timer is already canceled do nothing */
-       if (!(phba->work_hba_events & WORKER_ELS_TMO)) {
-               spin_unlock_irq(phba->host->host_lock);
+       if ((vport->work_port_events & WORKER_ELS_TMO) == 0) {
                return;
        }
+       spin_lock_irq(&phba->hbalock);
        timeout = (uint32_t)(phba->fc_ratov << 1);
 
        pring = &phba->sli.ring[LPFC_ELS_RING];
-       dlp = &pring->txcmplq;
 
        list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
                cmd = &piocb->iocb;
 
-               if (piocb->iocb_flag & LPFC_IO_LIBDFC) {
+               if ((piocb->iocb_flag & LPFC_IO_LIBDFC) != 0 ||
+                   piocb->iocb.ulpCommand == CMD_ABORT_XRI_CN ||
+                   piocb->iocb.ulpCommand == CMD_CLOSE_XRI_CN)
                        continue;
-               }
+
+               if (piocb->vport != vport)
+                       continue;
+
                pcmd = (struct lpfc_dmabuf *) piocb->context2;
-               elscmd = (uint32_t *) (pcmd->virt);
-               els_command = *elscmd;
+               if (pcmd)
+                       els_command = *(uint32_t *) (pcmd->virt);
 
-               if ((els_command == ELS_CMD_FARP)
-                   || (els_command == ELS_CMD_FARPR)) {
+               if (els_command == ELS_CMD_FARP ||
+                   els_command == ELS_CMD_FARPR ||
+                   els_command == ELS_CMD_FDISC)
+                       continue;
+
+               if (vport != piocb->vport)
                        continue;
-               }
 
                if (piocb->drvrTimeout > 0) {
-                       if (piocb->drvrTimeout >= timeout) {
+                       if (piocb->drvrTimeout >= timeout)
                                piocb->drvrTimeout -= timeout;
-                       } else {
+                       else
                                piocb->drvrTimeout = 0;
-                       }
                        continue;
                }
 
-               list_del(&piocb->list);
-               pring->txcmplq_cnt--;
-
-               if (cmd->ulpCommand == CMD_GEN_REQUEST64_CR) {
-                       struct lpfc_nodelist *ndlp;
-
-                       ndlp = lpfc_findnode_rpi(phba, cmd->ulpContext);
-                       remote_ID = ndlp->nlp_DID;
-                       if (cmd->un.elsreq64.bdl.ulpIoTag32) {
-                               lpfc_sli_issue_abort_iotag32(phba,
-                                       pring, piocb);
-                       }
-               } else {
+               remote_ID = 0xffffffff;
+               if (cmd->ulpCommand != CMD_GEN_REQUEST64_CR)
                        remote_ID = cmd->un.elsreq64.remoteID;
+               else {
+                       struct lpfc_nodelist *ndlp;
+                       ndlp = __lpfc_findnode_rpi(vport, cmd->ulpContext);
+                       if (ndlp)
+                               remote_ID = ndlp->nlp_DID;
                }
 
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_ELS,
-                               "%d:0127 ELS timeout Data: x%x x%x x%x x%x\n",
-                               phba->brd_no, els_command,
+               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                               "%d (%d):0127 ELS timeout Data: x%x x%x x%x "
+                               "x%x\n",
+                               phba->brd_no, vport->vpi, els_command,
                                remote_ID, cmd->ulpCommand, cmd->ulpIoTag);
 
-               /*
-                * The iocb has timed out; abort it.
-                */
-               if (piocb->iocb_cmpl) {
-                       cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                       cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                       spin_unlock_irq(phba->host->host_lock);
-                       (piocb->iocb_cmpl) (phba, piocb, piocb);
-                       spin_lock_irq(phba->host->host_lock);
-               } else
-                       lpfc_sli_release_iocbq(phba, piocb);
+               lpfc_sli_issue_abort_iotag(phba, pring, piocb);
        }
-       if (phba->sli.ring[LPFC_ELS_RING].txcmplq_cnt) {
-               phba->els_tmofunc.expires = jiffies + HZ * timeout;
-               add_timer(&phba->els_tmofunc);
-       }
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
+
+       if (phba->sli.ring[LPFC_ELS_RING].txcmplq_cnt)
+               mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);
 }
 
 void
-lpfc_els_flush_cmd(struct lpfc_hba * phba)
+lpfc_els_flush_cmd(struct lpfc_vport *vport)
 {
-       struct lpfc_sli_ring *pring;
+       LIST_HEAD(completions);
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
        struct lpfc_iocbq *tmp_iocb, *piocb;
        IOCB_t *cmd = NULL;
        struct lpfc_dmabuf *pcmd;
        uint32_t *elscmd;
        uint32_t els_command;
-       uint32_t remote_ID;
 
-       pring = &phba->sli.ring[LPFC_ELS_RING];
-       spin_lock_irq(phba->host->host_lock);
+       lpfc_fabric_abort_vport(vport);
+
+       spin_lock_irq(&phba->hbalock);
        list_for_each_entry_safe(piocb, tmp_iocb, &pring->txq, list) {
                cmd = &piocb->iocb;
 
@@ -3168,316 +3553,968 @@ lpfc_els_flush_cmd(struct lpfc_hba * phba)
                }
 
                /* Do not flush out the QUE_RING and ABORT/CLOSE iocbs */
-               if ((cmd->ulpCommand == CMD_QUE_RING_BUF_CN) ||
-                   (cmd->ulpCommand == CMD_QUE_RING_BUF64_CN) ||
-                   (cmd->ulpCommand == CMD_CLOSE_XRI_CN) ||
-                   (cmd->ulpCommand == CMD_ABORT_XRI_CN)) {
+               if (cmd->ulpCommand == CMD_QUE_RING_BUF_CN ||
+                   cmd->ulpCommand == CMD_QUE_RING_BUF64_CN ||
+                   cmd->ulpCommand == CMD_CLOSE_XRI_CN ||
+                   cmd->ulpCommand == CMD_ABORT_XRI_CN)
                        continue;
-               }
 
                pcmd = (struct lpfc_dmabuf *) piocb->context2;
                elscmd = (uint32_t *) (pcmd->virt);
                els_command = *elscmd;
 
-               if (cmd->ulpCommand == CMD_GEN_REQUEST64_CR) {
-                       struct lpfc_nodelist *ndlp;
-
-                       ndlp = lpfc_findnode_rpi(phba, cmd->ulpContext);
-                       remote_ID = ndlp->nlp_DID;
-                       if (phba->hba_state == LPFC_HBA_READY) {
-                               continue;
-                       }
-               } else {
-                       remote_ID = cmd->un.elsreq64.remoteID;
-               }
-
-               list_del(&piocb->list);
-               pring->txcmplq_cnt--;
-
-               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+               if (piocb->vport != vport)
+                       continue;
 
-               if (piocb->iocb_cmpl) {
-                       spin_unlock_irq(phba->host->host_lock);
-                       (piocb->iocb_cmpl) (phba, piocb, piocb);
-                       spin_lock_irq(phba->host->host_lock);
-               }
-               else
-                       lpfc_sli_release_iocbq(phba, piocb);
+               list_move_tail(&piocb->list, &completions);
+               pring->txq_cnt--;
        }
 
        list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {
-               cmd = &piocb->iocb;
-
                if (piocb->iocb_flag & LPFC_IO_LIBDFC) {
                        continue;
                }
-               pcmd = (struct lpfc_dmabuf *) piocb->context2;
-               elscmd = (uint32_t *) (pcmd->virt);
-               els_command = *elscmd;
 
-               if (cmd->ulpCommand == CMD_GEN_REQUEST64_CR) {
-                       struct lpfc_nodelist *ndlp;
-
-                       ndlp = lpfc_findnode_rpi(phba, cmd->ulpContext);
-                       remote_ID = ndlp->nlp_DID;
-                       if (phba->hba_state == LPFC_HBA_READY) {
-                               continue;
-                       }
-               } else {
-                       remote_ID = cmd->un.elsreq64.remoteID;
-               }
+               if (piocb->vport != vport)
+                       continue;
 
-               list_del(&piocb->list);
-               pring->txcmplq_cnt--;
+               lpfc_sli_issue_abort_iotag(phba, pring, piocb);
+       }
+       spin_unlock_irq(&phba->hbalock);
 
-               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+       while (!list_empty(&completions)) {
+               piocb = list_get_first(&completions, struct lpfc_iocbq, list);
+               cmd = &piocb->iocb;
+               list_del_init(&piocb->list);
 
-               if (piocb->iocb_cmpl) {
-                       spin_unlock_irq(phba->host->host_lock);
+               if (!piocb->iocb_cmpl)
+                       lpfc_sli_release_iocbq(phba, piocb);
+               else {
+                       cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                       cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
                        (piocb->iocb_cmpl) (phba, piocb, piocb);
-                       spin_lock_irq(phba->host->host_lock);
                }
-               else
-                       lpfc_sli_release_iocbq(phba, piocb);
        }
-       spin_unlock_irq(phba->host->host_lock);
+
        return;
 }
 
-void
-lpfc_els_unsol_event(struct lpfc_hba * phba,
-                    struct lpfc_sli_ring * pring, struct lpfc_iocbq * elsiocb)
+static void
+lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+                     struct lpfc_vport *vport, struct lpfc_iocbq *elsiocb)
 {
-       struct lpfc_sli *psli;
        struct lpfc_nodelist *ndlp;
-       struct lpfc_dmabuf *mp;
-       uint32_t *lp;
-       IOCB_t *icmd;
        struct ls_rjt stat;
-       uint32_t cmd;
-       uint32_t did;
-       uint32_t newnode;
-       uint32_t drop_cmd = 0;  /* by default do NOT drop received cmd */
-       uint32_t rjt_err = 0;
-
-       psli = &phba->sli;
-       icmd = &elsiocb->iocb;
-
-       if ((icmd->ulpStatus == IOSTAT_LOCAL_REJECT) &&
-               ((icmd->un.ulpWord[4] & 0xff) == IOERR_RCV_BUFFER_WAITING)) {
-               /* Not enough posted buffers; Try posting more buffers */
-               phba->fc_stat.NoRcvBuf++;
-               lpfc_post_buffer(phba, pring, 0, 1);
-               return;
-       }
+       uint32_t *payload;
+       uint32_t cmd, did, newnode, rjt_err = 0;
+       IOCB_t *icmd = &elsiocb->iocb;
 
-       /* If there are no BDEs associated with this IOCB,
-        * there is nothing to do.
-        */
-       if (icmd->ulpBdeCount == 0)
-               return;
-
-       /* type of ELS cmd is first 32bit word in packet */
-       mp = lpfc_sli_ringpostbuf_get(phba, pring, getPaddr(icmd->un.
-                                                           cont64[0].
-                                                           addrHigh,
-                                                           icmd->un.
-                                                           cont64[0].addrLow));
-       if (mp == 0) {
-               drop_cmd = 1;
+       if (vport == NULL || elsiocb->context2 == NULL)
                goto dropit;
-       }
 
        newnode = 0;
-       lp = (uint32_t *) mp->virt;
-       cmd = *lp++;
-       lpfc_post_buffer(phba, &psli->ring[LPFC_ELS_RING], 1, 1);
+       payload = ((struct lpfc_dmabuf *)elsiocb->context2)->virt;
+       cmd = *payload;
+       if ((phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) == 0)
+               lpfc_post_buffer(phba, pring, 1, 1);
 
-       if (icmd->ulpStatus) {
-               lpfc_mbuf_free(phba, mp->virt, mp->phys);
-               kfree(mp);
-               drop_cmd = 1;
+       if (icmd->ulpStatus)
                goto dropit;
-       }
 
        /* Check to see if link went down during discovery */
-       if (lpfc_els_chk_latt(phba)) {
-               lpfc_mbuf_free(phba, mp->virt, mp->phys);
-               kfree(mp);
-               drop_cmd = 1;
+       if (lpfc_els_chk_latt(vport))
+               goto dropit;
+
+       /* Ignore traffic recevied during vport shutdown. */
+       if (vport->load_flag & FC_UNLOADING)
                goto dropit;
-       }
 
        did = icmd->un.rcvels.remoteID;
-       if ((ndlp = lpfc_findnode_did(phba, NLP_SEARCH_ALL, did)) == 0) {
+       ndlp = lpfc_findnode_did(vport, did);
+       if (!ndlp) {
                /* Cannot find existing Fabric ndlp, so allocate a new one */
-               if ((ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL))
-                   == 0) {
-                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
-                       kfree(mp);
-                       drop_cmd = 1;
+               ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+               if (!ndlp)
                        goto dropit;
-               }
 
-               lpfc_nlp_init(phba, ndlp, did);
+               lpfc_nlp_init(vport, ndlp, did);
                newnode = 1;
                if ((did & Fabric_DID_MASK) == Fabric_DID_MASK) {
                        ndlp->nlp_type |= NLP_FABRIC;
                }
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNUSED_NODE);
        }
 
        phba->fc_stat.elsRcvFrame++;
-       elsiocb->context1 = ndlp;
-       elsiocb->context2 = mp;
+       if (elsiocb->context1)
+               lpfc_nlp_put(elsiocb->context1);
+       elsiocb->context1 = lpfc_nlp_get(ndlp);
+       elsiocb->vport = vport;
 
        if ((cmd & ELS_CMD_MASK) == ELS_CMD_RSCN) {
                cmd &= ELS_CMD_MASK;
        }
        /* ELS command <elsCmd> received from NPORT <did> */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "%d:0112 ELS command x%x received from NPORT x%x "
-                       "Data: x%x\n", phba->brd_no, cmd, did, phba->hba_state);
+                       "%d (%d):0112 ELS command x%x received from NPORT x%x "
+                       "Data: x%x\n", phba->brd_no, vport->vpi, cmd, did,
+                       vport->port_state);
 
        switch (cmd) {
        case ELS_CMD_PLOGI:
                phba->fc_stat.elsRcvPLOGI++;
-               if (phba->hba_state < LPFC_DISC_AUTH) {
-                       rjt_err = 1;
+               if ((vport->port_state < LPFC_DISC_AUTH) ||
+                   ((vport->port_type == LPFC_NPIV_PORT &&
+                     phba->cfg_vport_restrict_login))) {
+                       rjt_err = 2;
                        break;
                }
-               lpfc_disc_state_machine(phba, ndlp, elsiocb, NLP_EVT_RCV_PLOGI);
+               ndlp = lpfc_plogi_confirm_nport(phba, payload, ndlp);
+               lpfc_disc_state_machine(vport, ndlp, elsiocb,
+                                       NLP_EVT_RCV_PLOGI);
                break;
        case ELS_CMD_FLOGI:
                phba->fc_stat.elsRcvFLOGI++;
-               lpfc_els_rcv_flogi(phba, elsiocb, ndlp, newnode);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+               lpfc_els_rcv_flogi(vport, elsiocb, ndlp, newnode);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        case ELS_CMD_LOGO:
                phba->fc_stat.elsRcvLOGO++;
-               if (phba->hba_state < LPFC_DISC_AUTH) {
+               if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = 1;
                        break;
                }
-               lpfc_disc_state_machine(phba, ndlp, elsiocb, NLP_EVT_RCV_LOGO);
+               lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_LOGO);
                break;
        case ELS_CMD_PRLO:
                phba->fc_stat.elsRcvPRLO++;
-               if (phba->hba_state < LPFC_DISC_AUTH) {
+               if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = 1;
                        break;
                }
-               lpfc_disc_state_machine(phba, ndlp, elsiocb, NLP_EVT_RCV_PRLO);
+               lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_PRLO);
                break;
        case ELS_CMD_RSCN:
                phba->fc_stat.elsRcvRSCN++;
-               lpfc_els_rcv_rscn(phba, elsiocb, ndlp, newnode);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+               lpfc_els_rcv_rscn(vport, elsiocb, ndlp, newnode);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        case ELS_CMD_ADISC:
                phba->fc_stat.elsRcvADISC++;
-               if (phba->hba_state < LPFC_DISC_AUTH) {
+               if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = 1;
                        break;
                }
-               lpfc_disc_state_machine(phba, ndlp, elsiocb, NLP_EVT_RCV_ADISC);
+               lpfc_disc_state_machine(vport, ndlp, elsiocb,
+                                       NLP_EVT_RCV_ADISC);
                break;
        case ELS_CMD_PDISC:
                phba->fc_stat.elsRcvPDISC++;
-               if (phba->hba_state < LPFC_DISC_AUTH) {
+               if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = 1;
                        break;
                }
-               lpfc_disc_state_machine(phba, ndlp, elsiocb, NLP_EVT_RCV_PDISC);
+               lpfc_disc_state_machine(vport, ndlp, elsiocb,
+                                       NLP_EVT_RCV_PDISC);
                break;
        case ELS_CMD_FARPR:
                phba->fc_stat.elsRcvFARPR++;
-               lpfc_els_rcv_farpr(phba, elsiocb, ndlp);
+               lpfc_els_rcv_farpr(vport, elsiocb, ndlp);
                break;
        case ELS_CMD_FARP:
                phba->fc_stat.elsRcvFARP++;
-               lpfc_els_rcv_farp(phba, elsiocb, ndlp);
+               lpfc_els_rcv_farp(vport, elsiocb, ndlp);
                break;
        case ELS_CMD_FAN:
                phba->fc_stat.elsRcvFAN++;
-               lpfc_els_rcv_fan(phba, elsiocb, ndlp);
+               lpfc_els_rcv_fan(vport, elsiocb, ndlp);
                break;
        case ELS_CMD_PRLI:
                phba->fc_stat.elsRcvPRLI++;
-               if (phba->hba_state < LPFC_DISC_AUTH) {
+               if (vport->port_state < LPFC_DISC_AUTH) {
                        rjt_err = 1;
                        break;
                }
-               lpfc_disc_state_machine(phba, ndlp, elsiocb, NLP_EVT_RCV_PRLI);
+               lpfc_disc_state_machine(vport, ndlp, elsiocb, NLP_EVT_RCV_PRLI);
                break;
        case ELS_CMD_LIRR:
                phba->fc_stat.elsRcvLIRR++;
-               lpfc_els_rcv_lirr(phba, elsiocb, ndlp);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+               lpfc_els_rcv_lirr(vport, elsiocb, ndlp);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        case ELS_CMD_RPS:
                phba->fc_stat.elsRcvRPS++;
-               lpfc_els_rcv_rps(phba, elsiocb, ndlp);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+               lpfc_els_rcv_rps(vport, elsiocb, ndlp);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        case ELS_CMD_RPL:
                phba->fc_stat.elsRcvRPL++;
-               lpfc_els_rcv_rpl(phba, elsiocb, ndlp);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+               lpfc_els_rcv_rpl(vport, elsiocb, ndlp);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        case ELS_CMD_RNID:
                phba->fc_stat.elsRcvRNID++;
-               lpfc_els_rcv_rnid(phba, elsiocb, ndlp);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+               lpfc_els_rcv_rnid(vport, elsiocb, ndlp);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        default:
                /* Unsupported ELS command, reject */
-               rjt_err = 1;
+               rjt_err = 2;
 
                /* Unknown ELS command <elsCmd> received from NPORT <did> */
                lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
-                               "%d:0115 Unknown ELS command x%x received from "
-                               "NPORT x%x\n", phba->brd_no, cmd, did);
-               if (newnode) {
-                       mempool_free( ndlp, phba->nlp_mem_pool);
-               }
+                               "%d (%d):0115 Unknown ELS command x%x "
+                               "received from NPORT x%x\n",
+                               phba->brd_no, vport->vpi, cmd, did);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
                break;
        }
 
        /* check if need to LS_RJT received ELS cmd */
        if (rjt_err) {
-               stat.un.b.lsRjtRsvd0 = 0;
-               stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
+               memset(&stat, 0, sizeof(stat));
+               if (rjt_err == 1)
+                       stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
+               else
+                       stat.un.b.lsRjtRsnCode = LSRJT_INVALID_CMD;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
-               stat.un.b.vendorUnique = 0;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, elsiocb, ndlp);
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, elsiocb, ndlp);
+               if (newnode)
+                       lpfc_drop_node(vport, ndlp);
+       }
+
+       return;
+
+dropit:
+       lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                       "%d (%d):0111 Dropping received ELS cmd "
+                       "Data: x%x x%x x%x\n",
+                       phba->brd_no, vport ? vport->vpi : 0xffff,
+                       icmd->ulpStatus, icmd->un.ulpWord[4],
+                       icmd->ulpTimeout);
+       phba->fc_stat.elsRcvDrop++;
+}
+
+static struct lpfc_vport *
+lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi)
+{
+       struct lpfc_vport *vport;
+
+       list_for_each_entry(vport, &phba->port_list, listentry) {
+               if (vport->vpi == vpi)
+                       return vport;
+       }
+       return NULL;
+}
+
+void
+lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+                    struct lpfc_iocbq *elsiocb)
+{
+       struct lpfc_vport *vport = phba->pport;
+       IOCB_t *icmd = &elsiocb->iocb;
+       dma_addr_t paddr;
+       struct lpfc_dmabuf *bdeBuf1 = elsiocb->context2;
+       struct lpfc_dmabuf *bdeBuf2 = elsiocb->context3;
+
+       elsiocb->context2 = NULL;
+       elsiocb->context3 = NULL;
+
+       if (icmd->ulpStatus == IOSTAT_NEED_BUFFER) {
+               lpfc_sli_hbqbuf_add_hbqs(phba, LPFC_ELS_HBQ);
+       } else if (icmd->ulpStatus == IOSTAT_LOCAL_REJECT &&
+           (icmd->un.ulpWord[4] & 0xff) == IOERR_RCV_BUFFER_WAITING) {
+               phba->fc_stat.NoRcvBuf++;
+               /* Not enough posted buffers; Try posting more buffers */
+               if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))
+                       lpfc_post_buffer(phba, pring, 0, 1);
+               return;
+       }
+
+       if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+           (icmd->ulpCommand == CMD_IOCB_RCV_ELS64_CX ||
+            icmd->ulpCommand == CMD_IOCB_RCV_SEQ64_CX)) {
+               if (icmd->unsli3.rcvsli3.vpi == 0xffff)
+                       vport = phba->pport;
+               else {
+                       uint16_t vpi = icmd->unsli3.rcvsli3.vpi;
+                       vport = lpfc_find_vport_by_vpid(phba, vpi);
+               }
        }
+                               /* If there are no BDEs associated
+                                * with this IOCB, there is nothing to do.
+                                */
+       if (icmd->ulpBdeCount == 0)
+               return;
 
+                               /* type of ELS cmd is first 32bit word
+                                * in packet
+                                */
+       if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
+               elsiocb->context2 = bdeBuf1;
+       } else {
+               paddr = getPaddr(icmd->un.cont64[0].addrHigh,
+                                icmd->un.cont64[0].addrLow);
+               elsiocb->context2 = lpfc_sli_ringpostbuf_get(phba, pring,
+                                                            paddr);
+       }
+
+       lpfc_els_unsol_buffer(phba, pring, vport, elsiocb);
+       /*
+        * The different unsolicited event handlers would tell us
+        * if they are done with "mp" by setting context2 to NULL.
+        */
+       lpfc_nlp_put(elsiocb->context1);
+       elsiocb->context1 = NULL;
        if (elsiocb->context2) {
-               lpfc_mbuf_free(phba, mp->virt, mp->phys);
-               kfree(mp);
+               lpfc_in_buf_free(phba, (struct lpfc_dmabuf *)elsiocb->context2);
+               elsiocb->context2 = NULL;
        }
-dropit:
-       /* check if need to drop received ELS cmd */
-       if (drop_cmd == 1) {
+
+       /* RCV_ELS64_CX provide for 2 BDEs - process 2nd if included */
+       if ((phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) &&
+           icmd->ulpBdeCount == 2) {
+               elsiocb->context2 = bdeBuf2;
+               lpfc_els_unsol_buffer(phba, pring, vport, elsiocb);
+               /* free mp if we are done with it */
+               if (elsiocb->context2) {
+                       lpfc_in_buf_free(phba, elsiocb->context2);
+                       elsiocb->context2 = NULL;
+               }
+       }
+}
+
+void
+lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)
+{
+       struct lpfc_nodelist *ndlp, *ndlp_fdmi;
+
+       ndlp = lpfc_findnode_did(vport, NameServer_DID);
+       if (!ndlp) {
+               ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
+               if (!ndlp) {
+                       if (phba->fc_topology == TOPOLOGY_LOOP) {
+                               lpfc_disc_start(vport);
+                               return;
+                       }
+                       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+                       lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                               "%d (%d):0251 NameServer login: no memory\n",
+                               phba->brd_no, vport->vpi);
+                       return;
+               }
+               lpfc_nlp_init(vport, ndlp, NameServer_DID);
+               ndlp->nlp_type |= NLP_FABRIC;
+       }
+
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
+
+       if (lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0)) {
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
-                               "%d:0111 Dropping received ELS cmd "
-                               "Data: x%x x%x\n", phba->brd_no,
-                               icmd->ulpStatus, icmd->un.ulpWord[4]);
-               phba->fc_stat.elsRcvDrop++;
+                       "%d (%d):0252 Cannot issue NameServer login\n",
+                       phba->brd_no, vport->vpi);
+               return;
+       }
+
+       if (phba->cfg_fdmi_on) {
+               ndlp_fdmi = mempool_alloc(phba->nlp_mem_pool,
+                                         GFP_KERNEL);
+               if (ndlp_fdmi) {
+                       lpfc_nlp_init(vport, ndlp_fdmi, FDMI_DID);
+                       ndlp_fdmi->nlp_type |= NLP_FABRIC;
+                       ndlp_fdmi->nlp_state =
+                               NLP_STE_PLOGI_ISSUE;
+                       lpfc_issue_els_plogi(vport, ndlp_fdmi->nlp_DID,
+                                            0);
+               }
        }
        return;
 }
+
+static void
+lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+       struct lpfc_vport *vport = pmb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;
+       MAILBOX_t *mb = &pmb->mb;
+
+       vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;
+       lpfc_nlp_put(ndlp);
+
+       if (mb->mbxStatus) {
+               lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                               "%d (%d):0915 Register VPI failed: 0x%x\n",
+                               phba->brd_no, vport->vpi, mb->mbxStatus);
+
+               switch (mb->mbxStatus) {
+               case 0x11:      /* unsupported feature */
+               case 0x9603:    /* max_vpi exceeded */
+                       /* giving up on vport registration */
+                       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+                       spin_lock_irq(shost->host_lock);
+                       vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+                       spin_unlock_irq(shost->host_lock);
+                       lpfc_can_disctmo(vport);
+                       break;
+               default:
+                       /* Try to recover from this error */
+                       lpfc_mbx_unreg_vpi(vport);
+                       vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+                       lpfc_initial_fdisc(vport);
+                       break;
+               }
+
+       } else {
+               if (vport == phba->pport)
+                       lpfc_issue_fabric_reglogin(vport);
+               else
+                       lpfc_do_scr_ns_plogi(phba, vport);
+       }
+       mempool_free(pmb, phba->mbox_mem_pool);
+       return;
+}
+
+void
+lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport,
+                       struct lpfc_nodelist *ndlp)
+{
+       LPFC_MBOXQ_t *mbox;
+
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (mbox) {
+               lpfc_reg_vpi(phba, vport->vpi, vport->fc_myDID, mbox);
+               mbox->vport = vport;
+               mbox->context2 = lpfc_nlp_get(ndlp);
+               mbox->mbox_cmpl = lpfc_cmpl_reg_new_vport;
+               if (lpfc_sli_issue_mbox(phba, mbox,
+                                       MBX_NOWAIT | MBX_STOP_IOCB)
+                   == MBX_NOT_FINISHED) {
+                       mempool_free(mbox, phba->mbox_mem_pool);
+                       vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;
+
+                       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+
+                       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                               "%d (%d):0253 Register VPI: Cannot send mbox\n",
+                               phba->brd_no, vport->vpi);
+               }
+       } else {
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+
+               lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                       "%d (%d):0254 Register VPI: no memory\n",
+                       phba->brd_no, vport->vpi);
+
+               vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;
+               lpfc_nlp_put(ndlp);
+       }
+}
+
+static void
+lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                   struct lpfc_iocbq *rspiocb)
+{
+       struct lpfc_vport *vport = cmdiocb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) cmdiocb->context1;
+       struct lpfc_nodelist *np;
+       struct lpfc_nodelist *next_np;
+       IOCB_t *irsp = &rspiocb->iocb;
+       struct lpfc_iocbq *piocb;
+
+       lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+               "%d (%d):0123 FDISC completes. x%x/x%x prevDID: x%x\n",
+               phba->brd_no, vport->vpi,
+               irsp->ulpStatus, irsp->un.ulpWord[4], vport->fc_prevDID);
+
+       /* Since all FDISCs are being single threaded, we
+        * must reset the discovery timer for ALL vports
+        * waiting to send FDISC when one completes.
+        */
+       list_for_each_entry(piocb, &phba->fabric_iocb_list, list) {
+               lpfc_set_disctmo(piocb->vport);
+       }
+
+       if (irsp->ulpStatus) {
+               /* Check for retry */
+               if (lpfc_els_retry(phba, cmdiocb, rspiocb))
+                       goto out;
+
+               /* FDISC failed */
+               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                       "%d (%d):0124 FDISC failed. (%d/%d)\n",
+                       phba->brd_no, vport->vpi,
+                       irsp->ulpStatus, irsp->un.ulpWord[4]);
+               if (vport->fc_vport->vport_state == FC_VPORT_INITIALIZING)
+                       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+
+               lpfc_nlp_put(ndlp);
+               /* giving up on FDISC. Cancel discovery timer */
+               lpfc_can_disctmo(vport);
+       } else {
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag |= FC_FABRIC;
+               if (vport->phba->fc_topology == TOPOLOGY_LOOP)
+                       vport->fc_flag |=  FC_PUBLIC_LOOP;
+               spin_unlock_irq(shost->host_lock);
+
+               vport->fc_myDID = irsp->un.ulpWord[4] & Mask_DID;
+               lpfc_vport_set_state(vport, FC_VPORT_ACTIVE);
+               if ((vport->fc_prevDID != vport->fc_myDID) &&
+                       !(vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)) {
+                       /* If our NportID changed, we need to ensure all
+                        * remaining NPORTs get unreg_login'ed so we can
+                        * issue unreg_vpi.
+                        */
+                       list_for_each_entry_safe(np, next_np,
+                               &vport->fc_nodes, nlp_listp) {
+                               if (np->nlp_state != NLP_STE_NPR_NODE
+                                  || !(np->nlp_flag & NLP_NPR_ADISC))
+                                       continue;
+                               spin_lock_irq(shost->host_lock);
+                               np->nlp_flag &= ~NLP_NPR_ADISC;
+                               spin_unlock_irq(shost->host_lock);
+                               lpfc_unreg_rpi(vport, np);
+                       }
+                       lpfc_mbx_unreg_vpi(vport);
+                       vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+               }
+
+               if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)
+                       lpfc_register_new_vport(phba, vport, ndlp);
+               else
+                       lpfc_do_scr_ns_plogi(phba, vport);
+
+               lpfc_nlp_put(ndlp); /* Free Fabric ndlp for vports */
+       }
+
+out:
+       lpfc_els_free_iocb(phba, cmdiocb);
+}
+
+int
+lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                    uint8_t retry)
+{
+       struct lpfc_hba *phba = vport->phba;
+       IOCB_t *icmd;
+       struct lpfc_iocbq *elsiocb;
+       struct serv_parm *sp;
+       uint8_t *pcmd;
+       uint16_t cmdsize;
+       int did = ndlp->nlp_DID;
+       int rc;
+       int new_ndlp = 0;
+
+       cmdsize = (sizeof(uint32_t) + sizeof(struct serv_parm));
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, retry, ndlp, did,
+                                    ELS_CMD_FDISC);
+       if (!elsiocb) {
+               if (new_ndlp)
+                       mempool_free(ndlp, phba->nlp_mem_pool);
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+
+               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                       "%d (%d):0255 Issue FDISC: no IOCB\n",
+                       phba->brd_no, vport->vpi);
+               return 1;
+       }
+
+       icmd = &elsiocb->iocb;
+       icmd->un.elsreq64.myID = 0;
+       icmd->un.elsreq64.fl = 1;
+
+       /* For FDISC, Let FDISC rsp set the NPortID for this VPI */
+       icmd->ulpCt_h = 1;
+       icmd->ulpCt_l = 0;
+
+       pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
+       *((uint32_t *) (pcmd)) = ELS_CMD_FDISC;
+       pcmd += sizeof(uint32_t); /* CSP Word 1 */
+       memcpy(pcmd, &vport->phba->pport->fc_sparam, sizeof(struct serv_parm));
+       sp = (struct serv_parm *) pcmd;
+       /* Setup CSPs accordingly for Fabric */
+       sp->cmn.e_d_tov = 0;
+       sp->cmn.w2.r_a_tov = 0;
+       sp->cls1.classValid = 0;
+       sp->cls2.seqDelivery = 1;
+       sp->cls3.seqDelivery = 1;
+
+       pcmd += sizeof(uint32_t); /* CSP Word 2 */
+       pcmd += sizeof(uint32_t); /* CSP Word 3 */
+       pcmd += sizeof(uint32_t); /* CSP Word 4 */
+       pcmd += sizeof(uint32_t); /* Port Name */
+       memcpy(pcmd, &vport->fc_portname, 8);
+       pcmd += sizeof(uint32_t); /* Node Name */
+       pcmd += sizeof(uint32_t); /* Node Name */
+       memcpy(pcmd, &vport->fc_nodename, 8);
+
+       lpfc_set_disctmo(vport);
+
+       phba->fc_stat.elsXmitFDISC++;
+       elsiocb->iocb_cmpl = lpfc_cmpl_els_fdisc;
+
+       rc = lpfc_issue_fabric_iocb(phba, elsiocb);
+       if (rc == IOCB_ERROR) {
+               lpfc_els_free_iocb(phba, elsiocb);
+               if (new_ndlp)
+                       mempool_free(ndlp, phba->nlp_mem_pool);
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+
+               lpfc_printf_log(phba, KERN_ERR, LOG_ELS,
+                       "%d (%d):0256 Issue FDISC: Cannot send IOCB\n",
+                       phba->brd_no, vport->vpi);
+
+               return 1;
+       }
+       lpfc_vport_set_state(vport, FC_VPORT_INITIALIZING);
+       vport->port_state = LPFC_FDISC;
+       return 0;
+}
+
+static void
+lpfc_cmpl_els_npiv_logo(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                       struct lpfc_iocbq *rspiocb)
+{
+       struct lpfc_vport *vport = cmdiocb->vport;
+
+       lpfc_els_free_iocb(phba, cmdiocb);
+       vport->unreg_vpi_cmpl = VPORT_ERROR;
+}
+
+int
+lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
+       IOCB_t *icmd;
+       struct lpfc_iocbq *elsiocb;
+       uint8_t *pcmd;
+       uint16_t cmdsize;
+
+       cmdsize = 2 * sizeof(uint32_t) + sizeof(struct lpfc_name);
+       elsiocb = lpfc_prep_els_iocb(vport, 1, cmdsize, 0, ndlp, ndlp->nlp_DID,
+                                    ELS_CMD_LOGO);
+       if (!elsiocb)
+               return 1;
+
+       icmd = &elsiocb->iocb;
+       pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);
+       *((uint32_t *) (pcmd)) = ELS_CMD_LOGO;
+       pcmd += sizeof(uint32_t);
+
+       /* Fill in LOGO payload */
+       *((uint32_t *) (pcmd)) = be32_to_cpu(vport->fc_myDID);
+       pcmd += sizeof(uint32_t);
+       memcpy(pcmd, &vport->fc_portname, sizeof(struct lpfc_name));
+
+       elsiocb->iocb_cmpl = lpfc_cmpl_els_npiv_logo;
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag |= NLP_LOGO_SND;
+       spin_unlock_irq(shost->host_lock);
+       if (lpfc_sli_issue_iocb(phba, pring, elsiocb, 0) == IOCB_ERROR) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag &= ~NLP_LOGO_SND;
+               spin_unlock_irq(shost->host_lock);
+               lpfc_els_free_iocb(phba, elsiocb);
+               return 1;
+       }
+       return 0;
+}
+
+void
+lpfc_fabric_block_timeout(unsigned long ptr)
+{
+       struct lpfc_hba  *phba = (struct lpfc_hba *) ptr;
+       unsigned long iflags;
+       uint32_t tmo_posted;
+       spin_lock_irqsave(&phba->pport->work_port_lock, iflags);
+       tmo_posted = phba->pport->work_port_events & WORKER_FABRIC_BLOCK_TMO;
+       if (!tmo_posted)
+               phba->pport->work_port_events |= WORKER_FABRIC_BLOCK_TMO;
+       spin_unlock_irqrestore(&phba->pport->work_port_lock, iflags);
+
+       if (!tmo_posted) {
+               spin_lock_irqsave(&phba->hbalock, iflags);
+               if (phba->work_wait)
+                       lpfc_worker_wake_up(phba);
+               spin_unlock_irqrestore(&phba->hbalock, iflags);
+       }
+}
+
+static void
+lpfc_resume_fabric_iocbs(struct lpfc_hba *phba)
+{
+       struct lpfc_iocbq *iocb;
+       unsigned long iflags;
+       int ret;
+       struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
+       IOCB_t *cmd;
+
+repeat:
+       iocb = NULL;
+       spin_lock_irqsave(&phba->hbalock, iflags);
+                               /* Post any pending iocb to the SLI layer */
+       if (atomic_read(&phba->fabric_iocb_count) == 0) {
+               list_remove_head(&phba->fabric_iocb_list, iocb, typeof(*iocb),
+                                list);
+               if (iocb)
+                       atomic_inc(&phba->fabric_iocb_count);
+       }
+       spin_unlock_irqrestore(&phba->hbalock, iflags);
+       if (iocb) {
+               iocb->fabric_iocb_cmpl = iocb->iocb_cmpl;
+               iocb->iocb_cmpl = lpfc_cmpl_fabric_iocb;
+               iocb->iocb_flag |= LPFC_IO_FABRIC;
+
+               ret = lpfc_sli_issue_iocb(phba, pring, iocb, 0);
+
+               if (ret == IOCB_ERROR) {
+                       iocb->iocb_cmpl = iocb->fabric_iocb_cmpl;
+                       iocb->fabric_iocb_cmpl = NULL;
+                       iocb->iocb_flag &= ~LPFC_IO_FABRIC;
+                       cmd = &iocb->iocb;
+                       cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                       cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+                       iocb->iocb_cmpl(phba, iocb, iocb);
+
+                       atomic_dec(&phba->fabric_iocb_count);
+                       goto repeat;
+               }
+       }
+
+       return;
+}
+
+void
+lpfc_unblock_fabric_iocbs(struct lpfc_hba *phba)
+{
+       clear_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
+
+       lpfc_resume_fabric_iocbs(phba);
+       return;
+}
+
+static void
+lpfc_block_fabric_iocbs(struct lpfc_hba *phba)
+{
+       int blocked;
+
+       blocked = test_and_set_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
+                               /* Start a timer to unblock fabric
+                                * iocbs after 100ms
+                                */
+       if (!blocked)
+               mod_timer(&phba->fabric_block_timer, jiffies + HZ/10 );
+
+       return;
+}
+
+static void
+lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+       struct lpfc_iocbq *rspiocb)
+{
+       struct ls_rjt stat;
+
+       if ((cmdiocb->iocb_flag & LPFC_IO_FABRIC) != LPFC_IO_FABRIC)
+               BUG();
+
+       switch (rspiocb->iocb.ulpStatus) {
+               case IOSTAT_NPORT_RJT:
+               case IOSTAT_FABRIC_RJT:
+                       if (rspiocb->iocb.un.ulpWord[4] & RJT_UNAVAIL_TEMP) {
+                               lpfc_block_fabric_iocbs(phba);
+                       }
+                       break;
+
+               case IOSTAT_NPORT_BSY:
+               case IOSTAT_FABRIC_BSY:
+                       lpfc_block_fabric_iocbs(phba);
+                       break;
+
+               case IOSTAT_LS_RJT:
+                       stat.un.lsRjtError =
+                               be32_to_cpu(rspiocb->iocb.un.ulpWord[4]);
+                       if ((stat.un.b.lsRjtRsnCode == LSRJT_UNABLE_TPC) ||
+                               (stat.un.b.lsRjtRsnCode == LSRJT_LOGICAL_BSY))
+                               lpfc_block_fabric_iocbs(phba);
+                       break;
+       }
+
+       if (atomic_read(&phba->fabric_iocb_count) == 0)
+               BUG();
+
+       cmdiocb->iocb_cmpl = cmdiocb->fabric_iocb_cmpl;
+       cmdiocb->fabric_iocb_cmpl = NULL;
+       cmdiocb->iocb_flag &= ~LPFC_IO_FABRIC;
+       cmdiocb->iocb_cmpl(phba, cmdiocb, rspiocb);
+
+       atomic_dec(&phba->fabric_iocb_count);
+       if (!test_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags)) {
+                               /* Post any pending iocbs to HBA */
+                   lpfc_resume_fabric_iocbs(phba);
+       }
+}
+
+int
+lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb)
+{
+       unsigned long iflags;
+       struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
+       int ready;
+       int ret;
+
+       if (atomic_read(&phba->fabric_iocb_count) > 1)
+               BUG();
+
+       spin_lock_irqsave(&phba->hbalock, iflags);
+       ready = atomic_read(&phba->fabric_iocb_count) == 0 &&
+               !test_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
+
+       spin_unlock_irqrestore(&phba->hbalock, iflags);
+       if (ready) {
+               iocb->fabric_iocb_cmpl = iocb->iocb_cmpl;
+               iocb->iocb_cmpl = lpfc_cmpl_fabric_iocb;
+               iocb->iocb_flag |= LPFC_IO_FABRIC;
+
+               atomic_inc(&phba->fabric_iocb_count);
+               ret = lpfc_sli_issue_iocb(phba, pring, iocb, 0);
+
+               if (ret == IOCB_ERROR) {
+                       iocb->iocb_cmpl = iocb->fabric_iocb_cmpl;
+                       iocb->fabric_iocb_cmpl = NULL;
+                       iocb->iocb_flag &= ~LPFC_IO_FABRIC;
+                       atomic_dec(&phba->fabric_iocb_count);
+               }
+       } else {
+               spin_lock_irqsave(&phba->hbalock, iflags);
+               list_add_tail(&iocb->list, &phba->fabric_iocb_list);
+               spin_unlock_irqrestore(&phba->hbalock, iflags);
+               ret = IOCB_SUCCESS;
+       }
+       return ret;
+}
+
+
+void lpfc_fabric_abort_vport(struct lpfc_vport *vport)
+{
+       LIST_HEAD(completions);
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_iocbq *tmp_iocb, *piocb;
+       IOCB_t *cmd;
+
+       spin_lock_irq(&phba->hbalock);
+       list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list,
+                                list) {
+
+               if (piocb->vport != vport)
+                       continue;
+
+               list_move_tail(&piocb->list, &completions);
+       }
+       spin_unlock_irq(&phba->hbalock);
+
+       while (!list_empty(&completions)) {
+               piocb = list_get_first(&completions, struct lpfc_iocbq, list);
+               list_del_init(&piocb->list);
+
+               cmd = &piocb->iocb;
+               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+               (piocb->iocb_cmpl) (phba, piocb, piocb);
+       }
+}
+
+void lpfc_fabric_abort_nport(struct lpfc_nodelist *ndlp)
+{
+       LIST_HEAD(completions);
+       struct lpfc_hba  *phba = ndlp->vport->phba;
+       struct lpfc_iocbq *tmp_iocb, *piocb;
+       struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
+       IOCB_t *cmd;
+
+       spin_lock_irq(&phba->hbalock);
+       list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list,
+                                list) {
+               if ((lpfc_check_sli_ndlp(phba, pring, piocb, ndlp))) {
+
+                       list_move_tail(&piocb->list, &completions);
+               }
+       }
+       spin_unlock_irq(&phba->hbalock);
+
+       while (!list_empty(&completions)) {
+               piocb = list_get_first(&completions, struct lpfc_iocbq, list);
+               list_del_init(&piocb->list);
+
+               cmd = &piocb->iocb;
+               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+               (piocb->iocb_cmpl) (phba, piocb, piocb);
+       }
+}
+
+void lpfc_fabric_abort_hba(struct lpfc_hba *phba)
+{
+       LIST_HEAD(completions);
+       struct lpfc_iocbq *piocb;
+       IOCB_t *cmd;
+
+       spin_lock_irq(&phba->hbalock);
+       list_splice_init(&phba->fabric_iocb_list, &completions);
+       spin_unlock_irq(&phba->hbalock);
+
+       while (!list_empty(&completions)) {
+               piocb = list_get_first(&completions, struct lpfc_iocbq, list);
+               list_del_init(&piocb->list);
+
+               cmd = &piocb->iocb;
+               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+               (piocb->iocb_cmpl) (phba, piocb, piocb);
+       }
+}
+
+
+void lpfc_fabric_abort_flogi(struct lpfc_hba *phba)
+{
+       LIST_HEAD(completions);
+       struct lpfc_iocbq *tmp_iocb, *piocb;
+       IOCB_t *cmd;
+       struct lpfc_nodelist *ndlp;
+
+       spin_lock_irq(&phba->hbalock);
+       list_for_each_entry_safe(piocb, tmp_iocb, &phba->fabric_iocb_list,
+                                list) {
+
+               cmd = &piocb->iocb;
+               ndlp = (struct lpfc_nodelist *) piocb->context1;
+               if (cmd->ulpCommand == CMD_ELS_REQUEST64_CR &&
+                   ndlp != NULL &&
+                   ndlp->nlp_DID == Fabric_DID)
+                       list_move_tail(&piocb->list, &completions);
+       }
+       spin_unlock_irq(&phba->hbalock);
+
+       while (!list_empty(&completions)) {
+               piocb = list_get_first(&completions, struct lpfc_iocbq, list);
+               list_del_init(&piocb->list);
+
+               cmd = &piocb->iocb;
+               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+               (piocb->iocb_cmpl) (phba, piocb, piocb);
+       }
+}
+
+