[SCSI] lpfc 8.3.20: Updates to FC discovery commands
[linux-2.6.git] / drivers / scsi / lpfc / lpfc_nportdisc.c
index 45dc021..d85a742 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-2009 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
 
 #include <linux/blkdev.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include <linux/interrupt.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport_fc.h>
 
+#include "lpfc_hw4.h"
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_sli4.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_crtn.h"
+#include "lpfc_vport.h"
+#include "lpfc_debugfs.h"
 
 
 /* Called to verify a rcv'ed ADISC was intended for us. */
 static int
-lpfc_check_adisc(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
-                struct lpfc_name * nn, struct lpfc_name * pn)
+lpfc_check_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                struct lpfc_name *nn, struct lpfc_name *pn)
 {
        /* Compare the ADISC rsp WWNN / WWPN matches our internal node
         * table entry for that node.
         */
-       if (memcmp(nn, &ndlp->nlp_nodename, sizeof (struct lpfc_name)) != 0)
-               return (0);
+       if (memcmp(nn, &ndlp->nlp_nodename, sizeof (struct lpfc_name)))
+               return 0;
 
-       if (memcmp(pn, &ndlp->nlp_portname, sizeof (struct lpfc_name)) != 0)
-               return (0);
+       if (memcmp(pn, &ndlp->nlp_portname, sizeof (struct lpfc_name)))
+               return 0;
 
        /* we match, return success */
-       return (1);
+       return 1;
 }
 
-
 int
-lpfc_check_sparm(struct lpfc_hba * phba,
-                struct lpfc_nodelist * ndlp, struct serv_parm * sp,
-                uint32_t class)
-{
-       volatile struct serv_parm *hsp = &phba->fc_sparam;
-       /* First check for supported version */
-
-       /* Next check for class validity */
+lpfc_check_sparm(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                struct serv_parm *sp, uint32_t class, int flogi)
+{
+       volatile struct serv_parm *hsp = &vport->fc_sparam;
+       uint16_t hsp_value, ssp_value = 0;
+
+       /*
+        * The receive data field size and buffer-to-buffer receive data field
+        * size entries are 16 bits but are represented as two 8-bit fields in
+        * the driver data structure to account for rsvd bits and other control
+        * bits.  Reconstruct and compare the fields as a 16-bit values before
+        * correcting the byte values.
+        */
        if (sp->cls1.classValid) {
-
-               if (sp->cls1.rcvDataSizeMsb > hsp->cls1.rcvDataSizeMsb)
-                       sp->cls1.rcvDataSizeMsb = hsp->cls1.rcvDataSizeMsb;
-               if (sp->cls1.rcvDataSizeLsb > hsp->cls1.rcvDataSizeLsb)
-                       sp->cls1.rcvDataSizeLsb = hsp->cls1.rcvDataSizeLsb;
-       } else if (class == CLASS1) {
-               return (0);
-       }
-
+               if (!flogi) {
+                       hsp_value = ((hsp->cls1.rcvDataSizeMsb << 8) |
+                                    hsp->cls1.rcvDataSizeLsb);
+                       ssp_value = ((sp->cls1.rcvDataSizeMsb << 8) |
+                                    sp->cls1.rcvDataSizeLsb);
+                       if (!ssp_value)
+                               goto bad_service_param;
+                       if (ssp_value > hsp_value) {
+                               sp->cls1.rcvDataSizeLsb =
+                                       hsp->cls1.rcvDataSizeLsb;
+                               sp->cls1.rcvDataSizeMsb =
+                                       hsp->cls1.rcvDataSizeMsb;
+                       }
+               }
+       } else if (class == CLASS1)
+               goto bad_service_param;
        if (sp->cls2.classValid) {
-
-               if (sp->cls2.rcvDataSizeMsb > hsp->cls2.rcvDataSizeMsb)
-                       sp->cls2.rcvDataSizeMsb = hsp->cls2.rcvDataSizeMsb;
-               if (sp->cls2.rcvDataSizeLsb > hsp->cls2.rcvDataSizeLsb)
-                       sp->cls2.rcvDataSizeLsb = hsp->cls2.rcvDataSizeLsb;
-       } else if (class == CLASS2) {
-               return (0);
-       }
-
+               if (!flogi) {
+                       hsp_value = ((hsp->cls2.rcvDataSizeMsb << 8) |
+                                    hsp->cls2.rcvDataSizeLsb);
+                       ssp_value = ((sp->cls2.rcvDataSizeMsb << 8) |
+                                    sp->cls2.rcvDataSizeLsb);
+                       if (!ssp_value)
+                               goto bad_service_param;
+                       if (ssp_value > hsp_value) {
+                               sp->cls2.rcvDataSizeLsb =
+                                       hsp->cls2.rcvDataSizeLsb;
+                               sp->cls2.rcvDataSizeMsb =
+                                       hsp->cls2.rcvDataSizeMsb;
+                       }
+               }
+       } else if (class == CLASS2)
+               goto bad_service_param;
        if (sp->cls3.classValid) {
+               if (!flogi) {
+                       hsp_value = ((hsp->cls3.rcvDataSizeMsb << 8) |
+                                    hsp->cls3.rcvDataSizeLsb);
+                       ssp_value = ((sp->cls3.rcvDataSizeMsb << 8) |
+                                    sp->cls3.rcvDataSizeLsb);
+                       if (!ssp_value)
+                               goto bad_service_param;
+                       if (ssp_value > hsp_value) {
+                               sp->cls3.rcvDataSizeLsb =
+                                       hsp->cls3.rcvDataSizeLsb;
+                               sp->cls3.rcvDataSizeMsb =
+                                       hsp->cls3.rcvDataSizeMsb;
+                       }
+               }
+       } else if (class == CLASS3)
+               goto bad_service_param;
 
-               if (sp->cls3.rcvDataSizeMsb > hsp->cls3.rcvDataSizeMsb)
-                       sp->cls3.rcvDataSizeMsb = hsp->cls3.rcvDataSizeMsb;
-               if (sp->cls3.rcvDataSizeLsb > hsp->cls3.rcvDataSizeLsb)
-                       sp->cls3.rcvDataSizeLsb = hsp->cls3.rcvDataSizeLsb;
-       } else if (class == CLASS3) {
-               return (0);
-       }
-
-       if (sp->cmn.bbRcvSizeMsb > hsp->cmn.bbRcvSizeMsb)
-               sp->cmn.bbRcvSizeMsb = hsp->cmn.bbRcvSizeMsb;
-       if (sp->cmn.bbRcvSizeLsb > hsp->cmn.bbRcvSizeLsb)
+       /*
+        * Preserve the upper four bits of the MSB from the PLOGI response.
+        * These bits contain the Buffer-to-Buffer State Change Number
+        * from the target and need to be passed to the FW.
+        */
+       hsp_value = (hsp->cmn.bbRcvSizeMsb << 8) | hsp->cmn.bbRcvSizeLsb;
+       ssp_value = (sp->cmn.bbRcvSizeMsb << 8) | sp->cmn.bbRcvSizeLsb;
+       if (ssp_value > hsp_value) {
                sp->cmn.bbRcvSizeLsb = hsp->cmn.bbRcvSizeLsb;
+               sp->cmn.bbRcvSizeMsb = (sp->cmn.bbRcvSizeMsb & 0xF0) |
+                                      (hsp->cmn.bbRcvSizeMsb & 0x0F);
+       }
 
-       /* If check is good, copy wwpn wwnn into ndlp */
        memcpy(&ndlp->nlp_nodename, &sp->nodeName, sizeof (struct lpfc_name));
        memcpy(&ndlp->nlp_portname, &sp->portName, sizeof (struct lpfc_name));
-       return (1);
+       return 1;
+bad_service_param:
+       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                        "0207 Device %x "
+                        "(%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x) sent "
+                        "invalid service parameters.  Ignoring device.\n",
+                        ndlp->nlp_DID,
+                        sp->nodeName.u.wwn[0], sp->nodeName.u.wwn[1],
+                        sp->nodeName.u.wwn[2], sp->nodeName.u.wwn[3],
+                        sp->nodeName.u.wwn[4], sp->nodeName.u.wwn[5],
+                        sp->nodeName.u.wwn[6], sp->nodeName.u.wwn[7]);
+       return 0;
 }
 
 static void *
-lpfc_check_elscmpl_iocb(struct lpfc_hba * phba,
-                     struct lpfc_iocbq *cmdiocb,
-                     struct lpfc_iocbq *rspiocb)
+lpfc_check_elscmpl_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                       struct lpfc_iocbq *rspiocb)
 {
        struct lpfc_dmabuf *pcmd, *prsp;
        uint32_t *lp;
@@ -128,8 +178,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba,
                        lp = (uint32_t *) prsp->virt;
                        ptr = (void *)((uint8_t *)lp + sizeof(uint32_t));
                }
-       }
-       else {
+       } else {
                /* Force ulpStatus error since we are returning NULL ptr */
                if (!(irsp->ulpStatus)) {
                        irsp->ulpStatus = IOSTAT_LOCAL_REJECT;
@@ -137,125 +186,80 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba,
                }
                ptr = NULL;
        }
-       return (ptr);
+       return ptr;
 }
 
 
+
 /*
  * Free resources / clean up outstanding I/Os
  * associated with a LPFC_NODELIST entry. This
  * routine effectively results in a "software abort".
  */
 int
-lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
-       int send_abts)
+lpfc_els_abort(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 {
-       struct lpfc_sli *psli;
-       struct lpfc_sli_ring *pring;
+       LIST_HEAD(completions);
+       LIST_HEAD(txcmplq_completions);
+       LIST_HEAD(abort_list);
+       struct lpfc_sli  *psli = &phba->sli;
+       struct lpfc_sli_ring *pring = &psli->ring[LPFC_ELS_RING];
        struct lpfc_iocbq *iocb, *next_iocb;
-       IOCB_t *icmd;
-       int    found = 0;
 
        /* Abort outstanding I/O on NPort <nlp_DID> */
-       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                       "%d:0201 Abort outstanding I/O on 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);
+       lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_DISCOVERY,
+                        "2819 Abort outstanding I/O on NPort x%x "
+                        "Data: x%x x%x x%x\n",
+                        ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,
+                        ndlp->nlp_rpi);
 
-       psli = &phba->sli;
-       pring = &psli->ring[LPFC_ELS_RING];
+       lpfc_fabric_abort_nport(ndlp);
 
        /* First check the txq */
-       do {
-               found = 0;
-               spin_lock_irq(phba->host->host_lock);
-               list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
-                       /* Check to see if iocb matches the nport we are looking
-                          for */
-                       if ((lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))) {
-                               found = 1;
-                               /* It matches, so deque and call compl with an
-                                  error */
-                               list_del(&iocb->list);
-                               pring->txq_cnt--;
-                               if (iocb->iocb_cmpl) {
-                                       icmd = &iocb->iocb;
-                                       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 {
-                                       list_add_tail(&iocb->list,
-                                                       &phba->lpfc_iocb_list);
-                               }
-                               break;
-                       }
+       spin_lock_irq(&phba->hbalock);
+       list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
+               /* Check to see if iocb matches the nport we are looking for */
+               if (lpfc_check_sli_ndlp(phba, pring, iocb, ndlp)) {
+                       /* It matches, so deque and call compl with anp error */
+                       list_move_tail(&iocb->list, &completions);
+                       pring->txq_cnt--;
                }
-               spin_unlock_irq(phba->host->host_lock);
-       } while (found);
+       }
 
