[SCSI] lpfc 8.3.24: Add resource extent support

This patch adds support for hardware that returns resource ids via
extents rather than contiguous ranges.

[jejb: checkpatch.pl fixes]
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <jbottomley@parallels.com>

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 9bf7eb85d17..2ddd02f7c60 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -652,6 +652,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)
         lpfc_unreg_rpi(vport, ndlp);
         return 0;
 }
+
 /**
  * lpfc_release_rpi - Release a RPI by issuing unreg_login mailbox cmd.
  * @phba : Pointer to lpfc_hba structure.
@@ -1394,8 +1395,11 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
         if (mb->mbxStatus) {
                 /* RegLogin failed */
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
-                                "0246 RegLogin failed Data: x%x x%x x%x\n",
-                                did, mb->mbxStatus, vport->port_state);
+                                "0246 RegLogin failed Data: x%x x%x x%x x%x "
+                                 "x%x\n",
+                                 did, mb->mbxStatus, vport->port_state,
+                                 mb->un.varRegLogin.vpi,
+                                 mb->un.varRegLogin.rpi);
                 /*
                  * If RegLogin failed due to lack of HBA resources do not
                  * retry discovery.
@@ -1419,7 +1423,10 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
                 return ndlp->nlp_state;
         }
 
-        ndlp->nlp_rpi = mb->un.varWords[0];
+        /* SLI4 ports have preallocated logical rpis. */
+        if (vport->phba->sli_rev < LPFC_SLI_REV4)
+                ndlp->nlp_rpi = mb->un.varWords[0];
+
         ndlp->nlp_flag |= NLP_RPI_REGISTERED;
 
         /* Only if we are not a fabric nport do we issue PRLI */
@@ -2020,7 +2027,9 @@ lpfc_cmpl_reglogin_npr_node(struct lpfc_vport *vport,
         MAILBOX_t    *mb = &pmb->u.mb;
 
         if (!mb->mbxStatus) {
-                ndlp->nlp_rpi = mb->un.varWords[0];
+                /* SLI4 ports have preallocated logical rpis. */
+                if (vport->phba->sli_rev < LPFC_SLI_REV4)
+                        ndlp->nlp_rpi = mb->un.varWords[0];
                 ndlp->nlp_flag |= NLP_RPI_REGISTERED;
         } else {
                 if (ndlp->nlp_flag & NLP_NODEV_REMOVE) {