scsi: lpfc: Fix NVMe support reporting in log message

The NVMe support indicator in log message 6422 is displaying a field that
was initialized but never set to indicate NVMe support.  Remove obsolete
nvme_support element from the lpfc_hba structure and change log message to
display NVMe support status as reported in SLI4 Config Parameters mailbox
command.

Link: https://lore.kernel.org/r/20210707184351.67872-2-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>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 17028861234bc6f68b7bdd69baac06143586d850..dd3ddfa5f7619ed5b674099bcc13c1c188ea3add 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -922,7 +922,6 @@ struct lpfc_hba {
        uint8_t  wwpn[8];
        uint32_t RandomData[7];
        uint8_t  fcp_embed_io;
-       uint8_t  nvme_support;  /* Firmware supports NVME */
        uint8_t  nvmet_support; /* driver supports NVMET */
 #define LPFC_NVMET_MAX_PORTS   32
        uint8_t  mds_diags_support;

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 5983e05b648f93bc6091c29a1111c49133163a35..fc821104d5a5328d8740192a196566adb3565096 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -12241,7 +12241,6 @@ lpfc_get_sli4_parameters(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)
                                        bf_get(cfg_xib, mbx_sli4_parameters),
                                        phba->cfg_enable_fc4_type);
 fcponly:
-                       phba->nvme_support = 0;
                        phba->nvmet_support = 0;
                        phba->cfg_nvmet_mrq = 0;
                        phba->cfg_nvme_seg_cnt = 0;
@@ -12299,7 +12298,7 @@ fcponly:
                        "6422 XIB %d PBDE %d: FCP %d NVME %d %d %d\n",
                        bf_get(cfg_xib, mbx_sli4_parameters),
                        phba->cfg_enable_pbde,
-                       phba->fcp_embed_io, phba->nvme_support,
+                       phba->fcp_embed_io, sli4_params->nvme,
                        phba->cfg_nvme_embed_cmd, phba->cfg_suppress_rsp);
 
        if ((bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) ==