-       /* Everything on txcmplq will be returned by firmware
-        * with a no rpi / linkdown / abort error.  For ring 0,
-        * ELS discovery, we want to get rid of it right here.
-        */
        /* Next check the txcmplq */
-       do {
-               found = 0;
-               spin_lock_irq(phba->host->host_lock);
-               list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq,
-                                        list) {
-                       /* Check to see if iocb matches the nport we are looking
-                          for */
-                       if ((lpfc_check_sli_ndlp (phba, pring, iocb, ndlp))) {
-                               found = 1;
-                               /* It matches, so deque and call compl with an
-                                  error */
-                               list_del(&iocb->list);
-                               pring->txcmplq_cnt--;
-
-                               icmd = &iocb->iocb;
-                               /* If the driver is completing an ELS
-                                * command early, flush it out of the firmware.
-                                */
-                               if (send_abts &&
-                                  (icmd->ulpCommand == CMD_ELS_REQUEST64_CR) &&
-                                  (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 {
-                                       list_add_tail(&iocb->list,
-                                                       &phba->lpfc_iocb_list);
-                               }
-                               break;
-                       }
-               }
-               spin_unlock_irq(phba->host->host_lock);
-       } while(found);
-
-       /* If we are delaying issuing an ELS command, cancel it */
-       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);
+       list_splice_init(&pring->txcmplq, &txcmplq_completions);
+       spin_unlock_irq(&phba->hbalock);
+
+       list_for_each_entry_safe(iocb, next_iocb, &txcmplq_completions, list) {
+               /* Check to see if iocb matches the nport we are looking for */
+               if (lpfc_check_sli_ndlp(phba, pring, iocb, ndlp))
+                       list_add_tail(&iocb->dlist, &abort_list);
+       }
+       spin_lock_irq(&phba->hbalock);
+       list_splice(&txcmplq_completions, &pring->txcmplq);
+       spin_unlock_irq(&phba->hbalock);
+
+       list_for_each_entry_safe(iocb, next_iocb, &abort_list, dlist) {
+                       spin_lock_irq(&phba->hbalock);
+                       list_del_init(&iocb->dlist);
+                       lpfc_sli_issue_abort_iotag(phba, pring, iocb);
+                       spin_unlock_irq(&phba->hbalock);
        }
-       return (0);
+
+       /* Cancel all the IOCBs from the completions list */
+       lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT,
+                             IOERR_SLI_ABORTED);
+
+       lpfc_cancel_retry_delay_tmo(phba->pport, ndlp);
+       return 0;
 }
 
 static int
-lpfc_rcv_plogi(struct lpfc_hba * phba,
-                     struct lpfc_nodelist * ndlp,
-                     struct lpfc_iocbq *cmdiocb)
+lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+              struct lpfc_iocbq *cmdiocb)
 {
+       struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba    *phba = vport->phba;
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
        IOCB_t *icmd;
@@ -265,14 +269,14 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
        int rc;
 
        memset(&stat, 0, sizeof (struct ls_rjt));
-       if (phba->hba_state <= LPFC_FLOGI) {
+       if (vport->port_state <= LPFC_FDISC) {
                /* Before responding to PLOGI, check for pt2pt mode.
                 * If we are pt2pt, with an outstanding FLOGI, abort
                 * the FLOGI and resend it first.
                 */
-               if (phba->fc_flag & FC_PT2PT) {
-                       lpfc_els_abort_flogi(phba);
-                       if (!(phba->fc_flag & FC_PT2PT_PLOGI)) {
+               if (vport->fc_flag & FC_PT2PT) {
+                        lpfc_els_abort_flogi(phba);
+                       if (!(vport->fc_flag & FC_PT2PT_PLOGI)) {
                                /* If the other side is supposed to initiate
                                 * the PLOGI anyway, just ACC it now and
                                 * move on with discovery.
@@ -281,47 +285,59 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
                                phba->fc_ratov = FF_DEF_RATOV;
                                /* Start discovery - this should just do
                                   CLEAR_LA */
-                               lpfc_disc_start(phba);
-                       }
-                       else {
-                               lpfc_initial_flogi(phba);
-                       }
-               }
-               else {
+                               lpfc_disc_start(vport);
+                       } else
+                               lpfc_initial_flogi(vport);
+               } else {
                        stat.un.b.lsRjtRsnCode = LSRJT_LOGICAL_BSY;
                        stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
-                       lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb,
-                                           ndlp);
+                       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb,
+                                           ndlp, NULL);
                        return 0;
                }
        }
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
        lp = (uint32_t *) pcmd->virt;
        sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t));
-       if ((lpfc_check_sparm(phba, ndlp, sp, CLASS3) == 0)) {
+       if (wwn_to_u64(sp->portName.u.wwn) == 0) {
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0140 PLOGI Reject: invalid nname\n");
+               stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
+               stat.un.b.lsRjtRsnCodeExp = LSEXP_INVALID_PNAME;
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,
+                       NULL);
+               return 0;
+       }
+       if (wwn_to_u64(sp->nodeName.u.wwn) == 0) {
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0141 PLOGI Reject: invalid pname\n");
+               stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
+               stat.un.b.lsRjtRsnCodeExp = LSEXP_INVALID_NNAME;
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,
+                       NULL);
+               return 0;
+       }
+       if ((lpfc_check_sparm(vport, ndlp, sp, CLASS3, 0) == 0)) {
                /* Reject this request because invalid parameters */
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_SPARM_OPTIONS;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-               return (0);
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,
+                       NULL);
+               return 0;
        }
        icmd = &cmdiocb->iocb;
 
        /* PLOGI chkparm OK */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_ELS,
-                       "%d:0114 PLOGI chkparm OK Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       ndlp->nlp_DID, ndlp->nlp_state, ndlp->nlp_flag,
-                       ndlp->nlp_rpi);
-
-       if ((phba->cfg_fcp_class == 2) &&
-           (sp->cls2.classValid)) {
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+                        "0114 PLOGI chkparm OK Data: x%x x%x x%x x%x\n",
+                        ndlp->nlp_DID, ndlp->nlp_state, ndlp->nlp_flag,
+                        ndlp->nlp_rpi);
+
+       if (vport->cfg_fcp_class == 2 && sp->cls2.classValid)
                ndlp->nlp_fcp_info |= CLASS2;
-       } else {
+       else
                ndlp->nlp_fcp_info |= CLASS3;
-       }
+
        ndlp->nlp_class_sup = 0;
        if (sp->cls1.classValid)
                ndlp->nlp_class_sup |= FC_COS_CLASS1;
@@ -335,7 +351,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
                ((sp->cmn.bbRcvSizeMsb & 0x0F) << 8) | sp->cmn.bbRcvSizeLsb;
 
        /* no need to reg_login if we are already in one of these states */
-       switch(ndlp->nlp_state) {
+       switch (ndlp->nlp_state) {
        case  NLP_STE_NPR_NODE:
                if (!(ndlp->nlp_flag & NLP_NPR_ADISC))
                        break;
@@ -343,35 +359,36 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
        case  NLP_STE_PRLI_ISSUE:
        case  NLP_STE_UNMAPPED_NODE:
        case  NLP_STE_MAPPED_NODE:
-               lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, 0);
-               return (1);
+               lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL);
+               return 1;
        }
 
-       if ((phba->fc_flag & FC_PT2PT)
-           && !(phba->fc_flag & FC_PT2PT_PLOGI)) {
+       if ((vport->fc_flag & FC_PT2PT) &&
+           !(vport->fc_flag & FC_PT2PT_PLOGI)) {
                /* rcv'ed PLOGI decides what our NPortId will be */
-               phba->fc_myDID = icmd->un.rcvels.parmRo;
+               vport->fc_myDID = icmd->un.rcvels.parmRo;
                mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
                if (mbox == NULL)
                        goto out;
                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));
+               mbox->vport = vport;
+               rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);
                if (rc == MBX_NOT_FINISHED) {
-                       mempool_free( mbox, phba->mbox_mem_pool);
+                       mempool_free(mbox, phba->mbox_mem_pool);
                        goto out;
                }
 
-               lpfc_can_disctmo(phba);
+               lpfc_can_disctmo(vport);
        }
        mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-       if (mbox == NULL)
+       if (!mbox)
                goto out;
 
-       if (lpfc_reg_login(phba, icmd->un.rcvels.remoteID,
-                          (uint8_t *) sp, mbox, 0)) {
-               mempool_free( mbox, phba->mbox_mem_pool);
+       rc = lpfc_reg_rpi(phba, vport->vpi, icmd->un.rcvels.remoteID,
+                           (uint8_t *) sp, mbox, ndlp->nlp_rpi);
+       if (rc) {
+               mempool_free(mbox, phba->mbox_mem_pool);
                goto out;
        }
 
@@ -379,35 +396,63 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
         * queue this mbox command to be processed later.
         */
        mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
-       mbox->context2  = ndlp;
-       ndlp->nlp_flag |= NLP_ACC_REGLOGIN;
-
-       /* If there is an outstanding PLOGI issued, abort it before
-        * sending ACC rsp to PLOGI recieved.
+       /*
+        * mbox->context2 = lpfc_nlp_get(ndlp) deferred until mailbox
+        * command issued in lpfc_cmpl_els_acc().
+        */
+       mbox->vport = vport;
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag |= (NLP_ACC_REGLOGIN | NLP_RCV_PLOGI);
+       spin_unlock_irq(shost->host_lock);
+
+       /*
+        * If there is an outstanding PLOGI issued, abort it before
+        * sending ACC rsp for received PLOGI. If pending plogi
+        * is not canceled here, the plogi will be rejected by
+        * remote port and will be retried. On a configuration with
+        * single discovery thread, this will cause a huge delay in
+        * discovery. Also this will cause multiple state machines
+        * running in parallel for this node.
         */
        if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) {
                /* software abort outstanding PLOGI */
-               lpfc_els_abort(phba, ndlp, 1);
+               lpfc_els_abort(phba, ndlp);
        }
