[SCSI] lpfc 8.1.2: Add ERROR and WARM_START modes for diagnostic purposes.

[powerpc.git] / drivers / scsi / lpfc / lpfc_nportdisc.c

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 507a6af..a580e1e 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -46,64 +46,85 @@ lpfc_check_adisc(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
         * table entry for that node.
         */
        if (memcmp(nn, &ndlp->nlp_nodename, sizeof (struct lpfc_name)) != 0)
-               return (0);
+               return 0;
 
        if (memcmp(pn, &ndlp->nlp_portname, sizeof (struct lpfc_name)) != 0)
-               return (0);
+               return 0;
 
        /* we match, return success */
-       return (1);
+       return 1;
 }
 
-
 int
 lpfc_check_sparm(struct lpfc_hba * phba,
                 struct lpfc_nodelist * ndlp, struct serv_parm * sp,
                 uint32_t class)
 {
        volatile struct serv_parm *hsp = &phba->fc_sparam;
-       /* First check for supported version */
-
-       /* Next check for class validity */
+       uint16_t hsp_value, ssp_value = 0;
+
+       /*
+        * The receive data field size and buffer-to-buffer receive data field
+        * size entries are 16 bits but are represented as two 8-bit fields in
+        * the driver data structure to account for rsvd bits and other control
+        * bits.  Reconstruct and compare the fields as a 16-bit values before
+        * correcting the byte values.
+        */
        if (sp->cls1.classValid) {
-
-               if (sp->cls1.rcvDataSizeMsb > hsp->cls1.rcvDataSizeMsb)
-                       sp->cls1.rcvDataSizeMsb = hsp->cls1.rcvDataSizeMsb;
-               if (sp->cls1.rcvDataSizeLsb > hsp->cls1.rcvDataSizeLsb)
+               hsp_value = (hsp->cls1.rcvDataSizeMsb << 8) |
+                               hsp->cls1.rcvDataSizeLsb;
+               ssp_value = (sp->cls1.rcvDataSizeMsb << 8) |
+                               sp->cls1.rcvDataSizeLsb;
+               if (ssp_value > hsp_value) {
                        sp->cls1.rcvDataSizeLsb = hsp->cls1.rcvDataSizeLsb;
+                       sp->cls1.rcvDataSizeMsb = hsp->cls1.rcvDataSizeMsb;
+               }
        } else if (class == CLASS1) {
-               return (0);
+               return 0;
        }
 
        if (sp->cls2.classValid) {
-
-               if (sp->cls2.rcvDataSizeMsb > hsp->cls2.rcvDataSizeMsb)
-                       sp->cls2.rcvDataSizeMsb = hsp->cls2.rcvDataSizeMsb;
-               if (sp->cls2.rcvDataSizeLsb > hsp->cls2.rcvDataSizeLsb)
+               hsp_value = (hsp->cls2.rcvDataSizeMsb << 8) |
+                               hsp->cls2.rcvDataSizeLsb;
+               ssp_value = (sp->cls2.rcvDataSizeMsb << 8) |
+                               sp->cls2.rcvDataSizeLsb;
+               if (ssp_value > hsp_value) {
                        sp->cls2.rcvDataSizeLsb = hsp->cls2.rcvDataSizeLsb;
+                       sp->cls2.rcvDataSizeMsb = hsp->cls2.rcvDataSizeMsb;
+               }
        } else if (class == CLASS2) {
-               return (0);
+               return 0;
        }
 
        if (sp->cls3.classValid) {
-
-               if (sp->cls3.rcvDataSizeMsb > hsp->cls3.rcvDataSizeMsb)
-                       sp->cls3.rcvDataSizeMsb = hsp->cls3.rcvDataSizeMsb;
-               if (sp->cls3.rcvDataSizeLsb > hsp->cls3.rcvDataSizeLsb)
+               hsp_value = (hsp->cls3.rcvDataSizeMsb << 8) |
+                               hsp->cls3.rcvDataSizeLsb;
+               ssp_value = (sp->cls3.rcvDataSizeMsb << 8) |
+                               sp->cls3.rcvDataSizeLsb;
+               if (ssp_value > hsp_value) {
                        sp->cls3.rcvDataSizeLsb = hsp->cls3.rcvDataSizeLsb;
+                       sp->cls3.rcvDataSizeMsb = hsp->cls3.rcvDataSizeMsb;
+               }
        } else if (class == CLASS3) {
-               return (0);
+               return 0;
        }
 
-       if (sp->cmn.bbRcvSizeMsb > hsp->cmn.bbRcvSizeMsb)
-               sp->cmn.bbRcvSizeMsb = hsp->cmn.bbRcvSizeMsb;
-       if (sp->cmn.bbRcvSizeLsb > hsp->cmn.bbRcvSizeLsb)
+       /*
+        * Preserve the upper four bits of the MSB from the PLOGI response.
+        * These bits contain the Buffer-to-Buffer State Change Number
+        * from the target and need to be passed to the FW.
+        */
+       hsp_value = (hsp->cmn.bbRcvSizeMsb << 8) | hsp->cmn.bbRcvSizeLsb;
+       ssp_value = (sp->cmn.bbRcvSizeMsb << 8) | sp->cmn.bbRcvSizeLsb;
+       if (ssp_value > hsp_value) {
                sp->cmn.bbRcvSizeLsb = hsp->cmn.bbRcvSizeLsb;
+               sp->cmn.bbRcvSizeMsb = (sp->cmn.bbRcvSizeMsb & 0xF0) |
+                                      (hsp->cmn.bbRcvSizeMsb & 0x0F);
+       }
 
-       /* If check is good, copy wwpn wwnn into ndlp */
        memcpy(&ndlp->nlp_nodename, &sp->nodeName, sizeof (struct lpfc_name));
        memcpy(&ndlp->nlp_portname, &sp->portName, sizeof (struct lpfc_name));
-       return (1);
+       return 1;
 }
 
 static void *
