]> Pileus Git - ~andy/linux/blobdiff - drivers/scsi/lpfc/lpfc_hbadisc.c
Pull cpuidle into release branch
[~andy/linux] / drivers / scsi / lpfc / lpfc_hbadisc.c
index 20b2a4905daaad73f9fd64ea290f13d057cefa80..c81c2b3228d637c9047f56e5224e9014d182c281 100644 (file)
@@ -36,6 +36,8 @@
 #include "lpfc.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_crtn.h"
+#include "lpfc_vport.h"
+#include "lpfc_debugfs.h"
 
 /* AlpaArray for assignment of scsid for scan-down and bind_method */
 static uint8_t lpfcAlpaArray[] = {
@@ -76,11 +78,22 @@ lpfc_terminate_rport_io(struct fc_rport *rport)
 
        phba  = ndlp->vport->phba;
 
+       lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_RPORT,
+               "rport terminate: sid:x%x did:x%x flg:x%x",
+               ndlp->nlp_sid, ndlp->nlp_DID, ndlp->nlp_flag);
+
        if (ndlp->nlp_sid != NLP_NO_SID) {
-               lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring],
-                       ndlp->nlp_sid, 0, 0, LPFC_CTX_TGT);
+               lpfc_sli_abort_iocb(ndlp->vport,
+                       &phba->sli.ring[phba->sli.fcp_ring],
+                       ndlp->nlp_sid, 0, LPFC_CTX_TGT);
        }
 
+       /*
+        * A device is normally blocked for rediscovery and unblocked when
+        * devloss timeout happens.  In case a vport is removed or driver
+        * unloaded before devloss timeout happens, we need to unblock here.
+        */
+       scsi_target_unblock(&rport->dev);
        return;
 }
 
@@ -92,58 +105,126 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
 {
        struct lpfc_rport_data *rdata;
        struct lpfc_nodelist * ndlp;
-       uint8_t *name;
-       int warn_on = 0;
-       struct lpfc_hba *phba;
        struct lpfc_vport *vport;
+       struct lpfc_hba   *phba;
+       struct completion devloss_compl;
+       struct lpfc_work_evt *evtp;
 
        rdata = rport->dd_data;
        ndlp = rdata->pnode;
 
        if (!ndlp) {
-               if (rport->roles & FC_RPORT_ROLE_FCP_TARGET)
+               if (rport->scsi_target_id != -1) {
                        printk(KERN_ERR "Cannot find remote node"
-                       " for rport in dev_loss_tmo_callbk x%x\n",
-                       rport->port_id);
+                               " for rport in dev_loss_tmo_callbk x%x\n",
+                               rport->port_id);
+               }
                return;
        }
 
-       if (ndlp->nlp_state == NLP_STE_MAPPED_NODE)
+       vport = ndlp->vport;
+       phba  = vport->phba;
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_RPORT,
+               "rport devlosscb: sid:x%x did:x%x flg:x%x",
+               ndlp->nlp_sid, ndlp->nlp_DID, ndlp->nlp_flag);
+
+       init_completion(&devloss_compl);
+       evtp = &ndlp->dev_loss_evt;
+
+       if (!list_empty(&evtp->evt_listp))
                return;
 
-       name = (uint8_t *)&ndlp->nlp_portname;
+       spin_lock_irq(&phba->hbalock);
+       evtp->evt_arg1  = ndlp;
+       evtp->evt_arg2  = &devloss_compl;
+       evtp->evt       = LPFC_EVT_DEV_LOSS;
+       list_add_tail(&evtp->evt_listp, &phba->work_list);
+       if (phba->work_wait)
+               wake_up(phba->work_wait);
+
+       spin_unlock_irq(&phba->hbalock);
+
+       wait_for_completion(&devloss_compl);
+
+       return;
+}
+
+/*
+ * This function is called from the worker thread when dev_loss_tmo
+ * expire.
+ */
+void
+lpfc_dev_loss_tmo_handler(struct lpfc_nodelist *ndlp)
+{
+       struct lpfc_rport_data *rdata;
+       struct fc_rport   *rport;
+       struct lpfc_vport *vport;
+       struct lpfc_hba   *phba;
+       uint8_t *name;
+       int warn_on = 0;
+
+       rport = ndlp->rport;
+
+       if (!rport)
+               return;
+
+       rdata = rport->dd_data;
+       name = (uint8_t *) &ndlp->nlp_portname;
        vport = ndlp->vport;
        phba  = vport->phba;
 
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_RPORT,
+               "rport devlosstmo:did:x%x type:x%x id:x%x",
+               ndlp->nlp_DID, ndlp->nlp_type, rport->scsi_target_id);
+
+       if (!(vport->load_flag & FC_UNLOADING) &&
+           ndlp->nlp_state == NLP_STE_MAPPED_NODE)
+               return;
+
+       if (ndlp->nlp_type & NLP_FABRIC) {
+               int  put_node;
+               int  put_rport;
+
+               /* We will clean up these Nodes in linkup */
+               put_node = rdata->pnode != NULL;
+               put_rport = ndlp->rport != NULL;
+               rdata->pnode = NULL;
+               ndlp->rport = NULL;
+               if (put_node)
+                       lpfc_nlp_put(ndlp);
+               if (put_rport)
+                       put_device(&rport->dev);
+               return;
+       }
+
        if (ndlp->nlp_sid != NLP_NO_SID) {
                warn_on = 1;
                /* flush the target */
-               lpfc_sli_abort_iocb(phba, &phba->sli.ring[phba->sli.fcp_ring],
-                       ndlp->nlp_sid, 0, 0, LPFC_CTX_TGT);
+               lpfc_sli_abort_iocb(vport, &phba->sli.ring[phba->sli.fcp_ring],
+                                   ndlp->nlp_sid, 0, LPFC_CTX_TGT);
        }
        if (vport->load_flag & FC_UNLOADING)
                warn_on = 0;
 
        if (warn_on) {
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                               "%d:0203 Devloss timeout on "
-                               "WWPN %x:%x:%x:%x:%x:%x:%x:%x "
-                               "NPort x%x Data: x%x x%x x%x\n",
-                               phba->brd_no,
-                               *name, *(name+1), *(name+2), *(name+3),
-                               *(name+4), *(name+5), *(name+6), *(name+7),
-                               ndlp->nlp_DID, ndlp->nlp_flag,
-                               ndlp->nlp_state, ndlp->nlp_rpi);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0203 Devloss timeout on "
+                                "WWPN %x:%x:%x:%x:%x:%x:%x:%x "
+                                "NPort x%x Data: x%x x%x x%x\n",
+                                *name, *(name+1), *(name+2), *(name+3),
+                                *(name+4), *(name+5), *(name+6), *(name+7),
+                                ndlp->nlp_DID, ndlp->nlp_flag,
+                                ndlp->nlp_state, ndlp->nlp_rpi);
        } else {
-               lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                               "%d:0204 Devloss timeout on "
-                               "WWPN %x:%x:%x:%x:%x:%x:%x:%x "
-                               "NPort x%x Data: x%x x%x x%x\n",
-                               phba->brd_no,
-                               *name, *(name+1), *(name+2), *(name+3),
-                               *(name+4), *(name+5), *(name+6), *(name+7),
-                               ndlp->nlp_DID, ndlp->nlp_flag,
-                               ndlp->nlp_state, ndlp->nlp_rpi);
+               lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                "0204 Devloss timeout on "
+                                "WWPN %x:%x:%x:%x:%x:%x:%x:%x "
+                                "NPort x%x Data: x%x x%x x%x\n",
+                                *name, *(name+1), *(name+2), *(name+3),
+                                *(name+4), *(name+5), *(name+6), *(name+7),
+                                ndlp->nlp_DID, ndlp->nlp_flag,
+                                ndlp->nlp_state, ndlp->nlp_rpi);
        }
 
        if (!(vport->load_flag & FC_UNLOADING) &&
@@ -152,12 +233,25 @@ lpfc_dev_loss_tmo_callbk(struct fc_rport *rport)
            (ndlp->nlp_state != NLP_STE_UNMAPPED_NODE))
                lpfc_disc_state_machine(vport, ndlp, NULL, NLP_EVT_DEVICE_RM);
        else {
+               int  put_node;
+               int  put_rport;
+
+               put_node = rdata->pnode != NULL;
+               put_rport = ndlp->rport != NULL;
                rdata->pnode = NULL;
                ndlp->rport = NULL;
-               lpfc_nlp_put(ndlp);
-               put_device(&rport->dev);
+               if (put_node)
+                       lpfc_nlp_put(ndlp);
+               if (put_rport)
+                       put_device(&rport->dev);
        }
+}
 
+
+void
+lpfc_worker_wake_up(struct lpfc_hba *phba)
+{
+       wake_up(phba->work_wait);
        return;
 }
 