-       ndlp->nlp_flag |= NLP_RCV_PLOGI;
-       lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox, 0);
-       return (1);
 
+       if ((vport->port_type == LPFC_NPIV_PORT &&
+            vport->cfg_restrict_login)) {
+
+               /* In order to preserve RPIs, we want to cleanup
+                * the default RPI the firmware created to rcv
+                * this ELS request. The only way to do this is
+                * to register, then unregister the RPI.
+                */
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_RM_DFLT_RPI;
+               spin_unlock_irq(shost->host_lock);
+               stat.un.b.lsRjtRsnCode = LSRJT_INVALID_CMD;
+               stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb,
+                       ndlp, mbox);
+               return 1;
+       }
+       lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox);
+       return 1;
 out:
        stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
        stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE;
-       lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-       return (0);
+       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp, NULL);
+       return 0;
 }
 
 static int
-lpfc_rcv_padisc(struct lpfc_hba * phba,
-               struct lpfc_nodelist * ndlp,
+lpfc_rcv_padisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                struct lpfc_iocbq *cmdiocb)
 {
+       struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
        struct lpfc_dmabuf *pcmd;
-       struct serv_parm *sp;
-       struct lpfc_name *pnn, *ppn;
+       struct serv_parm   *sp;
+       struct lpfc_name   *pnn, *ppn;
        struct ls_rjt stat;
        ADISC *ap;
        IOCB_t *icmd;
@@ -429,73 +474,122 @@ lpfc_rcv_padisc(struct lpfc_hba * phba,
        }
 
        icmd = &cmdiocb->iocb;
-       if ((icmd->ulpStatus == 0) &&
-           (lpfc_check_adisc(phba, ndlp, pnn, ppn))) {
+       if (icmd->ulpStatus == 0 && lpfc_check_adisc(vport, ndlp, pnn, ppn)) {
                if (cmd == ELS_CMD_ADISC) {
-                       lpfc_els_rsp_adisc_acc(phba, cmdiocb, ndlp);
-               }
-               else {
-                       lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp,
-                               NULL, 0);
+                       lpfc_els_rsp_adisc_acc(vport, cmdiocb, ndlp);
+               } else {
+                       lpfc_els_rsp_acc(vport, ELS_CMD_PLOGI, cmdiocb, ndlp,
+                                        NULL);
                }
-               return (1);
+               return 1;
        }
        /* 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);
+       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp, NULL);
 
-       ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
        /* 1 sec timeout */
        mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
 
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_DELAY_TMO;
-       spin_unlock_irq(phba->host->host_lock);
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       return (0);
+       spin_unlock_irq(shost->host_lock);
+       ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
+       ndlp->nlp_prev_state = ndlp->nlp_state;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       return 0;
 }
 
 static int