@@ -138,7 +159,7 @@ lpfc_check_elscmpl_iocb(struct lpfc_hba * phba,
                }
                ptr = NULL;
        }
-       return (ptr);
+       return ptr;
 }
 
 
@@ -245,7 +266,7 @@ lpfc_els_abort(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                if (!list_empty(&ndlp->els_retry_evt.evt_listp))
                        list_del_init(&ndlp->els_retry_evt.evt_listp);
        }
-       return (0);
+       return 0;
 }
 
 static int
@@ -300,7 +321,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
                stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
                stat.un.b.lsRjtRsnCodeExp = LSEXP_SPARM_OPTIONS;
                lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-               return (0);
+               return 0;
        }
        icmd = &cmdiocb->iocb;
 
@@ -341,7 +362,7 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
        case  NLP_STE_UNMAPPED_NODE:
        case  NLP_STE_MAPPED_NODE:
                lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, NULL, 0);
-               return (1);
+               return 1;
        }
 
        if ((phba->fc_flag & FC_PT2PT)
@@ -388,13 +409,13 @@ lpfc_rcv_plogi(struct lpfc_hba * phba,
        }
        ndlp->nlp_flag |= NLP_RCV_PLOGI;
        lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp, mbox, 0);
-       return (1);
+       return 1;
 
 out:
        stat.un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;
        stat.un.b.lsRjtRsnCodeExp = LSEXP_OUT_OF_RESOURCE;
        lpfc_els_rsp_reject(phba, stat.un.lsRjtError, cmdiocb, ndlp);
-       return (0);
+       return 0;
 }
 
 static int
@@ -435,7 +456,7 @@ lpfc_rcv_padisc(struct lpfc_hba * phba,
                        lpfc_els_rsp_acc(phba, ELS_CMD_PLOGI, cmdiocb, ndlp,
                                NULL, 0);
                }
-               return (1);
+               return 1;
        }
        /* Reject this request because invalid parameters */
        stat.un.b.lsRjtRsvd0 = 0;
@@ -453,7 +474,7 @@ lpfc_rcv_padisc(struct lpfc_hba * phba,
        spin_unlock_irq(phba->host->host_lock);
        ndlp->nlp_state = NLP_STE_NPR_NODE;
        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-       return (0);
+       return 0;
 }
 
 static int