@@ -166,6 +260,7 @@ lpfc_work_list_done(struct lpfc_hba *phba)
 {
        struct lpfc_work_evt  *evtp = NULL;
        struct lpfc_nodelist  *ndlp;
+       struct lpfc_vport     *vport;
        int free_evt;
 
        spin_lock_irq(&phba->hbalock);
@@ -175,10 +270,36 @@ lpfc_work_list_done(struct lpfc_hba *phba)
                spin_unlock_irq(&phba->hbalock);
                free_evt = 1;
                switch (evtp->evt) {
+               case LPFC_EVT_DEV_LOSS_DELAY:
+                       free_evt = 0; /* evt is part of ndlp */
+                       ndlp = (struct lpfc_nodelist *) (evtp->evt_arg1);
+                       vport = ndlp->vport;
+                       if (!vport)
+                               break;
+
+                       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_RPORT,
+                               "rport devlossdly:did:x%x flg:x%x",
+                               ndlp->nlp_DID, ndlp->nlp_flag, 0);
+
+                       if (!(vport->load_flag & FC_UNLOADING) &&
+                           !(ndlp->nlp_flag & NLP_DELAY_TMO) &&
+                           !(ndlp->nlp_flag & NLP_NPR_2B_DISC)) {
+                               lpfc_disc_state_machine(vport, ndlp, NULL,
+                                       NLP_EVT_DEVICE_RM);
+                       }
+                       break;
                case LPFC_EVT_ELS_RETRY:
                        ndlp = (struct lpfc_nodelist *) (evtp->evt_arg1);
                        lpfc_els_retry_delay_handler(ndlp);
+                       free_evt = 0; /* evt is part of ndlp */
+                       break;
+               case LPFC_EVT_DEV_LOSS:
+                       ndlp = (struct lpfc_nodelist *)(evtp->evt_arg1);
+                       lpfc_nlp_get(ndlp);
+                       lpfc_dev_loss_tmo_handler(ndlp);
                        free_evt = 0;
+                       complete((struct completion *)(evtp->evt_arg2));
+                       lpfc_nlp_put(ndlp);
                        break;
                case LPFC_EVT_ONLINE:
                        if (phba->link_state < LPFC_LINK_DOWN)
@@ -232,7 +353,8 @@ static void
 lpfc_work_done(struct lpfc_hba *phba)
 {
        struct lpfc_sli_ring *pring;
-       uint32_t ha_copy, control, work_port_events;
+       uint32_t ha_copy, status, control, work_port_events;
+       struct lpfc_vport **vports;
        struct lpfc_vport *vport;
        int i;
 
@@ -249,75 +371,104 @@ lpfc_work_done(struct lpfc_hba *phba)
 
        if (ha_copy & HA_LATT)
                lpfc_handle_latt(phba);
-
-       vport = phba->pport;
-
-       work_port_events = vport->work_port_events;
-
-       if (work_port_events & WORKER_DISC_TMO)
-               lpfc_disc_timeout_handler(vport);
-
-       if (work_port_events & WORKER_ELS_TMO)
-               lpfc_els_timeout_handler(vport);
-
-       if (work_port_events & WORKER_MBOX_TMO)
-               lpfc_mbox_timeout_handler(phba);
-
-       if (work_port_events & WORKER_FDMI_TMO)
-               lpfc_fdmi_timeout_handler(vport);
-
-       spin_lock_irq(&phba->hbalock);
-       vport->work_port_events &= ~work_port_events;
-       spin_unlock_irq(&phba->hbalock);
-
-       for (i = 0; i < phba->sli.num_rings; i++, ha_copy >>= 4) {
-               pring = &phba->sli.ring[i];
-               if ((ha_copy & HA_RXATT)
-                   || (pring->flag & LPFC_DEFERRED_RING_EVENT)) {
-                       if (pring->flag & LPFC_STOP_IOCB_MASK) {
-                               pring->flag |= LPFC_DEFERRED_RING_EVENT;
-                       } else {
-                               lpfc_sli_handle_slow_ring_event(phba, pring,
-                                                               (ha_copy &
-                                                                HA_RXMASK));
-                               pring->flag &= ~LPFC_DEFERRED_RING_EVENT;
-                       }
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL)
+               for(i = 0; i < LPFC_MAX_VPORTS; i++) {
                        /*
-                        * Turn on Ring interrupts
+                        * We could have no vports in array if unloading, so if
+                        * this happens then just use the pport
                         */
-                       spin_lock_irq(&phba->hbalock);
-                       control = readl(phba->HCregaddr);
-                       control |= (HC_R0INT_ENA << i);
+                       if (vports[i] == NULL && i == 0)
+                               vport = phba->pport;
+                       else
+                               vport = vports[i];
+                       if (vport == NULL)
+                               break;
+                       work_port_events = vport->work_port_events;
+                       if (work_port_events & WORKER_DISC_TMO)
+                               lpfc_disc_timeout_handler(vport);
+                       if (work_port_events & WORKER_ELS_TMO)
+                               lpfc_els_timeout_handler(vport);
+                       if (work_port_events & WORKER_HB_TMO)
+                               lpfc_hb_timeout_handler(phba);
+                       if (work_port_events & WORKER_MBOX_TMO)
+                               lpfc_mbox_timeout_handler(phba);
+                       if (work_port_events & WORKER_FABRIC_BLOCK_TMO)
+                               lpfc_unblock_fabric_iocbs(phba);
+                       if (work_port_events & WORKER_FDMI_TMO)
+                               lpfc_fdmi_timeout_handler(vport);
+                       if (work_port_events & WORKER_RAMP_DOWN_QUEUE)
+                               lpfc_ramp_down_queue_handler(phba);
+                       if (work_port_events & WORKER_RAMP_UP_QUEUE)
+                               lpfc_ramp_up_queue_handler(phba);
+                       spin_lock_irq(&vport->work_port_lock);
+                       vport->work_port_events &= ~work_port_events;
+                       spin_unlock_irq(&vport->work_port_lock);
+               }
+       lpfc_destroy_vport_work_array(vports);
+
+       pring = &phba->sli.ring[LPFC_ELS_RING];
+       status = (ha_copy & (HA_RXMASK  << (4*LPFC_ELS_RING)));
+       status >>= (4*LPFC_ELS_RING);
+       if ((status & HA_RXMASK)
+               || (pring->flag & LPFC_DEFERRED_RING_EVENT)) {
+               if (pring->flag & LPFC_STOP_IOCB_MASK) {
+                       pring->flag |= LPFC_DEFERRED_RING_EVENT;
+               } else {
+                       lpfc_sli_handle_slow_ring_event(phba, pring,
+                                                       (status &
+                                                        HA_RXMASK));
+                       pring->flag &= ~LPFC_DEFERRED_RING_EVENT;
+               }
+               /*
+                * Turn on Ring interrupts
+                */
+               spin_lock_irq(&phba->hbalock);
+               control = readl(phba->HCregaddr);
+               if (!(control & (HC_R0INT_ENA << LPFC_ELS_RING))) {
+                       lpfc_debugfs_slow_ring_trc(phba,
+                               "WRK Enable ring: cntl:x%x hacopy:x%x",
+                               control, ha_copy, 0);
+
+                       control |= (HC_R0INT_ENA << LPFC_ELS_RING);
                        writel(control, phba->HCregaddr);
                        readl(phba->HCregaddr); /* flush */
-                       spin_unlock_irq(&phba->hbalock);
                }
+               else {
+                       lpfc_debugfs_slow_ring_trc(phba,
+                               "WRK Ring ok:     cntl:x%x hacopy:x%x",
+                               control, ha_copy, 0);
+               }
+               spin_unlock_irq(&phba->hbalock);
        }
-
        lpfc_work_list_done(phba);
 }
 
 static int
 check_work_wait_done(struct lpfc_hba *phba)
 {
-       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_vport *vport;
+       struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
        int rc = 0;
 
-       if (!vport)
-               return 0;
-
        spin_lock_irq(&phba->hbalock);
-
-       if (phba->work_ha ||
-           vport->work_port_events ||
-           (!list_empty(&phba->work_list)) ||
-           kthread_should_stop())
+       list_for_each_entry(vport, &phba->port_list, listentry) {
+               if (vport->work_port_events) {
+                       rc = 1;
+                       break;
+               }
+       }
+       if (rc || phba->work_ha || (!list_empty(&phba->work_list)) ||
+           kthread_should_stop() || pring->flag & LPFC_DEFERRED_RING_EVENT) {
                rc = 1;
-
+               phba->work_found++;
+       } else
+               phba->work_found = 0;
        spin_unlock_irq(&phba->hbalock);
        return rc;
 }
 
+
 int
 lpfc_do_work(void *p)
 {
@@ -327,11 +478,13 @@ lpfc_do_work(void *p)
 
        set_user_nice(current, -20);
        phba->work_wait = &work_waitq;
+       phba->work_found = 0;
 
        while (1) {
 
                rc = wait_event_interruptible(work_waitq,
-                                               check_work_wait_done(phba));
+                                             check_work_wait_done(phba));
+
                BUG_ON(rc);
 
                if (kthread_should_stop())
@@ -339,6 +492,17 @@ lpfc_do_work(void *p)
 
                lpfc_work_done(phba);
 
+               /* If there is alot of slow ring work, like during link up
+                * check_work_wait_done() may cause this thread to not give
+                * up the CPU for very long periods of time. This may cause
+                * soft lockups or other problems. To avoid these situations
+                * give up the CPU here after LPFC_MAX_WORKER_ITERATION
+                * consecutive iterations.
+                */
+               if (phba->work_found >= LPFC_MAX_WORKER_ITERATION) {
+                       phba->work_found = 0;
+                       schedule();
+               }
        }
        phba->work_wait = NULL;
        return 0;
@@ -360,7 +524,7 @@ lpfc_workq_post_event(struct lpfc_hba *phba, void *arg1, void *arg2,
         * All Mailbox completions and LPFC_ELS_RING rcv ring IOCB events will
         * be queued to worker thread for processing
         */
-       evtp = kmalloc(sizeof(struct lpfc_work_evt), GFP_KERNEL);
+       evtp = kmalloc(sizeof(struct lpfc_work_evt), GFP_ATOMIC);
        if (!evtp)
                return 0;
 
@@ -371,37 +535,98 @@ lpfc_workq_post_event(struct lpfc_hba *phba, void *arg1, void *arg2,
        spin_lock_irqsave(&phba->hbalock, flags);
        list_add_tail(&evtp->evt_listp, &phba->work_list);
        if (phba->work_wait)
-               wake_up(phba->work_wait);
+               lpfc_worker_wake_up(phba);
        spin_unlock_irqrestore(&phba->hbalock, flags);
 
        return 1;
 }
 
+void
+lpfc_cleanup_rpis(struct lpfc_vport *vport, int remove)
+{
+       struct lpfc_hba  *phba = vport->phba;
+       struct lpfc_nodelist *ndlp, *next_ndlp;
+       int  rc;
+
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+               if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                       continue;
+
+               if (phba->sli3_options & LPFC_SLI3_VPORT_TEARDOWN)
+                       lpfc_unreg_rpi(vport, ndlp);
+
+               /* Leave Fabric nodes alone on link down */
+               if (!remove && ndlp->nlp_type & NLP_FABRIC)
+                       continue;
+               rc = lpfc_disc_state_machine(vport, ndlp, NULL,
+                                            remove
+                                            ? NLP_EVT_DEVICE_RM
+                                            : NLP_EVT_DEVICE_RECOVERY);
+       }
+       if (phba->sli3_options & LPFC_SLI3_VPORT_TEARDOWN) {
+               lpfc_mbx_unreg_vpi(vport);
+               vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+       }
+}
+
+static void
+lpfc_linkdown_port(struct lpfc_vport *vport)
+{
+       struct lpfc_nodelist *ndlp, *next_ndlp;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+
+       fc_host_post_event(shost, fc_get_event_number(), FCH_EVT_LINKDOWN, 0);
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
+               "Link Down:       state:x%x rtry:x%x flg:x%x",
+               vport->port_state, vport->fc_ns_retry, vport->fc_flag);
+
+       /* Cleanup any outstanding RSCN activity */
+       lpfc_els_flush_rscn(vport);
+
+       /* Cleanup any outstanding ELS commands */
+       lpfc_els_flush_cmd(vport);
+
+       lpfc_cleanup_rpis(vport, 0);
+
+       /* free any ndlp's on unused list */
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp)
+               if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                       lpfc_drop_node(vport, ndlp);
+
+       /* Turn off discovery timer if its running */
+       lpfc_can_disctmo(vport);
+}
+
 int
 lpfc_linkdown(struct lpfc_hba *phba)
 {
        struct lpfc_vport *vport = phba->pport;
        struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
-       struct lpfc_sli   *psli;
-       struct lpfc_nodelist  *ndlp, *next_ndlp;
+       struct lpfc_vport **vports;
        LPFC_MBOXQ_t          *mb;
-       int                   rc;
+       int i;
 
-       psli = &phba->sli;
        if (phba->link_state == LPFC_LINK_DOWN) {
                return 0;
        }
        spin_lock_irq(&phba->hbalock);
-       if (phba->link_state > LPFC_LINK_DOWN)
+       if (phba->link_state > LPFC_LINK_DOWN) {
                phba->link_state = LPFC_LINK_DOWN;
+               phba->pport->fc_flag &= ~FC_LBIT;
+       }
        spin_unlock_irq(&phba->hbalock);
-
-       fc_host_post_event(shost, fc_get_event_number(), FCH_EVT_LINKDOWN, 0);
-
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL)
+               for(i = 0; i < LPFC_MAX_VPORTS && vports[i] != NULL; i++) {
+                       /* Issue a LINK DOWN event to all nodes */
+                       lpfc_linkdown_port(vports[i]);
+               }
+       lpfc_destroy_vport_work_array(vports);
        /* Clean up any firmware default rpi's */
        mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        if (mb) {
-               lpfc_unreg_did(phba, 0xffffffff, mb);
+               lpfc_unreg_did(phba, 0xffff, 0xffffffff, mb);
                mb->vport = vport;
                mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                if (lpfc_sli_issue_mbox(phba, mb, (MBX_NOWAIT | MBX_STOP_IOCB))
@@ -410,31 +635,13 @@ lpfc_linkdown(struct lpfc_hba *phba)
                }
        }
 
-       /* Cleanup any outstanding RSCN activity */
-       lpfc_els_flush_rscn(vport);
-
-       /* Cleanup any outstanding ELS commands */
-       lpfc_els_flush_cmd(vport);
-
-       /*
-        * Issue a LINK DOWN event to all nodes.
-        */
-       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
-                               /* free any ndlp's on unused state */
-               if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
-                       lpfc_drop_node(vport, ndlp);
-               else            /* otherwise, force node recovery. */
-                       rc = lpfc_disc_state_machine(vport, ndlp, NULL,
-                                                    NLP_EVT_DEVICE_RECOVERY);
-       }
-
        /* Setup myDID for link up if we are in pt2pt mode */
