[SCSI] lpfc 8.3.23: Fixes related to new hardware

Fixes related to new hardware

- Restrict driver to look at BAR2 or BAR4 only for if_type 0.
- Allow SLI4 with FCOE_MODE not set for new SLI4 FC adapters.
- Add Temporary RPI field to the ELS request WQE.
- Do not override CT field in issue_els_flogi for SLI4 IF type 2
- For RQ_CREATE_V2 mbx cmd: fill in the rqe_size and page_size for RQ_CREATE.

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 9 insertions, 8 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 04a5aeb41470..e2c452467c8b 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1086,14 +1086,15 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         if (sp->cmn.fcphHigh < FC_PH3)
                 sp->cmn.fcphHigh = FC_PH3;
 
-        if  ((phba->sli_rev == LPFC_SLI_REV4) &&
-             (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==
-              LPFC_SLI_INTF_IF_TYPE_0)) {
-                elsiocb->iocb.ulpCt_h = ((SLI4_CT_FCFI >> 1) & 1);
-                elsiocb->iocb.ulpCt_l = (SLI4_CT_FCFI & 1);
-                /* FLOGI needs to be 3 for WQE FCFI */
-                /* Set the fcfi to the fcfi we registered with */
-                elsiocb->iocb.ulpContext = phba->fcf.fcfi;
+        if  (phba->sli_rev == LPFC_SLI_REV4) {
+                if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==
+                    LPFC_SLI_INTF_IF_TYPE_0) {
+                        elsiocb->iocb.ulpCt_h = ((SLI4_CT_FCFI >> 1) & 1);
+                        elsiocb->iocb.ulpCt_l = (SLI4_CT_FCFI & 1);
+                        /* FLOGI needs to be 3 for WQE FCFI */
+                        /* Set the fcfi to the fcfi we registered with */
+                        elsiocb->iocb.ulpContext = phba->fcf.fcfi;
+                }
         } else if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {
                 sp->cmn.request_multiple_Nport = 1;
                 /* For FLOGI, Let FLOGI rsp set the NPortID for VPI 0 */