@@ -468,25 +489,31 @@ lpfc_rcv_logo(struct lpfc_hba * phba,
        ndlp->nlp_flag |= NLP_LOGO_ACC;
        lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
 
-       if (!(ndlp->nlp_type & NLP_FABRIC)) {
+       if (!(ndlp->nlp_type & NLP_FABRIC) ||
+               (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
                /* Only try to re-login if this is NOT a Fabric Node */
                ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
                spin_lock_irq(phba->host->host_lock);
                ndlp->nlp_flag |= NLP_DELAY_TMO;
                spin_unlock_irq(phba->host->host_lock);
-       }
 
-       ndlp->nlp_state = NLP_STE_NPR_NODE;
-       lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+               ndlp->nlp_state = NLP_STE_NPR_NODE;
+               lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
+       } else {
+               ndlp->nlp_state = NLP_STE_UNUSED_NODE;
+               lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
+       }
 
+       spin_lock_irq(phba->host->host_lock);
        ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+       spin_unlock_irq(phba->host->host_lock);
        /* The driver has to wait until the ACC completes before it continues
         * processing the LOGO.  The action will resume in
         * lpfc_cmpl_els_logo_acc routine. Since part of processing includes an
         * unreg_login, the driver waits so the ACC does not get aborted.
         */
-       return (0);
+       return 0;
 }
 
 static void
@@ -534,20 +561,12 @@ lpfc_disc_set_adisc(struct lpfc_hba * phba,
        if ((phba->cfg_use_adisc == 0) &&
                !(phba->fc_flag & FC_RSCN_MODE)) {
                if (!(ndlp->nlp_fcp_info & NLP_FCP_2_DEVICE))
-                       return (0);
+                       return 0;
        }
        spin_lock_irq(phba->host->host_lock);
        ndlp->nlp_flag |= NLP_NPR_ADISC;
        spin_unlock_irq(phba->host->host_lock);
-       return (1);
-}
-
-static uint32_t
-lpfc_disc_noop(struct lpfc_hba * phba,
-               struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
-{
-       /* This routine does nothing, just return the current state */
-       return (ndlp->nlp_state);
+       return 1;
 }
 
 static uint32_t
@@ -562,7 +581,7 @@ lpfc_disc_illegal(struct lpfc_hba * phba,
                        phba->brd_no,
                        ndlp->nlp_DID, evt, ndlp->nlp_state, ndlp->nlp_rpi,
                        ndlp->nlp_flag);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 /* Start of Discovery State Machine routines */
@@ -578,10 +597,10 @@ lpfc_rcv_plogi_unused_node(struct lpfc_hba * phba,
        if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
                ndlp->nlp_state = NLP_STE_UNUSED_NODE;
                lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -590,7 +609,7 @@ lpfc_rcv_els_unused_node(struct lpfc_hba * phba,
 {
        lpfc_issue_els_logo(phba, ndlp, 0);
        lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -607,7 +626,7 @@ lpfc_rcv_logo_unused_node(struct lpfc_hba * phba,
        lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
        lpfc_nlp_list(phba, ndlp, NLP_UNUSED_LIST);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -615,7 +634,7 @@ lpfc_cmpl_logo_unused_node(struct lpfc_hba * phba,
                          struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -623,7 +642,7 @@ lpfc_device_rm_unused_node(struct lpfc_hba * phba,
                           struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
 {
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -661,7 +680,22 @@ lpfc_rcv_plogi_plogi_issue(struct lpfc_hba * phba, struct lpfc_nodelist * ndlp,
                lpfc_rcv_plogi(phba, ndlp, cmdiocb);
        } /* if our portname was less */
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_rcv_logo_plogi_issue(struct lpfc_hba * phba,
+                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+{
+       struct lpfc_iocbq     *cmdiocb;
+
+       cmdiocb = (struct lpfc_iocbq *) arg;
+
+       /* software abort outstanding PLOGI */
+       lpfc_els_abort(phba, ndlp, 1);
+
+       lpfc_rcv_logo(phba, ndlp, cmdiocb);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -691,7 +725,7 @@ lpfc_rcv_els_plogi_issue(struct lpfc_hba * phba,
        ndlp->nlp_state = NLP_STE_NPR_NODE;
        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -710,7 +744,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
        rspiocb = cmdiocb->context_un.rsp_iocb;
 
        if (ndlp->nlp_flag & NLP_ACC_REGLOGIN) {
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
 
        irsp = &rspiocb->iocb;
@@ -791,7 +825,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
                                NLP_STE_REG_LOGIN_ISSUE;
                        lpfc_nlp_list(phba, ndlp,
                                      NLP_REGLOGIN_LIST);
-                       return (ndlp->nlp_state);
+                       return ndlp->nlp_state;
                }
                mempool_free(mbox, phba->mbox_mem_pool);
        } else {
@@ -803,7 +837,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_hba * phba,
        /* Free this node since the driver cannot login or has the wrong
           sparm */
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -814,7 +848,7 @@ lpfc_device_rm_plogi_issue(struct lpfc_hba * phba,
        lpfc_els_abort(phba, ndlp, 1);
 
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -831,7 +865,7 @@ lpfc_device_recov_plogi_issue(struct lpfc_hba * phba,
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
        spin_unlock_irq(phba->host->host_lock);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -847,13 +881,13 @@ lpfc_rcv_plogi_adisc_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
        ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
        lpfc_issue_els_plogi(phba, ndlp, 0);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -866,7 +900,7 @@ lpfc_rcv_prli_adisc_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -882,7 +916,7 @@ lpfc_rcv_logo_adisc_issue(struct lpfc_hba * phba,
        lpfc_els_abort(phba, ndlp, 0);
 
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -895,7 +929,7 @@ lpfc_rcv_padisc_adisc_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -909,7 +943,7 @@ lpfc_rcv_prlo_adisc_issue(struct lpfc_hba * phba,
 
        /* Treat like rcv logo */
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -942,7 +976,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
                ndlp->nlp_state = NLP_STE_NPR_NODE;
                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
                lpfc_unreg_rpi(phba, ndlp);
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
        if (ndlp->nlp_type & NLP_FCP_TARGET) {
                ndlp->nlp_state = NLP_STE_MAPPED_NODE;
@@ -951,7 +985,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_hba * phba,
                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -963,7 +997,7 @@ lpfc_device_rm_adisc_issue(struct lpfc_hba * phba,
        lpfc_els_abort(phba, ndlp, 1);
 
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -978,10 +1012,10 @@ lpfc_device_recov_adisc_issue(struct lpfc_hba * phba,
        lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
        spin_lock_irq(phba->host->host_lock);
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+       ndlp->nlp_flag |= NLP_NPR_ADISC;
        spin_unlock_irq(phba->host->host_lock);
 
-       lpfc_disc_set_adisc(phba, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -994,7 +1028,7 @@ lpfc_rcv_plogi_reglogin_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1007,7 +1041,7 @@ lpfc_rcv_prli_reglogin_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1020,7 +1054,7 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1033,7 +1067,7 @@ lpfc_rcv_padisc_reglogin_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1045,7 +1079,7 @@ lpfc_rcv_prlo_reglogin_issue(struct lpfc_hba * phba,
 
        cmdiocb = (struct lpfc_iocbq *) arg;
        lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1079,7 +1113,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
                ndlp->nlp_last_elscmd = (unsigned long)ELS_CMD_PLOGI;
                ndlp->nlp_state = NLP_STE_NPR_NODE;
                lpfc_nlp_list(phba, ndlp, NLP_NPR_LIST);
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
 
        ndlp->nlp_rpi = mb->un.varWords[0];
@@ -1093,7 +1127,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_hba * phba,
                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1102,7 +1136,7 @@ lpfc_device_rm_reglogin_issue(struct lpfc_hba * phba,
                              uint32_t evt)
 {
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -1115,7 +1149,7 @@ lpfc_device_recov_reglogin_issue(struct lpfc_hba * phba,
        spin_lock_irq(phba->host->host_lock);
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
        spin_unlock_irq(phba->host->host_lock);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1127,7 +1161,7 @@ lpfc_rcv_plogi_prli_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1139,7 +1173,7 @@ lpfc_rcv_prli_prli_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1154,7 +1188,7 @@ lpfc_rcv_logo_prli_issue(struct lpfc_hba * phba,
        lpfc_els_abort(phba, ndlp, 1);
 
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1166,7 +1200,7 @@ lpfc_rcv_padisc_prli_issue(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 /* This routine is envoked when we rcv a PRLO request from a nport
@@ -1182,7 +1216,7 @@ lpfc_rcv_prlo_prli_issue(struct lpfc_hba * phba,
 
        cmdiocb = (struct lpfc_iocbq *) arg;
        lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1201,7 +1235,7 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
        if (irsp->ulpStatus) {
                ndlp->nlp_state = NLP_STE_UNMAPPED_NODE;
                lpfc_nlp_list(phba, ndlp, NLP_UNMAPPED_LIST);
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
 
        /* Check out PRLI rsp */
@@ -1219,7 +1253,7 @@ lpfc_cmpl_prli_prli_issue(struct lpfc_hba * phba,
 
        ndlp->nlp_state = NLP_STE_MAPPED_NODE;
        lpfc_nlp_list(phba, ndlp, NLP_MAPPED_LIST);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 /*! lpfc_device_rm_prli_issue
@@ -1247,7 +1281,7 @@ lpfc_device_rm_prli_issue(struct lpfc_hba * phba,
        lpfc_els_abort(phba, ndlp, 1);
 
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 
@@ -1279,7 +1313,7 @@ lpfc_device_recov_prli_issue(struct lpfc_hba * phba,
        spin_lock_irq(phba->host->host_lock);
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
        spin_unlock_irq(phba->host->host_lock);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1291,7 +1325,7 @@ lpfc_rcv_plogi_unmap_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1304,7 +1338,7 @@ lpfc_rcv_prli_unmap_node(struct lpfc_hba * phba,
 
        lpfc_rcv_prli(phba, ndlp, cmdiocb);
        lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1316,7 +1350,7 @@ lpfc_rcv_logo_unmap_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1328,7 +1362,7 @@ lpfc_rcv_padisc_unmap_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1339,9 +1373,8 @@ lpfc_rcv_prlo_unmap_node(struct lpfc_hba * phba,
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
-       /* Treat like rcv logo */
-       lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1353,7 +1386,7 @@ lpfc_device_recov_unmap_node(struct lpfc_hba * phba,
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
        lpfc_disc_set_adisc(phba, ndlp);
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1365,7 +1398,7 @@ lpfc_rcv_plogi_mapped_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_plogi(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1377,7 +1410,7 @@ lpfc_rcv_prli_mapped_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_els_rsp_prli_acc(phba, cmdiocb, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1389,7 +1422,7 @@ lpfc_rcv_logo_mapped_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1402,7 +1435,7 @@ lpfc_rcv_padisc_mapped_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_padisc(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1421,7 +1454,7 @@ lpfc_rcv_prlo_mapped_node(struct lpfc_hba * phba,
 
        /* Treat like rcv logo */
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1435,7 +1468,7 @@ lpfc_device_recov_mapped_node(struct lpfc_hba * phba,
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
        spin_unlock_irq(phba->host->host_lock);
        lpfc_disc_set_adisc(phba, ndlp);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1449,14 +1482,14 @@ lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba,
 
        /* Ignore PLOGI if we have an outstanding LOGO */
        if (ndlp->nlp_flag & NLP_LOGO_SND) {
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
 
        if (lpfc_rcv_plogi(phba, ndlp, cmdiocb)) {
                spin_lock_irq(phba->host->host_lock);
                ndlp->nlp_flag &= ~(NLP_NPR_ADISC | NLP_NPR_2B_DISC);
                spin_unlock_irq(phba->host->host_lock);
-               return (ndlp->nlp_state);
+               return ndlp->nlp_state;
        }
 
        /* send PLOGI immediately, move to PLOGI issue state */
@@ -1465,7 +1498,7 @@ lpfc_rcv_plogi_npr_node(struct lpfc_hba * phba,
                        lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
                        lpfc_issue_els_plogi(phba, ndlp, 0);
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1485,6 +1518,9 @@ lpfc_rcv_prli_npr_node(struct lpfc_hba * phba,
 
        if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
                if (ndlp->nlp_flag & NLP_NPR_ADISC) {
+                       spin_lock_irq(phba->host->host_lock);
+                       ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                       spin_unlock_irq(phba->host->host_lock);
                        ndlp->nlp_state = NLP_STE_ADISC_ISSUE;
                        lpfc_nlp_list(phba, ndlp, NLP_ADISC_LIST);
                        lpfc_issue_els_adisc(phba, ndlp, 0);
@@ -1494,7 +1530,7 @@ lpfc_rcv_prli_npr_node(struct lpfc_hba * phba,
                        lpfc_issue_els_plogi(phba, ndlp, 0);
                }
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1507,7 +1543,7 @@ lpfc_rcv_logo_npr_node(struct lpfc_hba * phba,
        cmdiocb = (struct lpfc_iocbq *) arg;
 
        lpfc_rcv_logo(phba, ndlp, cmdiocb);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1532,7 +1568,7 @@ lpfc_rcv_padisc_npr_node(struct lpfc_hba * phba,
                        lpfc_issue_els_plogi(phba, ndlp, 0);
                }
        }
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1544,25 +1580,46 @@ lpfc_rcv_prlo_npr_node(struct lpfc_hba * phba,
 
        cmdiocb = (struct lpfc_iocbq *) arg;
 
+       spin_lock_irq(phba->host->host_lock);
+       ndlp->nlp_flag |= NLP_LOGO_ACC;
+       spin_unlock_irq(phba->host->host_lock);
+
        lpfc_els_rsp_acc(phba, ELS_CMD_ACC, cmdiocb, ndlp, NULL, 0);
 
-       if (ndlp->nlp_flag & NLP_DELAY_TMO) {
-               if (ndlp->nlp_last_elscmd == (unsigned long)ELS_CMD_PLOGI) {
-                       return (ndlp->nlp_state);
-               } else {
-                       spin_lock_irq(phba->host->host_lock);
-                       ndlp->nlp_flag &= ~NLP_DELAY_TMO;
-                       spin_unlock_irq(phba->host->host_lock);
-                       del_timer_sync(&ndlp->nlp_delayfunc);
-                       if (!list_empty(&ndlp->els_retry_evt.evt_listp))
-                               list_del_init(&ndlp->els_retry_evt.evt_listp);
-               }
+       if (!(ndlp->nlp_flag & NLP_DELAY_TMO)) {
+               mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+               spin_lock_irq(phba->host->host_lock);
+               ndlp->nlp_flag |= NLP_DELAY_TMO;
+               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+               spin_unlock_irq(phba->host->host_lock);
+       } else {
+               spin_lock_irq(phba->host->host_lock);
+               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+               spin_unlock_irq(phba->host->host_lock);
        }
+       return ndlp->nlp_state;
+}
 
-       ndlp->nlp_state = NLP_STE_PLOGI_ISSUE;
-       lpfc_nlp_list(phba, ndlp, NLP_PLOGI_LIST);
-       lpfc_issue_els_plogi(phba, ndlp, 0);
-       return (ndlp->nlp_state);
+static uint32_t
+lpfc_cmpl_plogi_npr_node(struct lpfc_hba * phba,
+                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+{
+       struct lpfc_iocbq *cmdiocb, *rspiocb;
+
+       cmdiocb = (struct lpfc_iocbq *) arg;
+       rspiocb = cmdiocb->context_un.rsp_iocb;
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_prli_npr_node(struct lpfc_hba * phba,
+                         struct lpfc_nodelist * ndlp, void *arg, uint32_t evt)
+{
+       struct lpfc_iocbq *cmdiocb, *rspiocb;
+
+       cmdiocb = (struct lpfc_iocbq *) arg;
+       rspiocb = cmdiocb->context_un.rsp_iocb;
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1571,7 +1628,19 @@ lpfc_cmpl_logo_npr_node(struct lpfc_hba * phba,
 {
        lpfc_unreg_rpi(phba, ndlp);
        /* This routine does nothing, just return the current state */
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
+}
+
+static uint32_t
+lpfc_cmpl_adisc_npr_node(struct lpfc_hba * phba,
+                           struct lpfc_nodelist * ndlp, void *arg,
+                           uint32_t evt)
+{
+       struct lpfc_iocbq *cmdiocb, *rspiocb;
+
+       cmdiocb = (struct lpfc_iocbq *) arg;
+       rspiocb = cmdiocb->context_un.rsp_iocb;
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1585,9 +1654,10 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_hba * phba,
        pmb = (LPFC_MBOXQ_t *) arg;
        mb = &pmb->mb;
 
-       ndlp->nlp_rpi = mb->un.varWords[0];
+       if (!mb->mbxStatus)
+               ndlp->nlp_rpi = mb->un.varWords[0];
 
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 static uint32_t
@@ -1596,7 +1666,7 @@ lpfc_device_rm_npr_node(struct lpfc_hba * phba,
                            uint32_t evt)
 {
        lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       return (NLP_STE_FREED_NODE);
+       return NLP_STE_FREED_NODE;
 }
 
 static uint32_t
@@ -1606,8 +1676,16 @@ lpfc_device_recov_npr_node(struct lpfc_hba * phba,
 {
        spin_lock_irq(phba->host->host_lock);
        ndlp->nlp_flag &= ~NLP_NPR_2B_DISC;
+       if (ndlp->nlp_flag & NLP_DELAY_TMO) {
+               ndlp->nlp_flag &= ~NLP_DELAY_TMO;
+               if (!list_empty(&ndlp->els_retry_evt.evt_listp))
+                       list_del_init(&ndlp->els_retry_evt.evt_listp);
+               spin_unlock_irq(phba->host->host_lock);
+               del_timer_sync(&ndlp->nlp_delayfunc);
+               return ndlp->nlp_state;
+       }
        spin_unlock_irq(phba->host->host_lock);
-       return (ndlp->nlp_state);
+       return ndlp->nlp_state;
 }
 
 
@@ -1686,7 +1764,7 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
 
        lpfc_rcv_plogi_plogi_issue,     /* RCV_PLOGI   PLOGI_ISSUE    */
        lpfc_rcv_els_plogi_issue,       /* RCV_PRLI        */
-       lpfc_rcv_els_plogi_issue,       /* RCV_LOGO        */
+       lpfc_rcv_logo_plogi_issue,      /* RCV_LOGO        */
        lpfc_rcv_els_plogi_issue,       /* RCV_ADISC       */
        lpfc_rcv_els_plogi_issue,       /* RCV_PDISC       */
        lpfc_rcv_els_plogi_issue,       /* RCV_PRLO        */
@@ -1774,10 +1852,10 @@ static uint32_t (*lpfc_disc_action[NLP_STE_MAX_STATE * NLP_EVT_MAX_EVENT])
        lpfc_rcv_padisc_npr_node,       /* RCV_ADISC       */
        lpfc_rcv_padisc_npr_node,       /* RCV_PDISC       */
        lpfc_rcv_prlo_npr_node,         /* RCV_PRLO        */
-       lpfc_disc_noop,                 /* CMPL_PLOGI      */
-       lpfc_disc_noop,                 /* CMPL_PRLI       */
+       lpfc_cmpl_plogi_npr_node,       /* CMPL_PLOGI      */
+       lpfc_cmpl_prli_npr_node,        /* CMPL_PRLI       */
        lpfc_cmpl_logo_npr_node,        /* CMPL_LOGO       */
-       lpfc_disc_noop,                 /* CMPL_ADISC      */
+       lpfc_cmpl_adisc_npr_node,       /* CMPL_ADISC      */
        lpfc_cmpl_reglogin_npr_node,    /* CMPL_REG_LOGIN  */
        lpfc_device_rm_npr_node,        /* DEVICE_RM       */
        lpfc_device_recov_npr_node,     /* DEVICE_RECOVERY */
@@ -1823,10 +1901,10 @@ lpfc_disc_state_machine(struct lpfc_hba * phba,
                ndlp->nlp_flag &= ~NLP_DELAY_REMOVE;
                spin_unlock_irq(phba->host->host_lock);
                lpfc_nlp_remove(phba, ndlp);
-               return (NLP_STE_FREED_NODE);
+               return NLP_STE_FREED_NODE;
        }
        if (rc == NLP_STE_FREED_NODE)
-               return (NLP_STE_FREED_NODE);
+               return NLP_STE_FREED_NODE;
        ndlp->nlp_state = rc;
-       return (rc);
+       return rc;
 }