-       if (vport->fc_flag & FC_PT2PT) {
-               vport->fc_myDID = 0;
+       if (phba->pport->fc_flag & FC_PT2PT) {
+               phba->pport->fc_myDID = 0;
                mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
                if (mb) {
                        lpfc_config_link(phba, mb);
-                       mb->mbox_cmpl=lpfc_sli_def_mbox_cmpl;
+                       mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                        mb->vport = vport;
                        if (lpfc_sli_issue_mbox(phba, mb,
                                                (MBX_NOWAIT | MBX_STOP_IOCB))
@@ -443,66 +650,95 @@ lpfc_linkdown(struct lpfc_hba *phba)
                        }
                }
                spin_lock_irq(shost->host_lock);
-               vport->fc_flag &= ~(FC_PT2PT | FC_PT2PT_PLOGI);
+               phba->pport->fc_flag &= ~(FC_PT2PT | FC_PT2PT_PLOGI);
                spin_unlock_irq(shost->host_lock);
        }
 
-       spin_lock_irq(shost->host_lock);
-       vport->fc_flag &= ~FC_LBIT;
-       spin_unlock_irq(shost->host_lock);
+       return 0;
+}
 
-       /* Turn off discovery timer if its running */
-       lpfc_can_disctmo(vport);
+static void
+lpfc_linkup_cleanup_nodes(struct lpfc_vport *vport)
+{
+       struct lpfc_nodelist *ndlp;
 
-       /* Must process IOCBs on all rings to handle ABORTed I/Os */
-       return 0;
+       list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
+               if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                       continue;
+
+               if (ndlp->nlp_type & NLP_FABRIC) {
+                               /* On Linkup its safe to clean up the ndlp
+                                * from Fabric connections.
+                                */
+                       if (ndlp->nlp_DID != Fabric_DID)
+                               lpfc_unreg_rpi(vport, ndlp);
+                       lpfc_nlp_set_state(vport, ndlp, NLP_STE_NPR_NODE);
+               } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
+                               /* Fail outstanding IO now since device is
+                                * marked for PLOGI.
+                                */
+                       lpfc_unreg_rpi(vport, ndlp);
+               }
+       }
 }
 
-static int
-lpfc_linkup(struct lpfc_hba *phba)
+static void
+lpfc_linkup_port(struct lpfc_vport *vport)
 {
-       struct lpfc_vport *vport = phba->pport;
-       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
        struct lpfc_nodelist *ndlp, *next_ndlp;
+       struct lpfc_hba  *phba = vport->phba;
+
+       if ((vport->load_flag & FC_UNLOADING) != 0)
+               return;
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
+               "Link Up:         top:x%x speed:x%x flg:x%x",
+               phba->fc_topology, phba->fc_linkspeed, phba->link_flag);
+
+       /* If NPIV is not enabled, only bring the physical port up */
+       if (!(phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+               (vport != phba->pport))
+               return;
 
        fc_host_post_event(shost, fc_get_event_number(), FCH_EVT_LINKUP, 0);
 
        spin_lock_irq(shost->host_lock);
-       phba->link_state = LPFC_LINK_UP;
        vport->fc_flag &= ~(FC_PT2PT | FC_PT2PT_PLOGI | FC_ABORT_DISCOVERY |
                            FC_RSCN_MODE | FC_NLP_MORE | FC_RSCN_DISCOVERY);
        vport->fc_flag |= FC_NDISC_ACTIVE;
        vport->fc_ns_retry = 0;
        spin_unlock_irq(shost->host_lock);
 
+       if (vport->fc_flag & FC_LBIT)
+               lpfc_linkup_cleanup_nodes(vport);
 
-       if (vport->fc_flag & FC_LBIT) {
-               list_for_each_entry(ndlp, &vport->fc_nodes, nlp_listp) {
-                       if (ndlp->nlp_state != NLP_STE_UNUSED_NODE) {
-                               if (ndlp->nlp_type & NLP_FABRIC) {
-                                       /*
-                                        * On Linkup its safe to clean up the
-                                        * ndlp from Fabric connections.
-                                        */
-                                       lpfc_nlp_set_state(vport, ndlp,
-                                                          NLP_STE_UNUSED_NODE);
-                               } else if (!(ndlp->nlp_flag & NLP_NPR_ADISC)) {
-                                       /*
-                                        * Fail outstanding IO now since
-                                        * device is marked for PLOGI.
-                                        */
-                                       lpfc_unreg_rpi(vport, ndlp);
-                               }
-                       }
-               }
-       }
-
-       /* free any ndlp's in unused state */
+                               /* free any ndlp's in unused state */
        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes,
-                                nlp_listp) {
+                                nlp_listp)
                if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
                        lpfc_drop_node(vport, ndlp);
-       }
+}
+
+static int
+lpfc_linkup(struct lpfc_hba *phba)
+{
+       struct lpfc_vport **vports;
+       int i;
+
+       phba->link_state = LPFC_LINK_UP;
+
+       /* Unblock fabric iocbs if they are blocked */
+       clear_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
+       del_timer_sync(&phba->fabric_block_timer);
+
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL)
+               for(i = 0; i < LPFC_MAX_VPORTS && vports[i] != NULL; i++)
+                       lpfc_linkup_port(vports[i]);
+       lpfc_destroy_vport_work_array(vports);
+       if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)
+               lpfc_issue_clear_la(phba, phba->pport);
 
        return 0;
 }
@@ -529,18 +765,26 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
        /* Check for error */
        if ((mb->mbxStatus) && (mb->mbxStatus != 0x1601)) {
-               /* CLEAR_LA mbox error <mbxStatus> state <port_state> */
-               lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
-                               "%d:0320 CLEAR_LA mbxStatus error x%x hba "
-                               "state x%x\n",
-                               phba->brd_no, mb->mbxStatus, vport->port_state);
-
+               /* CLEAR_LA mbox error <mbxStatus> state <hba_state> */
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
+                                "0320 CLEAR_LA mbxStatus error x%x hba "
+                                "state x%x\n",
+                                mb->mbxStatus, vport->port_state);
                phba->link_state = LPFC_HBA_ERROR;
                goto out;
        }
 
-       if (vport->fc_flag & FC_ABORT_DISCOVERY)
-               goto out;
+       if (vport->port_type == LPFC_PHYSICAL_PORT)
+               phba->link_state = LPFC_HBA_READY;
+
+       spin_lock_irq(&phba->hbalock);
+       psli->sli_flag |= LPFC_PROCESS_LA;
+       control = readl(phba->HCregaddr);
+       control |= HC_LAINT_ENA;
+       writel(control, phba->HCregaddr);
+       readl(phba->HCregaddr); /* flush */
+       spin_unlock_irq(&phba->hbalock);
+       return;
 
        vport->num_disc_nodes = 0;
        /* go thru NPR nodes and issue ELS PLOGIs */
@@ -557,10 +801,8 @@ lpfc_mbx_cmpl_clear_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
 out:
        /* Device Discovery completes */
-       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                        "%d:0225 Device Discovery completes\n",
-                        phba->brd_no);
-
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0225 Device Discovery completes\n");
        mempool_free(pmb, phba->mbox_mem_pool);
 
        spin_lock_irq(shost->host_lock);
@@ -589,8 +831,6 @@ static void
 lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
        struct lpfc_vport *vport = pmb->vport;
-       struct lpfc_sli *psli = &phba->sli;
-       int rc;
 
        if (pmb->mb.mbxStatus)
                goto out;
@@ -606,49 +846,38 @@ lpfc_mbx_cmpl_local_config_link(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                         */
                        lpfc_set_disctmo(vport);
                        return;
-               }
+       }
 
        /* Start discovery by sending a FLOGI. port_state is identically
         * LPFC_FLOGI while waiting for FLOGI cmpl
         */
-       vport->port_state = LPFC_FLOGI;
-       lpfc_set_disctmo(vport);
-       lpfc_initial_flogi(vport);
+       if (vport->port_state != LPFC_FLOGI) {
+               vport->port_state = LPFC_FLOGI;
+               lpfc_set_disctmo(vport);
+               lpfc_initial_flogi(vport);
+       }
        return;
 
 out:
-       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
-                       "%d:0306 CONFIG_LINK mbxStatus error x%x "
-                       "HBA state x%x\n",
-                       phba->brd_no, pmb->mb.mbxStatus, vport->port_state);
+       lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
+                        "0306 CONFIG_LINK mbxStatus error x%x "
+                        "HBA state x%x\n",
+                        pmb->mb.mbxStatus, vport->port_state);
+       mempool_free(pmb, phba->mbox_mem_pool);
 
        lpfc_linkdown(phba);
 
-       phba->link_state = LPFC_HBA_ERROR;
-
-       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                       "%d:0200 CONFIG_LINK bad hba state x%x\n",
-                       phba->brd_no, vport->port_state);
+       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                        "0200 CONFIG_LINK bad hba state x%x\n",
+                        vport->port_state);
 
-       lpfc_clear_la(phba, pmb);
-       pmb->mbox_cmpl = lpfc_mbx_cmpl_clear_la;
-       pmb->vport = vport;
-       rc = lpfc_sli_issue_mbox(phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB));
-       if (rc == MBX_NOT_FINISHED) {
-               mempool_free(pmb, phba->mbox_mem_pool);
-               lpfc_disc_flush_list(vport);
-               psli->ring[(psli->extra_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;
-               psli->ring[(psli->fcp_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;
-               psli->ring[(psli->next_ring)].flag &= ~LPFC_STOP_IOCB_EVENT;
-               vport->port_state = LPFC_VPORT_READY;
-       }
+       lpfc_issue_clear_la(phba, vport);
        return;
 }
 
 static void
 lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
-       struct lpfc_sli *psli = &phba->sli;
        MAILBOX_t *mb = &pmb->mb;
        struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) pmb->context1;
        struct lpfc_vport  *vport = pmb->vport;
@@ -657,13 +886,11 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        /* Check for error */
        if (mb->mbxStatus) {
                /* READ_SPARAM mbox error <mbxStatus> state <hba_state> */
-               lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
-                               "%d:0319 READ_SPARAM mbxStatus error x%x "
-                               "hba state x%x>\n",
-                               phba->brd_no, mb->mbxStatus, vport->port_state);
-
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
+                                "0319 READ_SPARAM mbxStatus error x%x "
+                                "hba state x%x>\n",
+                                mb->mbxStatus, vport->port_state);
                lpfc_linkdown(phba);
-               phba->link_state = LPFC_HBA_ERROR;
                goto out;
        }
 
@@ -675,12 +902,15 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        if (phba->cfg_soft_wwpn)
                u64_to_wwn(phba->cfg_soft_wwpn,
                           vport->fc_sparam.portName.u.wwn);
-       memcpy((uint8_t *) &vport->fc_nodename,
-              (uint8_t *) &vport->fc_sparam.nodeName,
-              sizeof (struct lpfc_name));
-       memcpy((uint8_t *) &vport->fc_portname,
-              (uint8_t *) &vport->fc_sparam.portName,
-              sizeof (struct lpfc_name));
+       memcpy(&vport->fc_nodename, &vport->fc_sparam.nodeName,
+              sizeof(vport->fc_nodename));
+       memcpy(&vport->fc_portname, &vport->fc_sparam.portName,
+              sizeof(vport->fc_portname));
+       if (vport->port_type == LPFC_PHYSICAL_PORT) {
+               memcpy(&phba->wwnn, &vport->fc_nodename, sizeof(phba->wwnn));
+               memcpy(&phba->wwpn, &vport->fc_portname, sizeof(phba->wwnn));
+       }
+
        lpfc_mbuf_free(phba, mp->virt, mp->phys);
        kfree(mp);
        mempool_free(pmb, phba->mbox_mem_pool);
