]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: lpfc: Remove false FDMI NVMe FC-4 support for NPIV ports
authorJames Smart <jsmart2021@gmail.com>
Tue, 12 Apr 2022 22:19:59 +0000 (15:19 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 19 Apr 2022 02:48:46 +0000 (22:48 -0400)
FDMI FC-4 Active Type for vports mistakenly shows NVMe support.

Add a check to only set the NVMe support bit for the physical port.

Link: https://lore.kernel.org/r/20220412222008.126521-18-jsmart2021@gmail.com
Co-developed-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: Justin Tee <justin.tee@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/lpfc/lpfc_ct.c

index 5f2b2d8eacbf3146ebc5eae3270c39a4d151e64e..8df5ba3ed482e54c5737fca95317d2440802bb9d 100644 (file)
@@ -3153,6 +3153,7 @@ static int
 lpfc_fdmi_port_attr_active_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;
 
@@ -3163,7 +3164,8 @@ lpfc_fdmi_port_attr_active_fc4type(struct lpfc_vport *vport,
        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)
+       if (vport == phba->pport &&
+           phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME)
                ae->un.AttrTypes[6] = 0x1; /* Type 0x28 - NVME */
 
        size = FOURBYTES + 32;