[SCSI] lpfc 8.3.2 : Addition of SLI4 Interface - FCOE Discovery support

SLI4 supports both FC and FCOE, with some extended topology objects.
This patch adss support for the objects, and updates the disovery
engines for their use.

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 27 insertions, 7 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 6efe459e8ddf..2c7eba686262 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -363,7 +363,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         if (!mbox)
                 goto out;
 
-        rc = lpfc_reg_login(phba, vport->vpi, icmd->un.rcvels.remoteID,
+        rc = lpfc_reg_rpi(phba, vport->vpi, icmd->un.rcvels.remoteID,
                             (uint8_t *) sp, mbox, 0);
         if (rc) {
                 mempool_free(mbox, phba->mbox_mem_pool);
@@ -497,11 +497,19 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);
         else
                 lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
+        if ((ndlp->nlp_type & NLP_FABRIC) &&
+                vport->port_type == LPFC_NPIV_PORT) {
+                lpfc_linkdown_port(vport);
+                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+                spin_lock_irq(shost->host_lock);
+                ndlp->nlp_flag |= NLP_DELAY_TMO;
+                spin_unlock_irq(shost->host_lock);
 
-        if ((!(ndlp->nlp_type & NLP_FABRIC) &&
-             ((ndlp->nlp_type & NLP_FCP_TARGET) ||
-              !(ndlp->nlp_type & NLP_FCP_INITIATOR))) ||
-            (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
+                ndlp->nlp_last_elscmd = ELS_CMD_FDISC;
+        } else if ((!(ndlp->nlp_type & NLP_FABRIC) &&
+                ((ndlp->nlp_type & NLP_FCP_TARGET) ||
+                !(ndlp->nlp_type & NLP_FCP_INITIATOR))) ||
+                (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
                 /* Only try to re-login if this is NOT a Fabric Node */
                 mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
                 spin_lock_irq(shost->host_lock);
@@ -569,7 +577,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
 {
         struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
 
-        if (!ndlp->nlp_rpi) {
+        if (!(ndlp->nlp_flag & NLP_RPI_VALID)) {
                 ndlp->nlp_flag &= ~NLP_NPR_ADISC;
                 return 0;
         }
@@ -859,7 +867,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,
 
         lpfc_unreg_rpi(vport, ndlp);
 
-        if (lpfc_reg_login(phba, vport->vpi, irsp->un.elsreq64.remoteID,
+        if (lpfc_reg_rpi(phba, vport->vpi, irsp->un.elsreq64.remoteID,
                            (uint8_t *) sp, mbox, 0) == 0) {
                 switch (ndlp->nlp_DID) {
                 case NameServer_DID:
@@ -1070,6 +1078,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport,
         struct lpfc_iocbq *cmdiocb, *rspiocb;
         IOCB_t *irsp;
         ADISC *ap;
+        int rc;
 
         cmdiocb = (struct lpfc_iocbq *) arg;
         rspiocb = cmdiocb->context_un.rsp_iocb;
@@ -1095,6 +1104,15 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport,
                 return ndlp->nlp_state;
         }
 
+        if (phba->sli_rev == LPFC_SLI_REV4) {
+                rc = lpfc_sli4_resume_rpi(ndlp);
+                if (rc) {
+                        /* Stay in state and retry. */
+                        ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
+                        return ndlp->nlp_state;
+                }
+        }
+
         if (ndlp->nlp_type & NLP_FCP_TARGET) {
                 ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
                 lpfc_nlp_set_state(vport, ndlp, NLP_STE_MAPPED_NODE);
@@ -1102,6 +1120,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport,
                 ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;
                 lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);
         }
+
         return ndlp->nlp_state;
 }
 
@@ -1285,6 +1304,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
         }
 
         ndlp->nlp_rpi = mb->un.varWords[0];
+        ndlp->nlp_flag |= NLP_RPI_VALID;
 
         /* Only if we are not a fabric nport do we issue PRLI */
         if (!(ndlp->nlp_type & NLP_FABRIC)) {