@@ -690,35 +920,15 @@ out:
        pmb->context1 = NULL;
        lpfc_mbuf_free(phba, mp->virt, mp->phys);
        kfree(mp);
-       if (phba->link_state != LPFC_CLEAR_LA) {
-               struct lpfc_sli_ring *extra_ring =
-                       &psli->ring[psli->extra_ring];
-               struct lpfc_sli_ring *fcp_ring  = &psli->ring[psli->fcp_ring];
-               struct lpfc_sli_ring *next_ring = &psli->ring[psli->next_ring];
-
-               lpfc_clear_la(phba, pmb);
-               pmb->mbox_cmpl = lpfc_mbx_cmpl_clear_la;
-               pmb->vport = vport;
-               if (lpfc_sli_issue_mbox(phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB))
-                   == MBX_NOT_FINISHED) {
-                       mempool_free(pmb, phba->mbox_mem_pool);
-                       lpfc_disc_flush_list(vport);
-                       extra_ring->flag &= ~LPFC_STOP_IOCB_EVENT;
-                       fcp_ring->flag &= ~LPFC_STOP_IOCB_EVENT;
-                       next_ring->flag &= ~LPFC_STOP_IOCB_EVENT;
-                       vport->port_state = LPFC_VPORT_READY;
-               }
-       } else {
-               mempool_free(pmb, phba->mbox_mem_pool);
-       }
+       lpfc_issue_clear_la(phba, vport);
+       mempool_free(pmb, phba->mbox_mem_pool);
        return;
 }
 
 static void
-lpfc_mbx_process_link_up(struct lpfc_vport *vport, READ_LA_VAR *la)
+lpfc_mbx_process_link_up(struct lpfc_hba *phba, READ_LA_VAR *la)
 {
-       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
-       struct lpfc_hba  *phba  = vport->phba;
+       struct lpfc_vport *vport = phba->pport;
        LPFC_MBOXQ_t *sparam_mbox, *cfglink_mbox;
        int i;
        struct lpfc_dmabuf *mp;
@@ -727,30 +937,32 @@ lpfc_mbx_process_link_up(struct lpfc_vport *vport, READ_LA_VAR *la)
        sparam_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        cfglink_mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
 
-       spin_lock_irq(shost->host_lock);
-       switch (la->UlnkSpeed) {
-               case LA_1GHZ_LINK:
-                       phba->fc_linkspeed = LA_1GHZ_LINK;
-                       break;
-               case LA_2GHZ_LINK:
-                       phba->fc_linkspeed = LA_2GHZ_LINK;
-                       break;
-               case LA_4GHZ_LINK:
-                       phba->fc_linkspeed = LA_4GHZ_LINK;
-                       break;
-               case LA_8GHZ_LINK:
-                       phba->fc_linkspeed = LA_8GHZ_LINK;
-                       break;
-               default:
-                       phba->fc_linkspeed = LA_UNKNW_LINK;
-                       break;
+       spin_lock_irq(&phba->hbalock);
+       switch (la->UlnkSpeed) {
+       case LA_1GHZ_LINK:
+               phba->fc_linkspeed = LA_1GHZ_LINK;
+               break;
+       case LA_2GHZ_LINK:
+               phba->fc_linkspeed = LA_2GHZ_LINK;
+               break;
+       case LA_4GHZ_LINK:
+               phba->fc_linkspeed = LA_4GHZ_LINK;
+               break;
+       case LA_8GHZ_LINK:
+               phba->fc_linkspeed = LA_8GHZ_LINK;
+               break;
+       default:
+               phba->fc_linkspeed = LA_UNKNW_LINK;
+               break;
        }
 
        phba->fc_topology = la->topology;
+       phba->link_flag &= ~LS_NPIV_FAB_SUPPORTED;
 
        if (phba->fc_topology == TOPOLOGY_LOOP) {
-       /* Get Loop Map information */
+               phba->sli3_options &= ~LPFC_SLI3_NPIV_ENABLED;
 
+                               /* Get Loop Map information */
                if (la->il)
                        vport->fc_flag |= FC_LBIT;
 
@@ -760,7 +972,7 @@ lpfc_mbx_process_link_up(struct lpfc_vport *vport, READ_LA_VAR *la)
                if (i == 0) {
                        phba->alpa_map[0] = 0;
                } else {
-                       if (phba->cfg_log_verbose & LOG_LINK_EVENT) {
+                       if (vport->cfg_log_verbose & LOG_LINK_EVENT) {
                                int numalpa, j, k;
                                union {
                                        uint8_t pamap[16];
@@ -784,30 +996,34 @@ lpfc_mbx_process_link_up(struct lpfc_vport *vport, READ_LA_VAR *la)
                                        }
                                        /* Link Up Event ALPA map */
                                        lpfc_printf_log(phba,
-                                               KERN_WARNING,
-                                               LOG_LINK_EVENT,
-                                               "%d:1304 Link Up Event "
-                                               "ALPA map Data: x%x "
-                                               "x%x x%x x%x\n",
-                                               phba->brd_no,
-                                               un.pa.wd1, un.pa.wd2,
-                                               un.pa.wd3, un.pa.wd4);
+                                                       KERN_WARNING,
+                                                       LOG_LINK_EVENT,
+                                                       "1304 Link Up Event "
+                                                       "ALPA map Data: x%x "
+                                                       "x%x x%x x%x\n",
+                                                       un.pa.wd1, un.pa.wd2,
+                                                       un.pa.wd3, un.pa.wd4);
                                }
                        }
                }
        } else {
+               if (!(phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)) {
+                       if (phba->max_vpi && phba->cfg_enable_npiv &&
+                          (phba->sli_rev == 3))
+                               phba->sli3_options |= LPFC_SLI3_NPIV_ENABLED;
+               }
                vport->fc_myDID = phba->fc_pref_DID;
                vport->fc_flag |= FC_LBIT;
        }
-       spin_unlock_irq(shost->host_lock);
+       spin_unlock_irq(&phba->hbalock);
 
        lpfc_linkup(phba);
        if (sparam_mbox) {
-               lpfc_read_sparam(phba, sparam_mbox);
+               lpfc_read_sparam(phba, sparam_mbox, 0);
                sparam_mbox->vport = vport;
                sparam_mbox->mbox_cmpl = lpfc_mbx_cmpl_read_sparam;
                rc = lpfc_sli_issue_mbox(phba, sparam_mbox,
-                                               (MBX_NOWAIT | MBX_STOP_IOCB));
+                                   (MBX_NOWAIT | MBX_STOP_IOCB));
                if (rc == MBX_NOT_FINISHED) {
                        mp = (struct lpfc_dmabuf *) sparam_mbox->context1;
                        lpfc_mbuf_free(phba, mp->virt, mp->phys);
@@ -815,7 +1031,7 @@ lpfc_mbx_process_link_up(struct lpfc_vport *vport, READ_LA_VAR *la)
                        mempool_free(sparam_mbox, phba->mbox_mem_pool);
                        if (cfglink_mbox)
                                mempool_free(cfglink_mbox, phba->mbox_mem_pool);
-                       return;
+                       goto out;
                }
        }
 
@@ -825,10 +1041,18 @@ lpfc_mbx_process_link_up(struct lpfc_vport *vport, READ_LA_VAR *la)
                cfglink_mbox->vport = vport;
                cfglink_mbox->mbox_cmpl = lpfc_mbx_cmpl_local_config_link;
                rc = lpfc_sli_issue_mbox(phba, cfglink_mbox,
-                                               (MBX_NOWAIT | MBX_STOP_IOCB));
-               if (rc == MBX_NOT_FINISHED)
-                       mempool_free(cfglink_mbox, phba->mbox_mem_pool);
+                                   (MBX_NOWAIT | MBX_STOP_IOCB));
+               if (rc != MBX_NOT_FINISHED)
+                       return;
+               mempool_free(cfglink_mbox, phba->mbox_mem_pool);
        }
+out:
+       lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+       lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
+                        "0263 Discovery Mailbox error: state: 0x%x : %p %p\n",
+                        vport->port_state, sparam_mbox, cfglink_mbox);
+       lpfc_issue_clear_la(phba, vport);
+       return;
 }
 
 static void
@@ -867,8 +1091,8 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        /* Check for error */
        if (mb->mbxStatus) {
                lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
-                               "%d:1307 READ_LA mbox error x%x state x%x\n",
-                               phba->brd_no, mb->mbxStatus, vport->port_state);
+                               "1307 READ_LA mbox error x%x state x%x\n",
+                               mb->mbxStatus, vport->port_state);
                lpfc_mbx_issue_link_down(phba);
                phba->link_state = LPFC_HBA_ERROR;
                goto lpfc_mbx_cmpl_read_la_free_mbuf;
@@ -886,12 +1110,12 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        spin_unlock_irq(shost->host_lock);
 
        if (((phba->fc_eventTag + 1) < la->eventTag) ||
-            (phba->fc_eventTag == la->eventTag)) {
+           (phba->fc_eventTag == la->eventTag)) {
                phba->fc_stat.LinkMultiEvent++;
                if (la->attType == AT_LINK_UP)
                        if (phba->fc_eventTag != 0)
                                lpfc_linkdown(phba);
-               }
+       }
 
        phba->fc_eventTag = la->eventTag;
 
@@ -899,26 +1123,26 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
                phba->fc_stat.LinkUp++;
                if (phba->link_flag & LS_LOOPBACK_MODE) {
                        lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
-                               "%d:1306 Link Up Event in loop back mode "
-                               "x%x received Data: x%x x%x x%x x%x\n",
-                               phba->brd_no, la->eventTag, phba->fc_eventTag,
-                               la->granted_AL_PA, la->UlnkSpeed,
-                               phba->alpa_map[0]);
+                                       "1306 Link Up Event in loop back mode "
+                                       "x%x received Data: x%x x%x x%x x%x\n",
+                                       la->eventTag, phba->fc_eventTag,
+                                       la->granted_AL_PA, la->UlnkSpeed,
+                                       phba->alpa_map[0]);
                } else {
                        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
-                               "%d:1303 Link Up Event x%x received "
-                               "Data: x%x x%x x%x x%x\n",
-                               phba->brd_no, la->eventTag, phba->fc_eventTag,
-                               la->granted_AL_PA, la->UlnkSpeed,
-                               phba->alpa_map[0]);
+                                       "1303 Link Up Event x%x received "
+                                       "Data: x%x x%x x%x x%x\n",
+                                       la->eventTag, phba->fc_eventTag,
+                                       la->granted_AL_PA, la->UlnkSpeed,
+                                       phba->alpa_map[0]);
                }
-               lpfc_mbx_process_link_up(vport, la);
+               lpfc_mbx_process_link_up(phba, la);
        } else {
                phba->fc_stat.LinkDown++;
                lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
-                               "%d:1305 Link Down Event x%x received "
+                               "1305 Link Down Event x%x received "
                                "Data: x%x x%x x%x\n",
-                               phba->brd_no, la->eventTag, phba->fc_eventTag,
+                               la->eventTag, phba->fc_eventTag,
                                phba->pport->port_state, vport->fc_flag);
                lpfc_mbx_issue_link_down(phba);
        }
@@ -940,7 +1164,7 @@ void
 lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
        struct lpfc_vport  *vport = pmb->vport;
-       struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) pmb->context1;
+       struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);
        struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;
 
        pmb->context1 = NULL;
@@ -955,6 +1179,95 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        return;
 }
 