-lpfc_rcv_logo(struct lpfc_hba * phba,
-                     struct lpfc_nodelist * ndlp,
-                     struct lpfc_iocbq *cmdiocb)
+lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+             struct lpfc_iocbq *cmdiocb, uint32_t els_cmd)
 {
-       /* Put ndlp on NPR list with 1 sec timeout for plogi, ACC logo */
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba    *phba = vport->phba;
+       struct lpfc_vport **vports;
+       int i, active_vlink_present = 0 ;
+
+       /* Put ndlp in NPR state with 1 sec timeout for plogi, ACC logo */
        /* Only call LOGO ACC for first LOGO, this avoids sending unnecessary
         * PLOGIs during LOGO storms from a device.
         */
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_LOGO_ACC;
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
+       spin_unlock_irq(shost->host_lock);
+       if (els_cmd == ELS_CMD_PRLO)
+               lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
+       else
+               lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
+       if (ndlp->nlp_DID == Fabric_DID) {
+               if (vport->port_state <= LPFC_FDISC)
+                       goto out;
+               lpfc_linkdown_port(vport);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag |= FC_VPORT_LOGO_RCVD;
+               spin_unlock_irq(shost->host_lock);
+               vports = lpfc_create_vport_work_array(phba);
+               if (vports) {
+                       for (i = 0; i <= phba->max_vports && vports[i] != NULL;
+                                       i++) {
+                               if ((!(vports[i]->fc_flag &
+                                       FC_VPORT_LOGO_RCVD)) &&
+                                       (vports[i]->port_state > LPFC_FDISC)) {
+                                       active_vlink_present = 1;
+                                       break;
+                               }
+                       }
+                       lpfc_destroy_vport_work_array(phba, vports);
+               }
 
-       if (!(ndlp->nlp_type & NLP_FABRIC)) {
+               if (active_vlink_present) {
+                       /*
+                        * If there are other active VLinks present,
+                        * re-instantiate the Vlink using FDISC.
+                        */
+                       mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag |= NLP_DELAY_TMO;
+                       spin_unlock_irq(shost->host_lock);
+                       ndlp->nlp_last_elscmd = ELS_CMD_FDISC;
+                       vport->port_state = LPFC_FDISC;
+               } else {
+                       spin_lock_irq(shost->host_lock);
+                       phba->pport->fc_flag &= ~FC_LOGO_RCVD_DID_CHNG;
+                       spin_unlock_irq(shost->host_lock);
+                       lpfc_retry_pport_discovery(phba);
+               }
+       } else if ((!(ndlp->nlp_type & NLP_FABRIC) &&
+               ((ndlp->nlp_type & NLP_FCP_TARGET) ||
+               !(ndlp->nlp_type & NLP_FCP_INITIATOR))) ||
+               (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
                /* Only try to re-login if this is NOT a Fabric Node */
-               ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
-               spin_lock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag |= NLP_DELAY_TMO;
-               spin_unlock_irq(phba->host->host_lock);
-       }
+               spin_unlock_irq(shost->host_lock);
 
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+               ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
+       }
+out:
+       ndlp->nlp_prev_state = ndlp->nlp_state;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
 
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+       spin_unlock_irq(shost->host_lock);
        /* The driver has to wait until the ACC completes before it continues
         * processing the LOGO.  The action will resume in
         * lpfc_cmpl_els_logo_acc routine. Since part of processing includes an
         * unreg_login, the driver waits so the ACC does not get aborted.
         */
-       return (0);
+       return 0;
 }
 
 static void
-lpfc_rcv_prli(struct lpfc_hba * phba,
-                     struct lpfc_nodelist * ndlp,
-                     struct lpfc_iocbq *cmdiocb)
+lpfc_rcv_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+             struct lpfc_iocbq *cmdiocb)
 {
        struct lpfc_dmabuf *pcmd;
        uint32_t *lp;
@@ -509,8 +603,7 @@ lpfc_rcv_prli(struct lpfc_hba * phba,
 
        ndlp->nlp_type &= ~(NLP_FCP_TARGET | NLP_FCP_INITIATOR);
        ndlp->nlp_fcp_info &= ~NLP_FCP_2_DEVICE;
-       if ((npr->acceptRspCode == PRLI_REQ_EXECUTED) &&
-           (npr->prliType == PRLI_FCP_TYPE)) {
+       if (npr->prliType == PRLI_FCP_TYPE) {
                if (npr->initiatorFunc)
                        ndlp->nlp_type |= NLP_FCP_INITIATOR;
                if (npr->targetFunc)
@@ -525,185 +618,286 @@ lpfc_rcv_prli(struct lpfc_hba * phba,
                        roles |= FC_RPORT_ROLE_FCP_INITIATOR;
                if (ndlp->nlp_type & NLP_FCP_TARGET)
                        roles |= FC_RPORT_ROLE_FCP_TARGET;
+
+               lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_RPORT,
+                       "rport rolechg:   role:x%x did:x%x flg:x%x",
+                       roles, ndlp->nlp_DID, ndlp->nlp_flag);
+
                fc_remote_port_rolechg(rport, roles);
        }
 }
 
 static uint32_t
-lpfc_disc_set_adisc(struct lpfc_hba * phba,
-                     struct lpfc_nodelist * ndlp)
+lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 {
-       /* Check config parameter use-adisc or FCP-2 */
-       if ((phba->cfg_use_adisc == 0) &&
-               !(phba->fc_flag & FC_RSCN_MODE)) {
-               if (!(ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE))
-                       return (0);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       if (!(ndlp->nlp_flag & NLP_RPI_REGISTERED)) {
+               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+               return 0;
+       }
+
+       if (!(vport->fc_flag & FC_PT2PT)) {
+               /* Check config parameter use-adisc or FCP-2 */
+               if ((vport->cfg_use_adisc && (vport->fc_flag & FC_RSCN_MODE)) ||
+                   ((ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE) &&
+                    (ndlp->nlp_type & NLP_FCP_TARGET))) {
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag |= NLP_NPR_ADISC;
+                       spin_unlock_irq(shost->host_lock);
+                       return 1;
+               }
+       }
+       ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+       lpfc_unreg_rpi(vport, ndlp);
+       return 0;
+}
+/**
+ * lpfc_release_rpi - Release a RPI by issueing unreg_login mailbox cmd.
+ * @phba : Pointer to lpfc_hba structure.
+ * @vport: Pointer to lpfc_vport structure.
+ * @rpi  : rpi to be release.
+ *
+ * This function will send a unreg_login mailbox command to the firmware
+ * to release a rpi.
+ **/
+void
+lpfc_release_rpi(struct lpfc_hba *phba,
+               struct lpfc_vport *vport,
+               uint16_t rpi)
+{
+       LPFC_MBOXQ_t *pmb;
+       int rc;
+
+       pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool,
+                       GFP_KERNEL);
+       if (!pmb)
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
+                       "2796 mailbox memory allocation failed \n");
+       else {
+               lpfc_unreg_login(phba, vport->vpi, rpi, pmb);
+               pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+               rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
+               if (rc == MBX_NOT_FINISHED)
+                       mempool_free(pmb, phba->mbox_mem_pool);
        }
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag |= NLP_NPR_ADISC;
-       spin_unlock_irq(phba->host->host_lock);
-       return (1);
 }
 
 static uint32_t
-lpfc_disc_noop(struct lpfc_hba * phba,
-               struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_disc_illegal(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                 void *arg, uint32_t evt)
 {
-       /* This routine does nothing, just return the current state */
-       return (ndlp->nlp_state);
+       struct lpfc_hba *phba;
+       LPFC_MBOXQ_t *pmb = (LPFC_MBOXQ_t *) arg;
+       MAILBOX_t *mb;
+       uint16_t rpi;
+
+       phba = vport->phba;
+       /* Release the RPI if reglogin completing */
+       if (!(phba->pport->load_flag & FC_UNLOADING) &&
+               (evt == NLP_EVT_CMPL_REG_LOGIN) &&
+               (!pmb->u.mb.mbxStatus)) {
+               mb = &pmb->u.mb;
+               rpi = pmb->u.mb.un.varWords[0];
+               lpfc_release_rpi(phba, vport, rpi);
+       }
+       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                        "0271 Illegal State Transition: node x%x "
+                        "event x%x, state x%x Data: x%x x%x\n",
+                        ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
+                        ndlp->nlp_flag);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_disc_illegal(struct lpfc_hba * phba,
-                  struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_cmpl_plogi_illegal(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                 void *arg, uint32_t evt)
 {
-       lpfc_printf_log(phba,
-                       KERN_ERR,
-                       LOG_DISCOVERY,
-                       "%d:0253 Illegal State Transition: node x%x event x%x, "
-                       "state x%x Data: x%x x%x\n",
-                       phba->brd_no,
-                       ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
-                       ndlp->nlp_flag);
-       return (ndlp->nlp_state);
+       /* This transition is only legal if we previously
+        * rcv'ed a PLOGI. Since we don't want 2 discovery threads
+        * working on the same NPortID, do nothing for this thread
+        * to stop it.
+        */
+       if (!(ndlp->nlp_flag & NLP_RCV_PLOGI)) {
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                        "0272 Illegal State Transition: node x%x "
+                        "event x%x, state x%x Data: x%x x%x\n",
+                        ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
+                        ndlp->nlp_flag);
+       }
+       return ndlp->nlp_state;
 }
 
 /* Start of Discovery State Machine routines */
 
 static uint32_t
-lpfc_rcv_plogi_unused_node(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_plogi_unused_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
        struct lpfc_iocbq *cmdiocb;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
-       if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
-               ndlp->nlp_state = NLP_STE_UNUSED_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
-               return (ndlp->nlp_state);
+       if (lpfc_rcv_plogi(vport, ndlp, cmdiocb)) {
+               return ndlp->nlp_state;
        }
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
-lpfc_rcv_els_unused_node(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_els_unused_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       lpfc_issue_els_logo(phba, ndlp, 0);
-       lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
-       return (ndlp->nlp_state);
+       lpfc_issue_els_logo(vport, ndlp, 0);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_unused_node(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_logo_unused_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq     *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(shost->host_lock);
        ndlp->nlp_flag |= NLP_LOGO_ACC;
-       spin_unlock_irq(phba->host->host_lock);
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-       lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_logo_unused_node(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_cmpl_logo_unused_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
-lpfc_device_rm_unused_node(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_device_rm_unused_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
-lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
+lpfc_rcv_plogi_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                           void *arg, uint32_t evt)
 {
+       struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba   *phba = vport->phba;
        struct lpfc_iocbq *cmdiocb = arg;
-       struct lpfc_dmabuf *pcmd;
-       struct serv_parm *sp;
-       uint32_t *lp;
+       struct lpfc_dmabuf *pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
+       uint32_t *lp = (uint32_t *) pcmd->virt;
+       struct serv_parm *sp = (struct serv_parm *) (lp + 1);
        struct ls_rjt stat;
        int port_cmp;
 
-       pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
-       lp = (uint32_t *) pcmd->virt;
-       sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t));
-
        memset(&stat, 0, sizeof (struct ls_rjt));
 
        /* For a PLOGI, we only accept if our portname is less
         * than the remote portname.
         */
        phba->fc_stat.elsLogiCol++;
-       port_cmp = memcmp(&phba->fc_portname, &sp->portName,
-                         sizeof (struct lpfc_name));
+       port_cmp = memcmp(&vport->fc_portname, &sp->portName,
+                         sizeof(struct lpfc_name));
 
        if (port_cmp >= 0) {
                /* Reject this request because the remote node will accept
                   ours */
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS;
-               lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-       }
-       else {
-               lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       } /* if our portname was less */
+               lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp,
+                       NULL);
+       } else {
+               if (lpfc_rcv_plogi(vport, ndlp, cmdiocb) &&
+                   (ndlp->nlp_flag & NLP_NPR_2B_DISC) &&
+                   (vport->num_disc_nodes)) {
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+                       spin_unlock_irq(shost->host_lock);
+                       /* Check 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);
+                       }
+               }
+       } /* If our portname was less */
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prli_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq     *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
+       struct ls_rjt     stat;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       memset(&stat, 0, sizeof (struct ls_rjt));
+       stat.un.b.lsRjtRsnCode = LSRJT_LOGICAL_BSY;
+       stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
+       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp, NULL);
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_rcv_logo_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
+{
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
+
+                               /* software abort outstanding PLOGI */
+       lpfc_els_abort(vport->phba, ndlp);
+
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_rcv_els_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
+{
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba   *phba = vport->phba;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
        /* software abort outstanding PLOGI */
-       lpfc_els_abort(phba, ndlp, 1);
-       mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag |= NLP_DELAY_TMO;
-       spin_unlock_irq(phba->host->host_lock);
+       lpfc_els_abort(phba, ndlp);
 
        if (evt == NLP_EVT_RCV_LOGO) {
-               lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-       }
-       else {
-               lpfc_issue_els_logo(phba, ndlp, 0);
+               lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
+       } else {
+               lpfc_issue_els_logo(vport, ndlp, 0);
        }
 
-       /* Put ndlp in npr list set plogi timer for 1 sec */
-       ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+       /* Put ndlp in npr state set plogi timer for 1 sec */
+       mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag |= NLP_DELAY_TMO;
+       spin_unlock_irq(shost->host_lock);
+       ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
+       ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
+lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
+                           struct lpfc_nodelist *ndlp,
+                           void *arg,
                            uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb, *rspiocb;
-       struct lpfc_dmabuf *pcmd, *prsp;
+       struct lpfc_hba    *phba = vport->phba;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_iocbq  *cmdiocb, *rspiocb;
+       struct lpfc_dmabuf *pcmd, *prsp, *mp;
        uint32_t *lp;
        IOCB_t *irsp;
        struct serv_parm *sp;
@@ -713,7 +907,8 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
        rspiocb = cmdiocb->context_un.rsp_iocb;
 
        if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {
-               return (ndlp->nlp_state);
+               /* Recovery from PLOGI collision logic */
+               return ndlp->nlp_state;
        }
 
        irsp = &rspiocb->iocb;
@@ -723,31 +918,31 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
 
        pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;
 
-       prsp = list_get_first(&pcmd->list,
-                             struct lpfc_dmabuf,
-                             list);
-       lp = (uint32_t *) prsp->virt;
+       prsp = list_get_first(&pcmd->list, struct lpfc_dmabuf, list);
 
+       lp = (uint32_t *) prsp->virt;
        sp = (struct serv_parm *) ((uint8_t *) lp + sizeof (uint32_t));
-       if (!lpfc_check_sparm(phba, ndlp, sp, CLASS3))
-               goto out;
 
+       /* Some switches have FDMI servers returning 0 for WWN */
+       if ((ndlp->nlp_DID != FDMI_DID) &&
+               (wwn_to_u64(sp->portName.u.wwn) == 0 ||
+               wwn_to_u64(sp->nodeName.u.wwn) == 0)) {
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0142 PLOGI RSP: Invalid WWN.\n");
+               goto out;
+       }
+       if (!lpfc_check_sparm(vport, ndlp, sp, CLASS3, 0))
+               goto out;
        /* PLOGI chkparm OK */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_ELS,
-                       "%d:0121 PLOGI chkparm OK "
-                       "Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       ndlp->nlp_DID, ndlp->nlp_state,
-                       ndlp->nlp_flag, ndlp->nlp_rpi);
-
-       if ((phba->cfg_fcp_class == 2) &&
-           (sp->cls2.classValid)) {
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
+                        "0121 PLOGI chkparm OK Data: x%x x%x x%x x%x\n",
+                        ndlp->nlp_DID, ndlp->nlp_state,
+                        ndlp->nlp_flag, ndlp->nlp_rpi);
+       if (vport->cfg_fcp_class == 2 && (sp->cls2.classValid))
                ndlp->nlp_fcp_info |= CLASS2;
-       } else {
+       else
                ndlp->nlp_fcp_info |= CLASS3;
-       }
+
        ndlp->nlp_class_sup = 0;
        if (sp->cls1.classValid)
                ndlp->nlp_class_sup |= FC_COS_CLASS1;
@@ -758,171 +953,247 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
        if (sp->cls4.classValid)
                ndlp->nlp_class_sup |= FC_COS_CLASS4;
        ndlp->nlp_maxframe =
-               ((sp->cmn.bbRcvSizeMsb & 0x0F) << 8) |
-               sp->cmn.bbRcvSizeLsb;
+               ((sp->cmn.bbRcvSizeMsb & 0x0F) << 8) | sp->cmn.bbRcvSizeLsb;
 
-       if (!(mbox = mempool_alloc(phba->mbox_mem_pool,
-                                  GFP_KERNEL)))
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!mbox) {
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                       "0133 PLOGI: no memory for reg_login "
+                       "Data: x%x x%x x%x x%x\n",
+                       ndlp->nlp_DID, ndlp->nlp_state,
+                       ndlp->nlp_flag, ndlp->nlp_rpi);
                goto out;
+       }
 
-       lpfc_unreg_rpi(phba, ndlp);
-       if (lpfc_reg_login
-           (phba, irsp->un.elsreq64.remoteID,
-            (uint8_t *) sp, mbox, 0) == 0) {
-               /* set_slim mailbox command needs to
-                * execute first, queue this command to
-                * be processed later.
-                */
-               switch(ndlp->nlp_DID) {
+       lpfc_unreg_rpi(vport, ndlp);
+
+       if (lpfc_reg_rpi(phba, vport->vpi, irsp->un.elsreq64.remoteID,
+                        (uint8_t *) sp, mbox, ndlp->nlp_rpi) == 0) {
+               switch (ndlp->nlp_DID) {
                case NameServer_DID:
-                       mbox->mbox_cmpl =
-                               lpfc_mbx_cmpl_ns_reg_login;
+                       mbox->mbox_cmpl = lpfc_mbx_cmpl_ns_reg_login;
                        break;
                case FDMI_DID:
-                       mbox->mbox_cmpl =
-                               lpfc_mbx_cmpl_fdmi_reg_login;
+                       mbox->mbox_cmpl = lpfc_mbx_cmpl_fdmi_reg_login;
                        break;
                default:
-                       mbox->mbox_cmpl =
-                               lpfc_mbx_cmpl_reg_login;
+                       ndlp->nlp_flag |= NLP_REG_LOGIN_SEND;
+                       mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;
                }
-               mbox->context2 = ndlp;
-               if (lpfc_sli_issue_mbox(phba, mbox,
-                                       (MBX_NOWAIT | MBX_STOP_IOCB))
+               mbox->context2 = lpfc_nlp_get(ndlp);
+               mbox->vport = vport;
+               if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)
                    != MBX_NOT_FINISHED) {
-                       ndlp->nlp_state =
-                               NLP_STE_REG_LOGIN_ISSUE;
-                       lpfc_nlp_list(phba, ndlp,
-                                     NLP_REGLOGIN_LIST);
-                       return (ndlp->nlp_state);
+                       lpfc_nlp_set_state(vport, ndlp,
+                                          NLP_STE_REG_LOGIN_ISSUE);
+                       return ndlp->nlp_state;
                }
+               if (ndlp->nlp_flag & NLP_REG_LOGIN_SEND)
+                       ndlp->nlp_flag &= ~NLP_REG_LOGIN_SEND;
+               /* decrement node reference count to the failed mbox
+                * command
+                */
+               lpfc_nlp_put(ndlp);
+               mp = (struct lpfc_dmabuf *) mbox->context1;
+               lpfc_mbuf_free(phba, mp->virt, mp->phys);
+               kfree(mp);
                mempool_free(mbox, phba->mbox_mem_pool);
+
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0134 PLOGI: cannot issue reg_login "
+                                "Data: x%x x%x x%x x%x\n",
+                                ndlp->nlp_DID, ndlp->nlp_state,
+                                ndlp->nlp_flag, ndlp->nlp_rpi);
        } else {
                mempool_free(mbox, phba->mbox_mem_pool);
+
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0135 PLOGI: cannot format reg_login "
+                                "Data: x%x x%x x%x x%x\n",
+                                ndlp->nlp_DID, ndlp->nlp_state,
+                                ndlp->nlp_flag, ndlp->nlp_rpi);
        }
 
 
- out:
-       /* Free this node since the driver cannot login or has the wrong
-          sparm */
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+out:
+       if (ndlp->nlp_DID == NameServer_DID) {
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0261 Cannot Register NameServer login\n");
+       }
+
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag |= NLP_DEFER_RM;
+       spin_unlock_irq(shost->host_lock);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
-lpfc_device_rm_plogi_issue(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_cmpl_logo_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       /* software abort outstanding PLOGI */
-       lpfc_els_abort(phba, ndlp, 1);
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_reglogin_plogi_issue(struct lpfc_vport *vport,
+       struct lpfc_nodelist *ndlp, void *arg, uint32_t evt)
+{
+       struct lpfc_hba *phba;
+       LPFC_MBOXQ_t *pmb = (LPFC_MBOXQ_t *) arg;
+       MAILBOX_t *mb = &pmb->u.mb;
+       uint16_t rpi;
+
+       phba = vport->phba;
+       /* Release the RPI */
+       if (!(phba->pport->load_flag & FC_UNLOADING) &&
+               !mb->mbxStatus) {
+               rpi = pmb->u.mb.un.varWords[0];
+               lpfc_release_rpi(phba, vport, rpi);
+       }
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_device_rm_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_NODEV_REMOVE;
+               spin_unlock_irq(shost->host_lock);
+               return ndlp->nlp_state;
+       } else {
+               /* software abort outstanding PLOGI */
+               lpfc_els_abort(vport->phba, ndlp);
 
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+               lpfc_drop_node(vport, ndlp);
+               return NLP_STE_FREED_NODE;
+       }
 }
 
 static uint32_t
-lpfc_device_recov_plogi_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_device_recov_plogi_issue(struct lpfc_vport *vport,
+                             struct lpfc_nodelist *ndlp,
+                             void *arg,
+                             uint32_t evt)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
+
+       /* Don't do anything that will mess up processing of the
+        * previous RSCN.
+        */
+       if (vport->fc_flag & FC_RSCN_DEFERRED)
+               return ndlp->nlp_state;
+
        /* software abort outstanding PLOGI */
-       lpfc_els_abort(phba, ndlp, 1);
+       lpfc_els_abort(phba, ndlp);
 
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
+       ndlp->nlp_prev_state = NLP_STE_PLOGI_ISSUE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_plogi_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_plogi_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
+       struct Scsi_Host   *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba   *phba = vport->phba;
        struct lpfc_iocbq *cmdiocb;
 
        /* software abort outstanding ADISC */
-       lpfc_els_abort(phba, ndlp, 1);
+       lpfc_els_abort(phba, ndlp);
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
-       if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
-               return (ndlp->nlp_state);
+       if (lpfc_rcv_plogi(vport, ndlp, cmdiocb)) {
+               if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+                       spin_unlock_irq(shost->host_lock);
+                       if (vport->num_disc_nodes)
+                               lpfc_more_adisc(vport);
+               }
+               return ndlp->nlp_state;
        }
