scsi: lpfc: Fix FDMI fc4type for nvme support

FDMI protocol support registration was not accurately showing nvme
support. The fcponly-path clears the parameter object.

Move the code out of the fcponly code path.  Fix the FDMI registration data
to properly check for nvme support.  Commonize the manner in which the fdmi
routines set protocol support.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 4812bbbf43ccbbd3a9e0f9d94e54b58838cb5a45..ec72c39997d21a004478603220d088da0c00a31b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -2358,6 +2358,7 @@ static int
 lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport,
                            struct lpfc_fdmi_attr_def *ad)
 {
+       struct lpfc_hba   *phba = vport->phba;
        struct lpfc_fdmi_attr_entry *ae;
        uint32_t size;
 
@@ -2366,9 +2367,13 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_vport *vport,
 
        ae->un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */
        ae->un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */
-       if (vport->nvmei_support || vport->phba->nvmet_support)
-               ae->un.AttrTypes[6] = 0x01; /* Type 0x28 - NVME */
        ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */
+
+       /* Check to see if Firmware supports NVME and on physical port */
+       if ((phba->sli_rev == LPFC_SLI_REV4) && (vport == phba->pport) &&
+           phba->sli4_hba.pc_sli4_params.nvme)
+               ae->un.AttrTypes[6] = 0x01; /* Type 0x28 - NVME */
+
        size = FOURBYTES + 32;
        ad->AttrLen = cpu_to_be16(size);
        ad->AttrType = cpu_to_be16(RPRT_SUPPORTED_FC4_TYPES);
@@ -2680,9 +2685,12 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport,
 
        ae->un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */
        ae->un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */
+       ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */
+
+       /* Check to see if NVME is configured or not */
        if (vport->phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME)
                ae->un.AttrTypes[6] = 0x1; /* Type 0x28 - NVME */
-       ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */
+
        size = FOURBYTES + 32;
        ad->AttrLen = cpu_to_be16(size);
        ad->AttrType = cpu_to_be16(RPRT_ACTIVE_FC4_TYPES);