+static void
+lpfc_mbx_cmpl_unreg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+       MAILBOX_t *mb = &pmb->mb;
+       struct lpfc_vport *vport = pmb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+
+       switch (mb->mbxStatus) {
+       case 0x0011:
+       case 0x0020:
+       case 0x9700:
+               lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                                "0911 cmpl_unreg_vpi, mb status = 0x%x\n",
+                                mb->mbxStatus);
+               break;
+       }
+       vport->unreg_vpi_cmpl = VPORT_OK;
+       mempool_free(pmb, phba->mbox_mem_pool);
+       /*
+        * This shost reference might have been taken at the beginning of
+        * lpfc_vport_delete()
+        */
+       if (vport->load_flag & FC_UNLOADING)
+               scsi_host_put(shost);
+}
+
+void
+lpfc_mbx_unreg_vpi(struct lpfc_vport *vport)
+{
+       struct lpfc_hba  *phba = vport->phba;
+       LPFC_MBOXQ_t *mbox;
+       int rc;
+
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!mbox)
+               return;
+
+       lpfc_unreg_vpi(phba, vport->vpi, mbox);
+       mbox->vport = vport;
+       mbox->mbox_cmpl = lpfc_mbx_cmpl_unreg_vpi;
+       rc = lpfc_sli_issue_mbox(phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB));
+       if (rc == MBX_NOT_FINISHED) {
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX | LOG_VPORT,
+                                "1800 Could not issue unreg_vpi\n");
+               mempool_free(mbox, phba->mbox_mem_pool);
+               vport->unreg_vpi_cmpl = VPORT_ERROR;
+       }
+}
+
+static void
+lpfc_mbx_cmpl_reg_vpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+{
+       struct lpfc_vport *vport = pmb->vport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       MAILBOX_t *mb = &pmb->mb;
+
+       switch (mb->mbxStatus) {
+       case 0x0011:
+       case 0x9601:
+       case 0x9602:
+               lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                                "0912 cmpl_reg_vpi, mb status = 0x%x\n",
+                                mb->mbxStatus);
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~(FC_FABRIC | FC_PUBLIC_LOOP);
+               spin_unlock_irq(shost->host_lock);
+               vport->fc_myDID = 0;
+               goto out;
+       }
+
+       vport->num_disc_nodes = 0;
+       /* go thru NPR list and issue ELS PLOGIs */
+       if (vport->fc_npr_cnt)
+               lpfc_els_disc_plogi(vport);
+
+       if (!vport->num_disc_nodes) {
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~FC_NDISC_ACTIVE;
+               spin_unlock_irq(shost->host_lock);
+               lpfc_can_disctmo(vport);
+       }
+       vport->port_state = LPFC_VPORT_READY;
+
+out:
+       mempool_free(pmb, phba->mbox_mem_pool);
+       return;
+}
+
 /*
  * This routine handles processing a Fabric REG_LOGIN mailbox
  * command upon completion. It is setup in the LPFC_MBOXQ
@@ -964,26 +1277,35 @@ lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 void
 lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 {
-       struct lpfc_vport  *vport = pmb->vport;
+       struct lpfc_vport *vport = pmb->vport;
        MAILBOX_t *mb = &pmb->mb;
        struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);
-       struct lpfc_nodelist *ndlp, *ndlp_fdmi;
-       ndlp = (struct lpfc_nodelist *) pmb->context2;
+       struct lpfc_nodelist *ndlp;
+       struct lpfc_vport **vports;
+       int i;
 
+       ndlp = (struct lpfc_nodelist *) pmb->context2;
        pmb->context1 = NULL;
        pmb->context2 = NULL;
-
        if (mb->mbxStatus) {
                lpfc_mbuf_free(phba, mp->virt, mp->phys);
                kfree(mp);
                mempool_free(pmb, phba->mbox_mem_pool);
                lpfc_nlp_put(ndlp);
 
-               /* FLOGI failed, so just use loop map to make discovery list */
-               lpfc_disc_list_loopmap(vport);
+               if (phba->fc_topology == TOPOLOGY_LOOP) {
+                       /* FLOGI failed, use loop map to make discovery list */
+                       lpfc_disc_list_loopmap(vport);
 
-               /* Start discovery */
-               lpfc_disc_start(vport);
+                       /* Start discovery */
+                       lpfc_disc_start(vport);
+                       return;
+               }
+
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,
+                                "0258 Register Fabric login error: 0x%x\n",
+                                mb->mbxStatus);
                return;
        }
 
@@ -994,47 +1316,27 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        lpfc_nlp_put(ndlp);     /* Drop the reference from the mbox */
 
        if (vport->port_state == LPFC_FABRIC_CFG_LINK) {
-               /* This NPort has been assigned an NPort_ID by the fabric as a
-                * result of the completed fabric login.  Issue a State Change
-                * Registration (SCR) ELS request to the fabric controller
-                * (SCR_DID) so that this NPort gets RSCN events from the
-                * fabric.
-                */
-               lpfc_issue_els_scr(vport, SCR_DID, 0);
-
-               ndlp = lpfc_findnode_did(vport, NameServer_DID);
-               if (!ndlp) {
-                       /* Allocate a new node instance.  If the pool is empty,
-                        * start the discovery process and skip the Nameserver
-                        * login process.  This is attempted again later on.
-                        * Otherwise, issue a Port Login (PLOGI) to
-                        * the NameServer
-                        */
-                       ndlp = mempool_alloc(phba->nlp_mem_pool, GFP_KERNEL);
-                       if (!ndlp) {
-                               lpfc_disc_start(vport);
-                               lpfc_mbuf_free(phba, mp->virt, mp->phys);
-                               kfree(mp);
-                               mempool_free(pmb, phba->mbox_mem_pool);
-                               return;
-                       } else {
-                               lpfc_nlp_init(vport, ndlp, NameServer_DID);
-                               ndlp->nlp_type |= NLP_FABRIC;
-                       }
-               }
-
-               lpfc_nlp_set_state(vport, ndlp, NLP_STE_PLOGI_ISSUE);
-               lpfc_issue_els_plogi(vport, NameServer_DID, 0);
-               if (phba->cfg_fdmi_on) {
-                       ndlp_fdmi = mempool_alloc(phba->nlp_mem_pool,
-                                                 GFP_KERNEL);
-                       if (ndlp_fdmi) {
-                               lpfc_nlp_init(vport, ndlp_fdmi, FDMI_DID);
-                               ndlp_fdmi->nlp_type |= NLP_FABRIC;
-                               ndlp_fdmi->nlp_state = NLP_STE_PLOGI_ISSUE;
-                               lpfc_issue_els_plogi(vport, FDMI_DID, 0);
+               vports = lpfc_create_vport_work_array(phba);
+               if (vports != NULL)
+                       for(i = 0;
+                           i < LPFC_MAX_VPORTS && vports[i] != NULL;
+                           i++) {
+                               if (vports[i]->port_type == LPFC_PHYSICAL_PORT)
+                                       continue;
+                               if (phba->link_flag & LS_NPIV_FAB_SUPPORTED)
+                                       lpfc_initial_fdisc(vports[i]);
+                               else if (phba->sli3_options &
+                                               LPFC_SLI3_NPIV_ENABLED) {
+                                       lpfc_vport_set_state(vports[i],
+                                               FC_VPORT_NO_FABRIC_SUPP);
+                                       lpfc_printf_vlog(vport, KERN_ERR,
+                                                        LOG_ELS,
+                                                       "0259 No NPIV "
+                                                       "Fabric support\n");
+                               }
                        }
-               }
+               lpfc_destroy_vport_work_array(vports);
+               lpfc_do_scr_ns_plogi(phba, vport);
        }
 
        lpfc_mbuf_free(phba, mp->virt, mp->phys);
@@ -1058,20 +1360,28 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
        struct lpfc_vport *vport = pmb->vport;
 
        if (mb->mbxStatus) {
+out:
                lpfc_nlp_put(ndlp);
                lpfc_mbuf_free(phba, mp->virt, mp->phys);
                kfree(mp);
                mempool_free(pmb, phba->mbox_mem_pool);
                lpfc_drop_node(vport, ndlp);
 
-               /*
-                * RegLogin failed, so just use loop map to make discovery
-                * list
-                */
-               lpfc_disc_list_loopmap(vport);
+               if (phba->fc_topology == TOPOLOGY_LOOP) {
+                       /*
+                        * RegLogin failed, use loop map to make discovery
+                        * list
+                        */
+                       lpfc_disc_list_loopmap(vport);
 
-               /* Start discovery */
-               lpfc_disc_start(vport);
+                       /* Start discovery */
+                       lpfc_disc_start(vport);
+                       return;
+               }
+               lpfc_vport_set_state(vport, FC_VPORT_FAILED);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
+                                "0260 Register NameServer error: 0x%x\n",
+                                mb->mbxStatus);
                return;
        }
 
@@ -1083,17 +1393,21 @@ lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 
        if (vport->port_state < LPFC_VPORT_READY) {
                /* Link up discovery requires Fabric registration. */
-               lpfc_ns_cmd(vport, ndlp, SLI_CTNS_RNN_ID);
-               lpfc_ns_cmd(vport, ndlp, SLI_CTNS_RSNN_NN);
-               lpfc_ns_cmd(vport, ndlp, SLI_CTNS_RFT_ID);
-               lpfc_ns_cmd(vport, ndlp, SLI_CTNS_RFF_ID);
+               lpfc_ns_cmd(vport, SLI_CTNS_RFF_ID, 0, 0); /* Do this first! */
+               lpfc_ns_cmd(vport, SLI_CTNS_RNN_ID, 0, 0);
+               lpfc_ns_cmd(vport, SLI_CTNS_RSNN_NN, 0, 0);
+               lpfc_ns_cmd(vport, SLI_CTNS_RSPN_ID, 0, 0);
+               lpfc_ns_cmd(vport, SLI_CTNS_RFT_ID, 0, 0);
+
+               /* Issue SCR just before NameServer GID_FT Query */
+               lpfc_issue_els_scr(vport, SCR_DID, 0);
        }
 
        vport->fc_ns_retry = 0;
        /* Good status, issue CT Request to NameServer */