-       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 = NLP_STE_ADISC_ISSUE;
+       lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prli_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_prli_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_logo_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
+       struct lpfc_hba *phba = vport->phba;
        struct lpfc_iocbq *cmdiocb;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        /* software abort outstanding ADISC */
-       lpfc_els_abort(phba, ndlp, 0);
+       lpfc_els_abort(phba, ndlp);
 
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_padisc_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_padisc_adisc_issue(struct lpfc_vport *vport,
+                           struct lpfc_nodelist *ndlp,
+                           void *arg, uint32_t evt)
 {
        struct lpfc_iocbq *cmdiocb;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_padisc(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prlo_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_prlo_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
        struct lpfc_iocbq *cmdiocb;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        /* Treat like rcv logo */
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_PRLO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport,
+                           struct lpfc_nodelist *ndlp,
+                           void *arg, uint32_t evt)
 {
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba   *phba = vport->phba;
        struct lpfc_iocbq *cmdiocb, *rspiocb;
        IOCB_t *irsp;
        ADISC *ap;
+       int rc;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
        rspiocb = cmdiocb->context_un.rsp_iocb;
@@ -931,249 +1202,324 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
        irsp = &rspiocb->iocb;
 
        if ((irsp->ulpStatus) ||
-               (!lpfc_check_adisc(phba, ndlp, &ap->nodeName, &ap->portName))) {
-               ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
+           (!lpfc_check_adisc(vport, ndlp, &ap->nodeName, &ap->portName))) {
                /* 1 sec timeout */
                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
-               spin_lock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag |= NLP_DELAY_TMO;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
+               ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
+
+               memset(&ndlp->nlp_nodename, 0, sizeof(struct lpfc_name));
+               memset(&ndlp->nlp_portname, 0, sizeof(struct lpfc_name));
 
-               memset(&ndlp->nlp_nodename, 0, sizeof (struct lpfc_name));
-               memset(&ndlp->nlp_portname, 0, sizeof (struct lpfc_name));
+               ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+               lpfc_unreg_rpi(vport, ndlp);
+               return ndlp->nlp_state;
+       }
 
-               ndlp->nlp_state = NLP_STE_NPR_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-               lpfc_unreg_rpi(phba, ndlp);
-               return (ndlp->nlp_state);
+       if (phba->sli_rev == LPFC_SLI_REV4) {
+               rc = lpfc_sli4_resume_rpi(ndlp);
+               if (rc) {
+                       /* Stay in state and retry. */
+                       ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
+                       return ndlp->nlp_state;
+               }
        }
+
        if (ndlp->nlp_type & NLP_FCP_TARGET) {
-               ndlp->nlp_state = NLP_STE_MAPPED_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
+               ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_MAPPED_NODE);
        } else {
-               ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+               ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
        }
-       return (ndlp->nlp_state);
+
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_device_rm_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_device_rm_adisc_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       /* software abort outstanding ADISC */
-       lpfc_els_abort(phba, ndlp, 1);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
 
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_NODEV_REMOVE;
+               spin_unlock_irq(shost->host_lock);
+               return ndlp->nlp_state;
+       } else {
+               /* software abort outstanding ADISC */
+               lpfc_els_abort(vport->phba, ndlp);
+
+               lpfc_drop_node(vport, ndlp);
+               return NLP_STE_FREED_NODE;
+       }
 }
 
 static uint32_t