-       if (lpfc_ns_cmd(vport, ndlp, SLI_CTNS_GID_FT)) {
+       if (lpfc_ns_cmd(vport, SLI_CTNS_GID_FT, 0, 0)) {
                /* Cannot issue NameServer Query, so finish up discovery */
-               lpfc_disc_start(vport);
+               goto out;
        }
 
        lpfc_nlp_put(ndlp);
@@ -1127,9 +1441,14 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         * registered the port.
         */
        if (ndlp->rport && ndlp->rport->dd_data &&
-           *(struct lpfc_rport_data **) ndlp->rport->dd_data) {
+           ((struct lpfc_rport_data *) ndlp->rport->dd_data)->pnode == ndlp) {
                lpfc_nlp_put(ndlp);
        }
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_RPORT,
+               "rport add:       did:x%x flg:x%x type x%x",
+               ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);
+
        ndlp->rport = rport = fc_remote_port_add(shost, 0, &rport_ids);
        if (!rport || !get_device(&rport->dev)) {
                dev_printk(KERN_WARNING, &phba->pcidev->dev,
@@ -1153,10 +1472,9 @@ lpfc_register_remote_port(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
                fc_remote_port_rolechg(rport, rport_ids.roles);
 
        if ((rport->scsi_target_id != -1) &&
-               (rport->scsi_target_id < LPFC_MAX_TARGET)) {
+           (rport->scsi_target_id < LPFC_MAX_TARGET)) {
                ndlp->nlp_sid = rport->scsi_target_id;
        }
-
        return;
 }
 
@@ -1164,14 +1482,10 @@ static void
 lpfc_unregister_remote_port(struct lpfc_nodelist *ndlp)
 {
        struct fc_rport *rport = ndlp->rport;
-       struct lpfc_rport_data *rdata = rport->dd_data;
 
-       if (rport->scsi_target_id == -1) {
-               ndlp->rport = NULL;
-               rdata->pnode = NULL;
-               lpfc_nlp_put(ndlp);
-               put_device(&rport->dev);
-       }
+       lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_RPORT,
+               "rport delete:    did:x%x flg:x%x type x%x",
+               ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);
 
        fc_remote_port_delete(rport);
 
@@ -1239,20 +1553,19 @@ lpfc_nlp_state_cleanup(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        if (new_state ==  NLP_STE_MAPPED_NODE ||
            new_state == NLP_STE_UNMAPPED_NODE) {
                vport->phba->nport_event_cnt++;
-                       /*
-                        * Tell the fc transport about the port, if we haven't
-                        * already. If we have, and it's a scsi entity, be
-                        * sure to unblock any attached scsi devices
-                        */
-                       lpfc_register_remote_port(vport, ndlp);
+               /*
+                * Tell the fc transport about the port, if we haven't
+                * already. If we have, and it's a scsi entity, be
+                * sure to unblock any attached scsi devices
+                */
+               lpfc_register_remote_port(vport, ndlp);
        }
-
-                       /*
-                        * if we added to Mapped list, but the remote port
-                        * registration failed or assigned a target id outside
-                        * our presentable range - move the node to the
-                        * Unmapped List
-                        */
+       /*
+        * if we added to Mapped list, but the remote port
+        * registration failed or assigned a target id outside
+        * our presentable range - move the node to the
+        * Unmapped List
+        */
        if (new_state == NLP_STE_MAPPED_NODE &&
            (!ndlp->rport ||
             ndlp->rport->scsi_target_id == -1 ||
@@ -1278,7 +1591,7 @@ lpfc_nlp_state_name(char *buffer, size_t size, int state)
                [NLP_STE_NPR_NODE] = "NPR",
        };
 
-       if (state < ARRAY_SIZE(states) && states[state])
+       if (state < NLP_STE_MAX_STATE && states[state])
                strlcpy(buffer, states[state], size);
        else
                snprintf(buffer, size, "unknown (%d)", state);
@@ -1293,12 +1606,16 @@ lpfc_nlp_set_state(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        int  old_state = ndlp->nlp_state;
        char name1[16], name2[16];
 
-       lpfc_printf_log(vport->phba, KERN_INFO, LOG_NODE,
-                       "%d:0904 NPort state transition x%06x, %s -> %s\n",
-                       vport->phba->brd_no,
-                       ndlp->nlp_DID,
-                       lpfc_nlp_state_name(name1, sizeof(name1), old_state),
-                       lpfc_nlp_state_name(name2, sizeof(name2), state));
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                        "0904 NPort state transition x%06x, %s -> %s\n",
+                        ndlp->nlp_DID,
+                        lpfc_nlp_state_name(name1, sizeof(name1), old_state),
+                        lpfc_nlp_state_name(name2, sizeof(name2), state));
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_NODE,
+               "node statechg    did:x%x old:%d ste:%d",
+               ndlp->nlp_DID, old_state, state);
+
        if (old_state == NLP_STE_NPR_NODE &&
            (ndlp->nlp_flag & NLP_DELAY_TMO) != 0 &&
            state != NLP_STE_NPR_NODE)
@@ -1332,21 +1649,14 @@ lpfc_dequeue_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        spin_lock_irq(shost->host_lock);
        list_del_init(&ndlp->nlp_listp);
        spin_unlock_irq(shost->host_lock);
-       lpfc_nlp_state_cleanup(vport, ndlp, ndlp->nlp_state, 0);
+       lpfc_nlp_state_cleanup(vport, ndlp, ndlp->nlp_state,
+                              NLP_STE_UNUSED_NODE);
 }
 
 void
 lpfc_drop_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 {
-       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
-
-       if ((ndlp->nlp_flag & NLP_DELAY_TMO) != 0)
-               lpfc_cancel_retry_delay_tmo(vport, ndlp);
-       if (ndlp->nlp_state && !list_empty(&ndlp->nlp_listp))
-               lpfc_nlp_counters(vport, ndlp->nlp_state, -1);
-       spin_lock_irq(shost->host_lock);
-       list_del_init(&ndlp->nlp_listp);
-       spin_unlock_irq(shost->host_lock);
+       lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNUSED_NODE);
        lpfc_nlp_put(ndlp);
 }
 
@@ -1370,18 +1680,25 @@ lpfc_set_disctmo(struct lpfc_vport *vport)
                tmo = ((phba->fc_ratov * 3) + 3);
        }
 
+
+       if (!timer_pending(&vport->fc_disctmo)) {
+               lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
+                       "set disc timer:  tmo:x%x state:x%x flg:x%x",
+                       tmo, vport->port_state, vport->fc_flag);
+       }
+
        mod_timer(&vport->fc_disctmo, jiffies + HZ * tmo);
        spin_lock_irq(shost->host_lock);
        vport->fc_flag |= FC_DISC_TMO;
        spin_unlock_irq(shost->host_lock);
 
        /* Start Discovery Timer state <hba_state> */
-       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                       "%d:0247 Start Discovery Timer state x%x "
-                       "Data: x%x x%lx x%x x%x\n",
-                       phba->brd_no, vport->port_state, tmo,
-                       (unsigned long)&vport->fc_disctmo, vport->fc_plogi_cnt,
-                       vport->fc_adisc_cnt);
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0247 Start Discovery Timer state x%x "
+                        "Data: x%x x%lx x%x x%x\n",
+                        vport->port_state, tmo,
+                        (unsigned long)&vport->fc_disctmo, vport->fc_plogi_cnt,
+                        vport->fc_adisc_cnt);
 
        return;
 }
@@ -1393,9 +1710,12 @@ int
 lpfc_can_disctmo(struct lpfc_vport *vport)
 {
        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
-       struct lpfc_hba  *phba = vport->phba;
        unsigned long iflags;
 
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
+               "can disc timer:  state:x%x rtry:x%x flg:x%x",
+               vport->port_state, vport->fc_ns_retry, vport->fc_flag);
+
        /* Turn off discovery timer if its running */
        if (vport->fc_flag & FC_DISC_TMO) {
                spin_lock_irqsave(shost->host_lock, iflags);
@@ -1408,12 +1728,11 @@ lpfc_can_disctmo(struct lpfc_vport *vport)
        }
 
        /* Cancel Discovery Timer state <hba_state> */
-       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                       "%d:0248 Cancel Discovery Timer state x%x "
-                       "Data: x%x x%x x%x\n",
-                       phba->brd_no, vport->port_state, vport->fc_flag,
-                       vport->fc_plogi_cnt, vport->fc_adisc_cnt);
-
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0248 Cancel Discovery Timer state x%x "
+                        "Data: x%x x%x x%x\n",
+                        vport->port_state, vport->fc_flag,
+                        vport->fc_plogi_cnt, vport->fc_adisc_cnt);
        return 0;
 }
 
@@ -1429,6 +1748,11 @@ lpfc_check_sli_ndlp(struct lpfc_hba *phba,
 {
        struct lpfc_sli *psli = &phba->sli;
        IOCB_t *icmd = &iocb->iocb;
+       struct lpfc_vport    *vport = ndlp->vport;
+
+       if (iocb->vport != vport)
+               return 0;
+
        if (pring->ringno == LPFC_ELS_RING) {
                switch (icmd->ulpCommand) {
                case CMD_GEN_REQUEST64_CR:
@@ -1446,7 +1770,7 @@ lpfc_check_sli_ndlp(struct lpfc_hba *phba,
        } else if (pring->ringno == psli->fcp_ring) {
                /* Skip match check if waiting to relogin to FCP target */
                if ((ndlp->nlp_type & NLP_FCP_TARGET) &&
-                 (ndlp->nlp_flag & NLP_DELAY_TMO)) {
+                   (ndlp->nlp_flag & NLP_DELAY_TMO)) {
                        return 0;
                }
                if (icmd->ulpContext == (volatile ushort)ndlp->nlp_rpi) {
@@ -1472,6 +1796,8 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
        IOCB_t *icmd;
        uint32_t rpi, i;
 
+       lpfc_fabric_abort_nport(ndlp);
+
        /*
         * Everything that matches on txcmplq will be returned
         * by firmware with a no rpi error.
@@ -1490,8 +1816,8 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
                                 * Check to see if iocb matches the nport we are
                                 * looking for
                                 */
-                               if ((lpfc_check_sli_ndlp
-                                    (phba, pring, iocb, ndlp))) {
+                               if ((lpfc_check_sli_ndlp(phba, pring, iocb,
+                                                        ndlp))) {
                                        /* It matches, so deque and call compl
                                           with an error */
                                        list_move_tail(&iocb->list,
@@ -1505,7 +1831,7 @@ lpfc_no_rpi(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 
        while (!list_empty(&completions)) {
                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
-               list_del(&iocb->list);
+               list_del_init(&iocb->list);
 
                if (!iocb->iocb_cmpl)
                        lpfc_sli_release_iocbq(phba, iocb);
@@ -1539,11 +1865,11 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        if (ndlp->nlp_rpi) {
                mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
                if (mbox) {
-                       lpfc_unreg_login(phba, ndlp->nlp_rpi, mbox);
+                       lpfc_unreg_login(phba, vport->vpi, ndlp->nlp_rpi, mbox);
                        mbox->vport = vport;
-                       mbox->mbox_cmpl=lpfc_sli_def_mbox_cmpl;
-                       rc = lpfc_sli_issue_mbox
-                                   (phba, mbox, (MBX_NOWAIT | MBX_STOP_IOCB));
+                       mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+                       rc = lpfc_sli_issue_mbox(phba, mbox,
+                                                (MBX_NOWAIT | MBX_STOP_IOCB));
                        if (rc == MBX_NOT_FINISHED)
                                mempool_free(mbox, phba->mbox_mem_pool);
                }
@@ -1554,6 +1880,49 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        return 0;
 }
 
+void
+lpfc_unreg_all_rpis(struct lpfc_vport *vport)
+{
+       struct lpfc_hba  *phba  = vport->phba;
+       LPFC_MBOXQ_t     *mbox;
+       int rc;
+
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (mbox) {
+               lpfc_unreg_login(phba, vport->vpi, 0xffff, mbox);
+               mbox->vport = vport;
+               mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+               rc = lpfc_sli_issue_mbox(phba, mbox,
+                                        (MBX_NOWAIT | MBX_STOP_IOCB));
+               if (rc == MBX_NOT_FINISHED) {
+                       mempool_free(mbox, phba->mbox_mem_pool);
+               }
+       }
+}
+
+void
+lpfc_unreg_default_rpis(struct lpfc_vport *vport)
+{
+       struct lpfc_hba  *phba  = vport->phba;
+       LPFC_MBOXQ_t     *mbox;
+       int rc;
+
+       mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (mbox) {
+               lpfc_unreg_did(phba, vport->vpi, 0xffffffff, mbox);
+               mbox->vport = vport;
+               mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+               rc = lpfc_sli_issue_mbox(phba, mbox,
+                                        (MBX_NOWAIT | MBX_STOP_IOCB));
+               if (rc == MBX_NOT_FINISHED) {
+                       lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX | LOG_VPORT,
+                                        "1815 Could not issue "
+                                        "unreg_did (default rpis)\n");
+                       mempool_free(mbox, phba->mbox_mem_pool);
+               }
+       }
+}
+
 /*
  * Free resources associated with LPFC_NODELIST entry
  * so it can be freed.
@@ -1567,12 +1936,11 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        struct lpfc_dmabuf *mp;
 
        /* Cleanup node for NPort <nlp_DID> */
-       lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
-                       "%d:0900 Cleanup node for 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(vport, KERN_INFO, LOG_NODE,
+                        "0900 Cleanup node for NPort x%x "
+                        "Data: x%x x%x x%x\n",
+                        ndlp->nlp_DID, ndlp->nlp_flag,
+                        ndlp->nlp_state, ndlp->nlp_rpi);
        lpfc_dequeue_node(vport, ndlp);
 
        /* cleanup any ndlp on mbox q waiting for reglogin cmpl */
@@ -1587,7 +1955,7 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        spin_lock_irq(&phba->hbalock);
        list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {
                if ((mb->mb.mbxCommand == MBX_REG_LOGIN64) &&
-                  (ndlp == (struct lpfc_nodelist *) mb->context2)) {
+                   (ndlp == (struct lpfc_nodelist *) mb->context2)) {
                        mp = (struct lpfc_dmabuf *) (mb->context1);
                        if (mp) {
                                __lpfc_mbuf_free(phba, mp->virt, mp->phys);
@@ -1610,6 +1978,13 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 
        if (!list_empty(&ndlp->els_retry_evt.evt_listp))
                list_del_init(&ndlp->els_retry_evt.evt_listp);
+       if (!list_empty(&ndlp->dev_loss_evt.evt_listp))
+               list_del_init(&ndlp->dev_loss_evt.evt_listp);
+
+       if (!list_empty(&ndlp->dev_loss_evt.evt_listp)) {
+               list_del_init(&ndlp->dev_loss_evt.evt_listp);
+               complete((struct completion *)(ndlp->dev_loss_evt.evt_arg2));
+       }
 
        lpfc_unreg_rpi(vport, ndlp);
 
@@ -1633,12 +2008,11 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
        lpfc_cleanup_node(vport, ndlp);
 
        /*
-        * We should never get here with a non-NULL ndlp->rport.  But
-        * if we do, drop the reference to the rport.  That seems the
-        * intelligent thing to do.
+        * We can get here with a non-NULL ndlp->rport because when we
+        * unregister a rport we don't break the rport/node linkage.  So if we
+        * do, make sure we don't leaving any dangling pointers behind.
         */
-       if (ndlp->rport && !(vport->load_flag & FC_UNLOADING)) {
-               put_device(&ndlp->rport->dev);
+       if (ndlp->rport) {
                rdata = ndlp->rport->dd_data;
                rdata->pnode = NULL;
                ndlp->rport = NULL;
@@ -1698,7 +2072,6 @@ lpfc_matchdid(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 static struct lpfc_nodelist *
 __lpfc_findnode_did(struct lpfc_vport *vport, uint32_t did)
 {
-       struct lpfc_hba  *phba = vport->phba;
        struct lpfc_nodelist *ndlp;
        uint32_t data1;
 
@@ -1708,20 +2081,18 @@ __lpfc_findnode_did(struct lpfc_vport *vport, uint32_t did)
                                 ((uint32_t) ndlp->nlp_xri << 16) |
                                 ((uint32_t) ndlp->nlp_type << 8) |
                                 ((uint32_t) ndlp->nlp_rpi & 0xff));
-                       lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
-                                       "%d:0929 FIND node DID "
-                                       " Data: x%p x%x x%x x%x\n",
-                                       phba->brd_no,
-                                       ndlp, ndlp->nlp_DID,
-                                       ndlp->nlp_flag, data1);
+                       lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                                        "0929 FIND node DID "
+                                        "Data: x%p x%x x%x x%x\n",
+                                        ndlp, ndlp->nlp_DID,
+                                        ndlp->nlp_flag, data1);
                        return ndlp;
                }
        }
 
        /* FIND node did <did> NOT FOUND */
-       lpfc_printf_log(phba, KERN_INFO, LOG_NODE,
-                       "%d:0932 FIND node did x%x NOT FOUND.\n",
-                       phba->brd_no, did);
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_NODE,
+                        "0932 FIND node did x%x NOT FOUND.\n", did);
        return NULL;
 }
 
@@ -1812,7 +2183,7 @@ lpfc_disc_list_loopmap(struct lpfc_vport *vport)
                        /* If cfg_scan_down is set, start from highest
                         * ALPA (0xef) to lowest (0x1).
                         */
-                       if (phba->cfg_scan_down)
+                       if (vport->cfg_scan_down)
                                index = j;
                        else
                                index = FC_MAXLOOP - j - 1;
@@ -1835,6 +2206,14 @@ lpfc_issue_clear_la(struct lpfc_hba *phba, struct lpfc_vport *vport)
        struct lpfc_sli_ring *next_ring  = &psli->ring[psli->next_ring];
        int  rc;
 
+       /*
+        * if it's not a physical port or if we already send
+        * clear_la then don't send it.
+        */
+       if ((phba->link_state >= LPFC_CLEAR_LA) ||
+           (vport->port_type != LPFC_PHYSICAL_PORT))
+               return;
+
                        /* Link up discovery */
        if ((mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL)) != NULL) {
                phba->link_state = LPFC_CLEAR_LA;
@@ -1849,7 +2228,26 @@ lpfc_issue_clear_la(struct lpfc_hba *phba, struct lpfc_vport *vport)
                        extra_ring->flag &= ~LPFC_STOP_IOCB_EVENT;
                        fcp_ring->flag &= ~LPFC_STOP_IOCB_EVENT;
                        next_ring->flag &= ~LPFC_STOP_IOCB_EVENT;
-                       vport->port_state = LPFC_VPORT_READY;
+                       phba->link_state = LPFC_HBA_ERROR;
+               }
+       }
+}
+
+/* Reg_vpi to tell firmware to resume normal operations */
+void
+lpfc_issue_reg_vpi(struct lpfc_hba *phba, struct lpfc_vport *vport)
+{
+       LPFC_MBOXQ_t *regvpimbox;
+
+       regvpimbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (regvpimbox) {
+               lpfc_reg_vpi(phba, vport->vpi, vport->fc_myDID, regvpimbox);
+               regvpimbox->mbox_cmpl = lpfc_mbx_cmpl_reg_vpi;
+               regvpimbox->vport = vport;
+               if (lpfc_sli_issue_mbox(phba, regvpimbox,
+                                       (MBX_NOWAIT | MBX_STOP_IOCB))
+                                       == MBX_NOT_FINISHED) {
+                       mempool_free(regvpimbox, phba->mbox_mem_pool);
                }
        }
 }
@@ -1860,7 +2258,6 @@ lpfc_disc_start(struct lpfc_vport *vport)
 {
        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
        struct lpfc_hba  *phba = vport->phba;
-       struct lpfc_nodelist *ndlp, *next_ndlp;
        uint32_t num_sent;
        uint32_t clear_la_pending;
        int did_changed;
@@ -1887,22 +2284,11 @@ lpfc_disc_start(struct lpfc_vport *vport)
        vport->num_disc_nodes = 0;
 
        /* Start Discovery state <hba_state> */
-       lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,
-                       "%d:0202 Start Discovery hba state x%x "
-                       "Data: x%x x%x x%x\n",
-                       phba->brd_no, vport->port_state, vport->fc_flag,
-                       vport->fc_plogi_cnt, vport->fc_adisc_cnt);
-
-       /* If our did changed, we MUST do PLOGI */
-       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
-               if (ndlp->nlp_state == NLP_STE_NPR_NODE &&
-                   (ndlp->nlp_flag & NLP_NPR_2B_DISC) != 0 &&
-                   did_changed) {
-                       spin_lock_irq(shost->host_lock);
-                       ndlp->nlp_flag &= ~NLP_NPR_ADISC;
-                       spin_unlock_irq(shost->host_lock);
-               }
-       }
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                        "0202 Start Discovery hba state x%x "
+                        "Data: x%x x%x x%x\n",
+                        vport->port_state, vport->fc_flag, vport->fc_plogi_cnt,
+                        vport->fc_adisc_cnt);
 
        /* First do ADISCs - if any */
        num_sent = lpfc_els_disc_adisc(vport);
@@ -1910,12 +2296,26 @@ lpfc_disc_start(struct lpfc_vport *vport)
        if (num_sent)
                return;
 
+       /*
+        * For SLI3, cmpl_reg_vpi will set port_state to READY, and
+        * continue discovery.
+        */
+       if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&
+           !(vport->fc_flag & FC_RSCN_MODE)) {
+               lpfc_issue_reg_vpi(phba, vport);
+               return;
+       }
+
+       /*
+        * For SLI2, we need to set port_state to READY and continue
+        * discovery.
+        */
        if (vport->port_state < LPFC_VPORT_READY && !clear_la_pending) {
-               if (vport->port_type == LPFC_PHYSICAL_PORT) {
                /* If we get here, there is nothing to ADISC */
+               if (vport->port_type == LPFC_PHYSICAL_PORT)
                        lpfc_issue_clear_la(phba, vport);
-               } else if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
 
+               if (!(vport->fc_flag & FC_ABORT_DISCOVERY)) {
                        vport->num_disc_nodes = 0;
                        /* go thru NPR nodes and issue ELS PLOGIs */
                        if (vport->fc_npr_cnt)
@@ -1925,9 +2325,10 @@ lpfc_disc_start(struct lpfc_vport *vport)
                                spin_lock_irq(shost->host_lock);
                                vport->fc_flag &= ~FC_NDISC_ACTIVE;
                                spin_unlock_irq(shost->host_lock);
+                               lpfc_can_disctmo(vport);
                        }
-                       vport->port_state = LPFC_VPORT_READY;
                }
+               vport->port_state = LPFC_VPORT_READY;
        } else {
                /* Next do PLOGIs - if any */
                num_sent = lpfc_els_disc_plogi(vport);
@@ -1944,6 +2345,7 @@ lpfc_disc_start(struct lpfc_vport *vport)
                                spin_lock_irq(shost->host_lock);
                                vport->fc_flag &= ~FC_RSCN_MODE;
                                spin_unlock_irq(shost->host_lock);
+                               lpfc_can_disctmo(vport);
                        } else
                                lpfc_els_handle_rscn(vport);
                }
@@ -1999,7 +2401,7 @@ lpfc_free_tx(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 
        while (!list_empty(&completions)) {
                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
-               list_del(&iocb->list);
+               list_del_init(&iocb->list);
 
                if (!iocb->iocb_cmpl)
                        lpfc_sli_release_iocbq(phba, iocb);
@@ -2030,6 +2432,14 @@ lpfc_disc_flush_list(struct lpfc_vport *vport)
        }
 }
 
+void
+lpfc_cleanup_discovery_resources(struct lpfc_vport *vport)
+{
+       lpfc_els_flush_rscn(vport);
+       lpfc_els_flush_cmd(vport);
+       lpfc_disc_flush_list(vport);
+}
+
 /*****************************************************************************/
 /*
  * NAME:     lpfc_disc_timeout
@@ -2060,8 +2470,10 @@ lpfc_disc_timeout(unsigned long ptr)
                vport->work_port_events |= WORKER_DISC_TMO;
                spin_unlock_irqrestore(&vport->work_port_lock, flags);
 
+               spin_lock_irqsave(&phba->hbalock, flags);
                if (phba->work_wait)
-                       wake_up(phba->work_wait);
+                       lpfc_worker_wake_up(phba);
+               spin_unlock_irqrestore(&phba->hbalock, flags);
        }
        return;
 }
@@ -2073,7 +2485,7 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
        struct lpfc_hba  *phba = vport->phba;
        struct lpfc_sli  *psli = &phba->sli;
        struct lpfc_nodelist *ndlp, *next_ndlp;
-       LPFC_MBOXQ_t    *clearlambox, *initlinkmbox;
+       LPFC_MBOXQ_t *initlinkmbox;
        int rc, clrlaerr = 0;
 
        if (!(vport->fc_flag & FC_DISC_TMO))
@@ -2083,6 +2495,10 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
        vport->fc_flag &= ~FC_DISC_TMO;
        spin_unlock_irq(shost->host_lock);
 
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,
+               "disc timeout:    state:x%x rtry:x%x flg:x%x",
+               vport->port_state, vport->fc_ns_retry, vport->fc_flag);
+
        switch (vport->port_state) {
 
        case LPFC_LOCAL_CFG_LINK:
@@ -2090,10 +2506,8 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
         * FAN
         */
                                /* FAN timeout */
-               lpfc_printf_log(phba, KERN_WARNING, LOG_DISCOVERY,
-                                "%d:0221 FAN timeout\n",
-                                phba->brd_no);
-
+               lpfc_printf_vlog(vport, KERN_WARNING, LOG_DISCOVERY,
+                                "0221 FAN timeout\n");
                /* Start discovery by sending FLOGI, clean up old rpis */
                list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes,
                                         nlp_listp) {
@@ -2109,17 +2523,20 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
                                lpfc_unreg_rpi(vport, ndlp);
                        }
                }