-lpfc_device_recov_adisc_issue(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_device_recov_adisc_issue(struct lpfc_vport *vport,
+                             struct lpfc_nodelist *ndlp,
+                             void *arg,
+                             uint32_t evt)
 {
-       /* software abort outstanding ADISC */
-       lpfc_els_abort(phba, ndlp, 1);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
 
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
+       /* Don't do anything that will mess up processing of the
+        * previous RSCN.
+        */
+       if (vport->fc_flag & FC_RSCN_DEFERRED)
+               return ndlp->nlp_state;
 
-       lpfc_disc_set_adisc(phba, ndlp);
-       return (ndlp->nlp_state);
+       /* software abort outstanding ADISC */
+       lpfc_els_abort(phba, ndlp);
+
+       ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_disc_set_adisc(vport, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_plogi_reglogin_issue(struct lpfc_hba * phba,
-                             struct lpfc_nodelist * ndlp, void *arg,
+lpfc_rcv_plogi_reglogin_issue(struct lpfc_vport *vport,
+                             struct lpfc_nodelist *ndlp,
+                             void *arg,
                              uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_plogi(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prli_reglogin_issue(struct lpfc_hba * phba,
-                            struct lpfc_nodelist * ndlp, void *arg,
+lpfc_rcv_prli_reglogin_issue(struct lpfc_vport *vport,
+                            struct lpfc_nodelist *ndlp,
+                            void *arg,
                             uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_reglogin_issue(struct lpfc_hba * phba,
-                            struct lpfc_nodelist * ndlp, void *arg,
+lpfc_rcv_logo_reglogin_issue(struct lpfc_vport *vport,
+                            struct lpfc_nodelist *ndlp,
+                            void *arg,
                             uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_hba   *phba = vport->phba;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
+       LPFC_MBOXQ_t      *mb;
+       LPFC_MBOXQ_t      *nextmb;
+       struct lpfc_dmabuf *mp;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       /* cleanup any ndlp on mbox q waiting for reglogin cmpl */
+       if ((mb = phba->sli.mbox_active)) {
+               if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&
+                  (ndlp == (struct lpfc_nodelist *) mb->context2)) {
+                       lpfc_nlp_put(ndlp);
+                       mb->context2 = NULL;
+                       mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+               }
+       }
+
+       spin_lock_irq(&phba->hbalock);
+       list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {
+               if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&
+                  (ndlp == (struct lpfc_nodelist *) mb->context2)) {
+                       mp = (struct lpfc_dmabuf *) (mb->context1);
+                       if (mp) {
+                               __lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                               kfree(mp);
+                       }
+                       lpfc_nlp_put(ndlp);
+                       list_del(&mb->list);
+                       phba->sli.mboxq_cnt--;
+                       mempool_free(mb, phba->mbox_mem_pool);
+               }
+       }
+       spin_unlock_irq(&phba->hbalock);
+
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_padisc_reglogin_issue(struct lpfc_hba * phba,
-                              struct lpfc_nodelist * ndlp, void *arg,
+lpfc_rcv_padisc_reglogin_issue(struct lpfc_vport *vport,
+                              struct lpfc_nodelist *ndlp,
+                              void *arg,
                               uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_padisc(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prlo_reglogin_issue(struct lpfc_hba * phba,
-                            struct lpfc_nodelist * ndlp, void *arg,
+lpfc_rcv_prlo_reglogin_issue(struct lpfc_vport *vport,
+                            struct lpfc_nodelist *ndlp,
+                            void *arg,
                             uint32_t evt)
 {
        struct lpfc_iocbq *cmdiocb;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
-                                 struct lpfc_nodelist * ndlp,
-                                 void *arg, uint32_t evt)
+lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
+                                 struct lpfc_nodelist *ndlp,
+                                 void *arg,
+                                 uint32_t evt)
 {
-       LPFC_MBOXQ_t *pmb;
-       MAILBOX_t *mb;
-       uint32_t did;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       LPFC_MBOXQ_t *pmb = (LPFC_MBOXQ_t *) arg;
+       MAILBOX_t *mb = &pmb->u.mb;
+       uint32_t did  = mb->un.varWords[1];
 
-       pmb = (LPFC_MBOXQ_t *) arg;
-       mb = &pmb->mb;
-       did = mb->un.varWords[1];
        if (mb->mbxStatus) {
                /* RegLogin failed */
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_DISCOVERY,
-                               "%d:0246 RegLogin failed Data: x%x x%x x%x\n",
-                               phba->brd_no,
-                               did, mb->mbxStatus, phba->hba_state);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                               "0246 RegLogin failed Data: x%x x%x x%x\n",
+                               did, mb->mbxStatus, vport->port_state);
+               /*
+                * If RegLogin failed due to lack of HBA resources do not
+                * retry discovery.
+                */
+               if (mb->mbxStatus == MBXERR_RPI_FULL) {
+                       ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+                       return ndlp->nlp_state;
+               }
 
+               /* Put ndlp in npr state set plogi timer for 1 sec */
                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
-               spin_lock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag |= NLP_DELAY_TMO;
-               spin_unlock_irq(phba->host->host_lock);
-
-               lpfc_issue_els_logo(phba, ndlp, 0);
-               /* Put ndlp in npr list set plogi timer for 1 sec */
-               ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
-               ndlp->nlp_state = NLP_STE_NPR_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-               return (ndlp->nlp_state);
-       }
+               spin_unlock_irq(shost->host_lock);
+               ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
 
-       if (ndlp->nlp_rpi != 0)
-               lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
+               lpfc_issue_els_logo(vport, ndlp, 0);
+               ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+               return ndlp->nlp_state;
+       }
 
        ndlp->nlp_rpi = mb->un.varWords[0];
-       lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
+       ndlp->nlp_flag |= NLP_RPI_REGISTERED;
 
        /* Only if we are not a fabric nport do we issue PRLI */
        if (!(ndlp->nlp_type & NLP_FABRIC)) {
-               ndlp->nlp_state = NLP_STE_PRLI_ISSUE;
-               lpfc_nlp_list(phba, ndlp, NLP_PRLI_LIST);
-               lpfc_issue_els_prli(phba, ndlp, 0);
+               ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_PRLI_ISSUE);
+               lpfc_issue_els_prli(vport, ndlp, 0);
        } else {
-               ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
+               ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_device_rm_reglogin_issue(struct lpfc_hba * phba,
-                             struct lpfc_nodelist * ndlp, void *arg,
+lpfc_device_rm_reglogin_issue(struct lpfc_vport *vport,
+                             struct lpfc_nodelist *ndlp,
+                             void *arg,
                              uint32_t evt)
 {
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_NODEV_REMOVE;
+               spin_unlock_irq(shost->host_lock);
+               return ndlp->nlp_state;
+       } else {
+               lpfc_drop_node(vport, ndlp);
+               return NLP_STE_FREED_NODE;
+       }
 }
 
 static uint32_t
-lpfc_device_recov_reglogin_issue(struct lpfc_hba * phba,
-                              struct lpfc_nodelist * ndlp, void *arg,
-                              uint32_t evt)
+lpfc_device_recov_reglogin_issue(struct lpfc_vport *vport,
+                                struct lpfc_nodelist *ndlp,
+                                void *arg,
+                                uint32_t evt)
 {
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
-       return (ndlp->nlp_state);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       /* Don't do anything that will mess up processing of the
+        * previous RSCN.
+        */
+       if (vport->fc_flag & FC_RSCN_DEFERRED)
+               return ndlp->nlp_state;
+
+       ndlp->nlp_prev_state = NLP_STE_REG_LOGIN_ISSUE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag |= NLP_IGNR_REG_CMPL;
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_disc_set_adisc(vport, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_plogi_prli_issue(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_plogi_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
        struct lpfc_iocbq *cmdiocb;
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_plogi(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prli_prli_issue(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_prli_issue(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_logo_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
        /* Software abort outstanding PRLI before sending acc */
-       lpfc_els_abort(phba, ndlp, 1);
+       lpfc_els_abort(vport->phba, ndlp);
 
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_padisc_prli_issue(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_padisc_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_padisc(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 /* This routine is envoked when we rcv a PRLO request from a nport
@@ -1182,21 +1528,22 @@ lpfc_rcv_padisc_prli_issue(struct lpfc_hba * phba,
  * NEXT STATE = PRLI_ISSUE
  */
 static uint32_t
-lpfc_rcv_prlo_prli_issue(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prlo_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_cmpl_prli_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
        struct lpfc_iocbq *cmdiocb, *rspiocb;
+       struct lpfc_hba   *phba = vport->phba;
        IOCB_t *irsp;
        PRLI *npr;
 
@@ -1206,9 +1553,13 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
 
        irsp = &rspiocb->iocb;
        if (irsp->ulpStatus) {
-               ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
-               lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
-               return (ndlp->nlp_state);
+               if ((vport->port_type == LPFC_NPIV_PORT) &&
+                   vport->cfg_restrict_login) {
+                       goto out;
+               }
+               ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
+               return ndlp->nlp_state;
        }
 
        /* Check out PRLI rsp */
@@ -1223,403 +1574,496 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
                if (npr->Retry)
                        ndlp->nlp_fcp_info |= NLP_FCP_2_DEVICE;
        }
+       if (!(ndlp->nlp_type & NLP_FCP_TARGET) &&
+           (vport->port_type == LPFC_NPIV_PORT) &&
+            vport->cfg_restrict_login) {
+out:
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_TARGET_REMOVE;
+               spin_unlock_irq(shost->host_lock);
+               lpfc_issue_els_logo(vport, ndlp, 0);
+
+               ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+               return ndlp->nlp_state;
+       }
 
-       ndlp->nlp_state = NLP_STE_MAPPED_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
-       return (ndlp->nlp_state);
+       ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
+       if (ndlp->nlp_type & NLP_FCP_TARGET)
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_MAPPED_NODE);
+       else
+               lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
+       return ndlp->nlp_state;
 }
 
 /*! lpfc_device_rm_prli_issue
-  *
-  * \pre
-  * \post
-  * \param   phba
-  * \param   ndlp
-  * \param   arg
-  * \param   evt
-  * \return  uint32_t
-  *
-  * \b Description:
-  *    This routine is envoked when we a request to remove a nport we are in the
-  *    process of PRLIing. We should software abort outstanding prli, unreg
-  *    login, send a logout. We will change node state to UNUSED_NODE, put it
-  *    on plogi list so it can be freed when LOGO completes.
-  *
-  */
-static uint32_t
-lpfc_device_rm_prli_issue(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+ *
+ * \pre
+ * \post
+ * \param   phba
+ * \param   ndlp
+ * \param   arg
+ * \param   evt
+ * \return  uint32_t
+ *
+ * \b Description:
+ *    This routine is envoked when we a request to remove a nport we are in the
+ *    process of PRLIing. We should software abort outstanding prli, unreg
+ *    login, send a logout. We will change node state to UNUSED_NODE, put it
+ *    on plogi list so it can be freed when LOGO completes.
+ *
+ */
+
+static uint32_t
+lpfc_device_rm_prli_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       /* software abort outstanding PRLI */
-       lpfc_els_abort(phba, ndlp, 1);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_NODEV_REMOVE;
+               spin_unlock_irq(shost->host_lock);
+               return ndlp->nlp_state;
+       } else {
+               /* software abort outstanding PLOGI */
+               lpfc_els_abort(vport->phba, ndlp);
 
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+               lpfc_drop_node(vport, ndlp);
+               return NLP_STE_FREED_NODE;
+       }
 }
 
 
 /*! lpfc_device_recov_prli_issue
-  *
-  * \pre
-  * \post
-  * \param   phba
-  * \param   ndlp
-  * \param   arg
-  * \param   evt
-  * \return  uint32_t
-  *
-  * \b Description:
-  *    The routine is envoked when the state of a device is unknown, like
-  *    during a link down. We should remove the nodelist entry from the
-  *    unmapped list, issue a UNREG_LOGIN, do a software abort of the
-  *    outstanding PRLI command, then free the node entry.
-  */
-static uint32_t
-lpfc_device_recov_prli_issue(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+ *
+ * \pre
+ * \post
+ * \param   phba
+ * \param   ndlp
+ * \param   arg
+ * \param   evt
+ * \return  uint32_t
+ *
+ * \b Description:
+ *    The routine is envoked when the state of a device is unknown, like
+ *    during a link down. We should remove the nodelist entry from the
+ *    unmapped list, issue a UNREG_LOGIN, do a software abort of the
+ *    outstanding PRLI command, then free the node entry.
+ */
+static uint32_t
+lpfc_device_recov_prli_issue(struct lpfc_vport *vport,
+                            struct lpfc_nodelist *ndlp,
+                            void *arg,
+                            uint32_t evt)
 {
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
+
+       /* Don't do anything that will mess up processing of the
+        * previous RSCN.
+        */
+       if (vport->fc_flag & FC_RSCN_DEFERRED)
+               return ndlp->nlp_state;
+
        /* software abort outstanding PRLI */
-       lpfc_els_abort(phba, ndlp, 1);
+       lpfc_els_abort(phba, ndlp);
 
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
-       return (ndlp->nlp_state);
+       ndlp->nlp_prev_state = NLP_STE_PRLI_ISSUE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_disc_set_adisc(vport, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_plogi_unmap_node(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_plogi_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_plogi(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prli_unmap_node(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prli_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_rcv_prli(phba, ndlp, cmdiocb);
-       lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       lpfc_rcv_prli(vport, ndlp, cmdiocb);
+       lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_unmap_node(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_logo_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_padisc_unmap_node(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_padisc_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_padisc(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prlo_unmap_node(struct lpfc_hba * phba,
-                        struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prlo_unmap_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       /* Treat like rcv logo */
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_device_recov_unmap_node(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_device_recov_unmap_node(struct lpfc_vport *vport,
+                            struct lpfc_nodelist *ndlp,
+                            void *arg,
+                            uint32_t evt)
 {
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       lpfc_disc_set_adisc(phba, ndlp);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       ndlp->nlp_prev_state = NLP_STE_UNMAPPED_NODE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_disc_set_adisc(vport, ndlp);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_plogi_mapped_node(struct lpfc_hba * phba,
-                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_plogi_mapped_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_plogi(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prli_mapped_node(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prli_mapped_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_prli_acc(vport, cmdiocb, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_mapped_node(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_logo_mapped_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_padisc_mapped_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_padisc_mapped_node(struct lpfc_vport *vport,
+                           struct lpfc_nodelist *ndlp,
+                           void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_padisc(vport, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prlo_mapped_node(struct lpfc_hba * phba,
-                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_rcv_prlo_mapped_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                         void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
        /* flush the target */
-       spin_lock_irq(phba->host->host_lock);
-       lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring],
-                              ndlp->nlp_sid, 0, 0, LPFC_CTX_TGT);
-       spin_unlock_irq(phba->host->host_lock);
+       lpfc_sli_abort_iocb(vport, &phba->sli.ring[phba->sli.fcp_ring],
+                           ndlp->nlp_sid, 0, LPFC_CTX_TGT);
 
        /* Treat like rcv logo */
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_PRLO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_device_recov_mapped_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_device_recov_mapped_node(struct lpfc_vport *vport,
+                             struct lpfc_nodelist *ndlp,
+                             void *arg,
+                             uint32_t evt)
 {
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
-       lpfc_disc_set_adisc(phba, ndlp);
-       return (ndlp->nlp_state);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       ndlp->nlp_prev_state = NLP_STE_MAPPED_NODE;
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
+       lpfc_disc_set_adisc(vport, ndlp);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_plogi_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                       void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_iocbq *cmdiocb  = (struct lpfc_iocbq *) arg;
 
        /* Ignore PLOGI if we have an outstanding LOGO */
-       if (ndlp->nlp_flag & NLP_LOGO_SND) {
-               return (ndlp->nlp_state);
-       }
-
-       if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
-               spin_lock_irq(phba->host->host_lock);
+       if (ndlp->nlp_flag & (NLP_LOGO_SND | NLP_LOGO_ACC))
+               return ndlp->nlp_state;
+       if (lpfc_rcv_plogi(vport, ndlp, cmdiocb)) {
+               lpfc_cancel_retry_delay_tmo(vport, ndlp);
+               spin_lock_irq(shost->host_lock);
                ndlp->nlp_flag &= ~(NLP_NPR_ADISC | NLP_NPR_2B_DISC);
-               spin_unlock_irq(phba->host->host_lock);
-               return (ndlp->nlp_state);
-       }
-
-       /* send PLOGI immediately, move to PLOGI issue state */
-       if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
-                       ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-                       lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-                       lpfc_issue_els_plogi(phba, ndlp, 0);
+               spin_unlock_irq(shost->host_lock);
+       } else if (!(ndlp->nlp_flag & NLP_NPR_2B_DISC)) {
+               /* send PLOGI immediately, move to PLOGI issue state */
+               if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
+                       ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
+                       lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
+               }
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prli_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_prli_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                      void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq     *cmdiocb;
-       struct ls_rjt          stat;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
+       struct ls_rjt     stat;
 
        memset(&stat, 0, sizeof (struct ls_rjt));
        stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
        stat.un.b.lsRjtRsnCodeExp = LSEXP_NOTHING_MORE;
-       lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
+       lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp, NULL);
 
        if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
                if (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);
+                       spin_lock_irq(shost->host_lock);
+                       ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                       ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
+                       spin_unlock_irq(shost->host_lock);
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_ADISC_ISSUE);
+                       lpfc_issue_els_adisc(vport, ndlp, 0);
                } else {
-                       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 = NLP_STE_NPR_NODE;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
+                       lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
                }
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_logo_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_logo_npr_node(struct lpfc_vport *vport,  struct lpfc_nodelist *ndlp,
+                      void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq     *cmdiocb;
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_rcv_logo(vport, ndlp, cmdiocb, ELS_CMD_LOGO);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_padisc_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq     *cmdiocb;
-
-       cmdiocb = (struct lpfc_iocbq *) arg;
-
-       lpfc_rcv_padisc(phba, ndlp, cmdiocb);
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
+       lpfc_rcv_padisc(vport, ndlp, cmdiocb);
+       /*
+        * Do not start discovery if discovery is about to start
+        * or discovery in progress for this node. Starting discovery
+        * here will affect the counting of discovery threads.
+        */
+       if (!(ndlp->nlp_flag & NLP_DELAY_TMO) &&
+           !(ndlp->nlp_flag & NLP_NPR_2B_DISC)) {
                if (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);
+                       ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                       ndlp->nlp_prev_state = NLP_STE_NPR_NODE;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_ADISC_ISSUE);
+                       lpfc_issue_els_adisc(vport, ndlp, 0);
                } else {
-                       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 = NLP_STE_NPR_NODE;
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
+                       lpfc_issue_els_plogi(vport, ndlp->nlp_DID, 0);
                }
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_rcv_prlo_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_rcv_prlo_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                      void *arg, uint32_t evt)
 {
-       struct lpfc_iocbq     *cmdiocb;
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;
 
-       cmdiocb = (struct lpfc_iocbq *) arg;
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag |= NLP_LOGO_ACC;
+       spin_unlock_irq(shost->host_lock);
 
-       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
+       lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
 
-       if (ndlp->nlp_flag & NLP_DELAY_TMO) {
-               if (ndlp->nlp_last_elscmd == (unsigned long)ELS_CMD_PLOGI) {
-                       return (ndlp->nlp_state);
-               } else {
-                       spin_lock_irq(phba->host->host_lock);
-                       ndlp->nlp_flag &= ~NLP_DELAY_TMO;
-                       spin_unlock_irq(phba->host->host_lock);
-                       del_timer_sync(&ndlp->nlp_delayfunc);
-                       if (!list_empty(&ndlp->els_retry_evt.evt_listp))
-                               list_del_init(&ndlp->els_retry_evt.evt_listp);
-               }
+       if ((ndlp->nlp_flag & NLP_DELAY_TMO) == 0) {
+               mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_DELAY_TMO;
+               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+               spin_unlock_irq(shost->host_lock);
+               ndlp->nlp_last_elscmd = ELS_CMD_PLOGI;
+       } else {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+               spin_unlock_irq(shost->host_lock);
        }
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_plogi_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
+{
+       struct lpfc_iocbq *cmdiocb, *rspiocb;
+       IOCB_t *irsp;
+
+       cmdiocb = (struct lpfc_iocbq *) arg;
+       rspiocb = cmdiocb->context_un.rsp_iocb;
 
-       ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-       lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-       lpfc_issue_els_plogi(phba, ndlp, 0);
-       return (ndlp->nlp_state);
+       irsp = &rspiocb->iocb;
+       if (irsp->ulpStatus) {
+               ndlp->nlp_flag |= NLP_DEFER_RM;
+               return NLP_STE_FREED_NODE;
+       }
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_logo_npr_node(struct lpfc_hba * phba,
-               struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_cmpl_prli_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                       void *arg, uint32_t evt)
 {
-       lpfc_unreg_rpi(phba, ndlp);
-       /* This routine does nothing, just return the current state */
-       return (ndlp->nlp_state);
+       struct lpfc_iocbq *cmdiocb, *rspiocb;
+       IOCB_t *irsp;
+
+       cmdiocb = (struct lpfc_iocbq *) arg;
+       rspiocb = cmdiocb->context_un.rsp_iocb;
+
+       irsp = &rspiocb->iocb;
+       if (irsp->ulpStatus && (ndlp->nlp_flag & NLP_NODEV_REMOVE)) {
+               lpfc_drop_node(vport, ndlp);
+               return NLP_STE_FREED_NODE;
+       }
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_cmpl_reglogin_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_cmpl_logo_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                       void *arg, uint32_t evt)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       if (ndlp->nlp_DID == Fabric_DID) {
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+               spin_unlock_irq(shost->host_lock);
+       }
+       lpfc_unreg_rpi(vport, ndlp);
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_adisc_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                        void *arg, uint32_t evt)
 {
-       LPFC_MBOXQ_t *pmb;
-       MAILBOX_t *mb;
+       struct lpfc_iocbq *cmdiocb, *rspiocb;
+       IOCB_t *irsp;
 
-       pmb = (LPFC_MBOXQ_t *) arg;
-       mb = &pmb->mb;
+       cmdiocb = (struct lpfc_iocbq *) arg;
+       rspiocb = cmdiocb->context_un.rsp_iocb;
 
-       /* save rpi */
-       if (ndlp->nlp_rpi != 0)
-               lpfc_findnode_remove_rpi(phba, ndlp->nlp_rpi);
+       irsp = &rspiocb->iocb;
+       if (irsp->ulpStatus && (ndlp->nlp_flag & NLP_NODEV_REMOVE)) {
+               lpfc_drop_node(vport, ndlp);
+               return NLP_STE_FREED_NODE;
+       }
+       return ndlp->nlp_state;
+}
 
-       ndlp->nlp_rpi = mb->un.varWords[0];
-       lpfc_addnode_rpi(phba, ndlp, ndlp->nlp_rpi);
+static uint32_t
+lpfc_cmpl_reglogin_npr_node(struct lpfc_vport *vport,
+                           struct lpfc_nodelist *ndlp,
+                           void *arg, uint32_t evt)
+{
+       LPFC_MBOXQ_t *pmb = (LPFC_MBOXQ_t *) arg;
+       MAILBOX_t    *mb = &pmb->u.mb;
 
-       return (ndlp->nlp_state);
+       if (!mb->mbxStatus) {
+               ndlp->nlp_rpi = mb->un.varWords[0];
+               ndlp->nlp_flag |= NLP_RPI_REGISTERED;
+       } else {
+               if (ndlp->nlp_flag & NLP_NODEV_REMOVE) {
+                       lpfc_drop_node(vport, ndlp);
+                       return NLP_STE_FREED_NODE;
+               }
+       }
+       return ndlp->nlp_state;
 }
 
 static uint32_t
-lpfc_device_rm_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_device_rm_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                       void *arg, uint32_t evt)
 {
-       lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       if (ndlp->nlp_flag & NLP_NPR_2B_DISC) {
+               spin_lock_irq(shost->host_lock);
+               ndlp->nlp_flag |= NLP_NODEV_REMOVE;
+               spin_unlock_irq(shost->host_lock);
+               return ndlp->nlp_state;
+       }
+       lpfc_drop_node(vport, ndlp);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
-lpfc_device_recov_npr_node(struct lpfc_hba * phba,
-                           struct lpfc_nodelist * ndlp, void *arg,
-                           uint32_t evt)
+lpfc_device_recov_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                          void *arg, uint32_t evt)
 {
-       spin_lock_irq(phba->host->host_lock);
-       ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
-       spin_unlock_irq(phba->host->host_lock);
-       return (ndlp->nlp_state);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       /* Don't do anything that will mess up processing of the
+        * previous RSCN.
+        */
+       if (vport->fc_flag & FC_RSCN_DEFERRED)
+               return ndlp->nlp_state;
+
+       lpfc_cancel_retry_delay_tmo(vport, ndlp);
+       spin_lock_irq(shost->host_lock);
+       ndlp->nlp_flag &= ~(NLP_NODEV_REMOVE | NLP_NPR_2B_DISC);
+       spin_unlock_irq(shost->host_lock);
+       return ndlp->nlp_state;
 }
 
 
@@ -1655,7 +2099,7 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba,
  */
 /*
  * For a Link Down, all nodes on the ADISC, PLOGI, unmapped or mapped
- * lists will receive a DEVICE_RECOVERY event. If the linkdown or nodev timers
+ * lists will receive a DEVICE_RECOVERY event. If the linkdown or devloss timers
  * expire, all effected nodes will receive a DEVICE_RM event.
  */
 /*
@@ -1680,7 +2124,7 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba,
  */
 
 static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
-     (struct lpfc_hba *, struct lpfc_nodelist *, void *, uint32_t) = {
+     (struct lpfc_vport *, struct lpfc_nodelist *, void *, uint32_t) = {
        /* Action routine                  Event       Current State  */
        lpfc_rcv_plogi_unused_node,     /* RCV_PLOGI   UNUSED_NODE    */
        lpfc_rcv_els_unused_node,       /* RCV_PRLI        */
@@ -1697,16 +2141,16 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
        lpfc_disc_illegal,              /* DEVICE_RECOVERY */
 
        lpfc_rcv_plogi_plogi_issue,     /* RCV_PLOGI   PLOGI_ISSUE    */
-       lpfc_rcv_els_plogi_issue,       /* RCV_PRLI        */
-       lpfc_rcv_els_plogi_issue,       /* RCV_LOGO        */
+       lpfc_rcv_prli_plogi_issue,      /* RCV_PRLI        */
+       lpfc_rcv_logo_plogi_issue,      /* RCV_LOGO        */
        lpfc_rcv_els_plogi_issue,       /* RCV_ADISC       */
        lpfc_rcv_els_plogi_issue,       /* RCV_PDISC       */
        lpfc_rcv_els_plogi_issue,       /* RCV_PRLO        */
        lpfc_cmpl_plogi_plogi_issue,    /* CMPL_PLOGI      */
        lpfc_disc_illegal,              /* CMPL_PRLI       */
-       lpfc_disc_illegal,              /* CMPL_LOGO       */
+       lpfc_cmpl_logo_plogi_issue,     /* CMPL_LOGO       */
        lpfc_disc_illegal,              /* CMPL_ADISC      */
-       lpfc_disc_illegal,              /* CMPL_REG_LOGIN  */
+       lpfc_cmpl_reglogin_plogi_issue,/* CMPL_REG_LOGIN  */
        lpfc_device_rm_plogi_issue,     /* DEVICE_RM       */
        lpfc_device_recov_plogi_issue,  /* DEVICE_RECOVERY */
 
@@ -1730,7 +2174,7 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
        lpfc_rcv_padisc_reglogin_issue, /* RCV_ADISC       */
        lpfc_rcv_padisc_reglogin_issue, /* RCV_PDISC       */
        lpfc_rcv_prlo_reglogin_issue,   /* RCV_PRLO        */
-       lpfc_disc_illegal,              /* CMPL_PLOGI      */
+       lpfc_cmpl_plogi_illegal,        /* CMPL_PLOGI      */
        lpfc_disc_illegal,              /* CMPL_PRLI       */
        lpfc_disc_illegal,              /* CMPL_LOGO       */
        lpfc_disc_illegal,              /* CMPL_ADISC      */
@@ -1744,7 +2188,7 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
        lpfc_rcv_padisc_prli_issue,     /* RCV_ADISC       */
        lpfc_rcv_padisc_prli_issue,     /* RCV_PDISC       */
        lpfc_rcv_prlo_prli_issue,       /* RCV_PRLO        */
-       lpfc_disc_illegal,              /* CMPL_PLOGI      */
+       lpfc_cmpl_plogi_illegal,        /* CMPL_PLOGI      */
        lpfc_cmpl_prli_prli_issue,      /* CMPL_PRLI       */
        lpfc_disc_illegal,              /* CMPL_LOGO       */
        lpfc_disc_illegal,              /* CMPL_ADISC      */
@@ -1786,59 +2230,61 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
        lpfc_rcv_padisc_npr_node,       /* RCV_ADISC       */
        lpfc_rcv_padisc_npr_node,       /* RCV_PDISC       */
        lpfc_rcv_prlo_npr_node,         /* RCV_PRLO        */
-       lpfc_disc_noop,                 /* CMPL_PLOGI      */
-       lpfc_disc_noop,                 /* CMPL_PRLI       */
+       lpfc_cmpl_plogi_npr_node,       /* CMPL_PLOGI      */
+       lpfc_cmpl_prli_npr_node,        /* CMPL_PRLI       */
        lpfc_cmpl_logo_npr_node,        /* CMPL_LOGO       */
-       lpfc_disc_noop,                 /* CMPL_ADISC      */
+       lpfc_cmpl_adisc_npr_node,       /* CMPL_ADISC      */
        lpfc_cmpl_reglogin_npr_node,    /* CMPL_REG_LOGIN  */
        lpfc_device_rm_npr_node,        /* DEVICE_RM       */
        lpfc_device_recov_npr_node,     /* DEVICE_RECOVERY */
 };
 
 int
-lpfc_disc_state_machine(struct lpfc_hba * phba,
-                       struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+lpfc_disc_state_machine(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
+                       void *arg, uint32_t evt)
 {
        uint32_t cur_state, rc;
-       uint32_t(*func) (struct lpfc_hba *, struct lpfc_nodelist *, void *,
+       uint32_t(*func) (struct lpfc_vport *, struct lpfc_nodelist *, void *,
                         uint32_t);
+       uint32_t got_ndlp = 0;
+
+       if (lpfc_nlp_get(ndlp))
+               got_ndlp = 1;
 
-       ndlp->nlp_disc_refcnt++;
        cur_state = ndlp->nlp_state;
 
        /* DSM in event <evt> on NPort <nlp_DID> in state <cur_state> */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_DISCOVERY,
-                       "%d:0211 DSM in event x%x on NPort x%x in state %d "
-                       "Data: x%x\n",
-                       phba->brd_no,
-                       evt, ndlp->nlp_DID, cur_state, ndlp->nlp_flag);
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0211 DSM in event x%x on NPort x%x in "
+                        "state %d Data: x%x\n",
+                        evt, ndlp->nlp_DID, cur_state, ndlp->nlp_flag);
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
+                "DSM in:          evt:%d ste:%d did:x%x",
+               evt, cur_state, ndlp->nlp_DID);
 
        func = lpfc_disc_action[(cur_state * NLP_EVT_MAX_EVENT) + evt];
-       rc = (func) (phba, ndlp, arg, evt);
+       rc = (func) (vport, ndlp, arg, evt);
 
        /* DSM out state <rc> on NPort <nlp_DID> */
-       lpfc_printf_log(phba,
-                      KERN_INFO,
-                      LOG_DISCOVERY,
-                      "%d:0212 DSM out state %d on NPort x%x Data: x%x\n",
-                      phba->brd_no,
-                      rc, ndlp->nlp_DID, ndlp->nlp_flag);
-
-       ndlp->nlp_disc_refcnt--;
-
-       /* Check to see if ndlp removal is deferred */
-       if ((ndlp->nlp_disc_refcnt == 0)
-           && (ndlp->nlp_flag & NLP_DELAY_REMOVE)) {
-               spin_lock_irq(phba->host->host_lock);
-               ndlp->nlp_flag &= ~NLP_DELAY_REMOVE;
-               spin_unlock_irq(phba->host->host_lock);
-               lpfc_nlp_remove(phba, ndlp);
-               return (NLP_STE_FREED_NODE);
+       if (got_ndlp) {
+               lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0212 DSM out state %d on NPort x%x Data: x%x\n",
+                        rc, ndlp->nlp_DID, ndlp->nlp_flag);
+
+               lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
+                       "DSM out:         ste:%d did:x%x flg:x%x",
+                       rc, ndlp->nlp_DID, ndlp->nlp_flag);
+               /* Decrement the ndlp reference count held for this function */
+               lpfc_nlp_put(ndlp);
+       } else {
+               lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                       "0213 DSM out state %d on NPort free\n", rc);
+
+               lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_DSM,
+                       "DSM out:         ste:%d did:x%x flg:x%x",
+                       rc, 0, 0);
        }
-       if (rc == NLP_STE_FREED_NODE)
-               return (NLP_STE_FREED_NODE);
-       ndlp->nlp_state = rc;
-       return (rc);
+
+       return rc;
 }