-               vport->port_state = LPFC_FLOGI;
-               lpfc_set_disctmo(vport);
-               lpfc_initial_flogi(vport);
+               if (vport->port_state != LPFC_FLOGI) {
+                       vport->port_state = LPFC_FLOGI;
+                       lpfc_set_disctmo(vport);
+                       lpfc_initial_flogi(vport);
+               }
                break;
 
+       case LPFC_FDISC:
        case LPFC_FLOGI:
        /* port_state is identically LPFC_FLOGI while waiting for FLOGI cmpl */
                /* Initial FLOGI timeout */
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                "%d:0222 Initial FLOGI timeout\n",
-                                phba->brd_no);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0222 Initial %s timeout\n",
+                                vport->vpi ? "FLOGI" : "FDISC");
 
                /* Assume no Fabric and go on with discovery.
                 * Check for outstanding ELS FLOGI to abort.
@@ -2135,10 +2552,9 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
        case LPFC_FABRIC_CFG_LINK:
        /* hba_state is identically LPFC_FABRIC_CFG_LINK while waiting for
           NameServer login */
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                               "%d:0223 Timeout while waiting for NameServer "
-                               "login\n", phba->brd_no);
-
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0223 Timeout while waiting for "
+                                "NameServer login\n");
                /* Next look for NameServer ndlp */
                ndlp = lpfc_findnode_did(vport, NameServer_DID);
                if (ndlp)
@@ -2149,54 +2565,39 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
 
        case LPFC_NS_QRY:
        /* Check for wait for NameServer Rsp timeout */
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                               "%d:0224 NameServer Query timeout "
-                               "Data: x%x x%x\n",
-                               phba->brd_no,
-                               vport->fc_ns_retry, LPFC_MAX_NS_RETRY);
-
-               ndlp = lpfc_findnode_did(vport, NameServer_DID);
-               if (ndlp && ndlp->nlp_state == NLP_STE_UNMAPPED_NODE) {
-                       if (vport->fc_ns_retry < LPFC_MAX_NS_RETRY) {
-                               /* Try it one more time */
-                               rc = lpfc_ns_cmd(vport, ndlp, SLI_CTNS_GID_FT);
-                               if (rc == 0)
-                                       break;
-                       }
-                       vport->fc_ns_retry = 0;
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0224 NameServer Query timeout "
+                                "Data: x%x x%x\n",
+                                vport->fc_ns_retry, LPFC_MAX_NS_RETRY);
+
+               if (vport->fc_ns_retry < LPFC_MAX_NS_RETRY) {
+                       /* Try it one more time */
+                       vport->fc_ns_retry++;
+                       rc = lpfc_ns_cmd(vport, SLI_CTNS_GID_FT,
+                                        vport->fc_ns_retry, 0);
+                       if (rc == 0)
+                               break;
                }
+               vport->fc_ns_retry = 0;
 
-               /* Nothing to authenticate, so CLEAR_LA right now */
-               clearlambox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-               if (!clearlambox) {
-                       clrlaerr = 1;
-                       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                       "%d:0226 Device Discovery "
-                                       "completion error\n",
-                                       phba->brd_no);
-                       phba->link_state = LPFC_HBA_ERROR;
-                       break;
-               }
-
-               phba->link_state = LPFC_CLEAR_LA;
-               lpfc_clear_la(phba, clearlambox);
-               clearlambox->mbox_cmpl = lpfc_mbx_cmpl_clear_la;
-               clearlambox->vport = vport;
-               rc = lpfc_sli_issue_mbox(phba, clearlambox,
-                                        (MBX_NOWAIT | MBX_STOP_IOCB));
-               if (rc == MBX_NOT_FINISHED) {
-                       mempool_free(clearlambox, phba->mbox_mem_pool);
-                       clrlaerr = 1;
-                       break;
+               /*
+                * Discovery is over.
+                * set port_state to PORT_READY if SLI2.
+                * cmpl_reg_vpi will set port_state to READY for SLI3.
+                */
+               if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)
+                       lpfc_issue_reg_vpi(phba, vport);
+               else  { /* NPIV Not enabled */
+                       lpfc_issue_clear_la(phba, vport);
+                       vport->port_state = LPFC_VPORT_READY;
                }
 
                /* Setup and issue mailbox INITIALIZE LINK command */
                initlinkmbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
                if (!initlinkmbox) {
-                       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                       "%d:0206 Device Discovery "
-                                       "completion error\n",
-                                       phba->brd_no);
+                       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                        "0206 Device Discovery "
+                                        "completion error\n");
                        phba->link_state = LPFC_HBA_ERROR;
                        break;
                }
@@ -2206,6 +2607,7 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
                               phba->cfg_link_speed);
                initlinkmbox->mb.un.varInitLnk.lipsr_AL_PA = 0;
                initlinkmbox->vport = vport;
+               initlinkmbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                rc = lpfc_sli_issue_mbox(phba, initlinkmbox,
                                         (MBX_NOWAIT | MBX_STOP_IOCB));
                lpfc_set_loopback_flag(phba);
@@ -2216,39 +2618,28 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
 
        case LPFC_DISC_AUTH:
        /* Node Authentication timeout */
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                "%d:0227 Node Authentication timeout\n",
-                                phba->brd_no);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0227 Node Authentication timeout\n");
                lpfc_disc_flush_list(vport);
 
-               clearlambox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-               if (!clearlambox) {
-                       clrlaerr = 1;
-                       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                       "%d:0207 Device Discovery "
-                                       "completion error\n",
-                                       phba->brd_no);
-                               phba->link_state = LPFC_HBA_ERROR;
-                       break;
-               }
-               phba->link_state = LPFC_CLEAR_LA;
-               lpfc_clear_la(phba, clearlambox);
-               clearlambox->mbox_cmpl = lpfc_mbx_cmpl_clear_la;
-               clearlambox->vport = vport;
-               rc = lpfc_sli_issue_mbox(phba, clearlambox,
-                                        (MBX_NOWAIT | MBX_STOP_IOCB));
-               if (rc == MBX_NOT_FINISHED) {
-                       mempool_free(clearlambox, phba->mbox_mem_pool);
-                       clrlaerr = 1;
+               /*
+                * set port_state to PORT_READY if SLI2.
+                * cmpl_reg_vpi will set port_state to READY for SLI3.
+                */
+               if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)
+                       lpfc_issue_reg_vpi(phba, vport);
+               else {  /* NPIV Not enabled */
+                       lpfc_issue_clear_la(phba, vport);
+                       vport->port_state = LPFC_VPORT_READY;
                }
                break;
 
        case LPFC_VPORT_READY:
                if (vport->fc_flag & FC_RSCN_MODE) {
-                       lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                                       "%d:0231 RSCN timeout Data: x%x x%x\n",
-                                       phba->brd_no,
-                                       vport->fc_ns_retry, LPFC_MAX_NS_RETRY);
+                       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                        "0231 RSCN timeout Data: x%x "
+                                        "x%x\n",
+                                        vport->fc_ns_retry, LPFC_MAX_NS_RETRY);
 
                        /* Cleanup any outstanding ELS commands */
                        lpfc_els_flush_cmd(vport);
@@ -2258,23 +2649,18 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
                }
                break;
 
-       case LPFC_STATE_UNKNOWN:
-       case LPFC_NS_REG:
-       case LPFC_BUILD_DISC_LIST:
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                               "%d:0229 Unexpected discovery timeout, vport "
-                               "State x%x\n",
-                               vport->port_state, phba->brd_no);
-
+       default:
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0229 Unexpected discovery timeout, "
+                                "vport State x%x\n", vport->port_state);
                break;
        }
 
        switch (phba->link_state) {
        case LPFC_CLEAR_LA:
-       /* CLEAR LA timeout */
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                               "%d:0228 CLEAR LA timeout\n",
-                               phba->brd_no);
+                               /* CLEAR LA timeout */
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0228 CLEAR LA timeout\n");
                clrlaerr = 1;
                break;
 
@@ -2285,12 +2671,14 @@ lpfc_disc_timeout_handler(struct lpfc_vport *vport)
        case LPFC_LINK_DOWN:
        case LPFC_LINK_UP:
        case LPFC_HBA_ERROR:
-               lpfc_printf_log(phba, KERN_ERR, LOG_DISCOVERY,
-                               "%d:0230 Unexpected timeout, hba link "
-                               "state x%x\n",
-                               phba->brd_no, phba->link_state);
+               lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                                "0230 Unexpected timeout, hba link "
+                                "state x%x\n", phba->link_state);
                clrlaerr = 1;
                break;
+
+       case LPFC_HBA_READY:
+               break;
        }
 
        if (clrlaerr) {
@@ -2330,7 +2718,7 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         * fdmi-on=2 (supporting RPA/hostnmae)
         */
 
-       if (phba->cfg_fdmi_on == 1)
+       if (vport->cfg_fdmi_on == 1)
                lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);
        else
                mod_timer(&vport->fc_fdmitmo, jiffies + HZ * 60);
@@ -2374,7 +2762,7 @@ __lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)
 
 /*
  * Search node lists for a remote port matching filter criteria
- * This routine is used when the caller does NOT have host_lock.
+ * Caller needs to hold host_lock before calling this routine.
  */
 struct lpfc_nodelist *
 lpfc_find_node(struct lpfc_vport *vport, node_filter filter, void *param)
@@ -2423,7 +2811,7 @@ lpfc_findnode_wwpn(struct lpfc_vport *vport, struct lpfc_name *wwpn)
        spin_lock_irq(shost->host_lock);
        ndlp = __lpfc_find_node(vport, lpfc_filter_by_wwpn, wwpn);
        spin_unlock_irq(shost->host_lock);
-       return NULL;
+       return ndlp;
 }
 
 void
@@ -2432,6 +2820,7 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
 {
        memset(ndlp, 0, sizeof (struct lpfc_nodelist));
        INIT_LIST_HEAD(&ndlp->els_retry_evt.evt_listp);
+       INIT_LIST_HEAD(&ndlp->dev_loss_evt.evt_listp);
        init_timer(&ndlp->nlp_delayfunc);
        ndlp->nlp_delayfunc.function = lpfc_els_retry_delay;
        ndlp->nlp_delayfunc.data = (unsigned long)ndlp;
@@ -2440,14 +2829,24 @@ lpfc_nlp_init(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
        ndlp->nlp_sid = NLP_NO_SID;
        INIT_LIST_HEAD(&ndlp->nlp_listp);
        kref_init(&ndlp->kref);
+
+       lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_NODE,
+               "node init:       did:x%x",
+               ndlp->nlp_DID, 0, 0);
+
        return;
 }
 
-void
+static void
 lpfc_nlp_release(struct kref *kref)
 {
        struct lpfc_nodelist *ndlp = container_of(kref, struct lpfc_nodelist,
                                                  kref);
+
+       lpfc_debugfs_disc_trc(ndlp->vport, LPFC_DISC_TRC_NODE,
+               "node release:    did:x%x flg:x%x type:x%x",
+               ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_type);
+
        lpfc_nlp_remove(ndlp->vport, ndlp);
        mempool_free(ndlp, ndlp->vport->phba->nlp_mem_pool);
 }