Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f79cbf75 authored by James Smart's avatar James Smart Committed by Greg Kroah-Hartman
Browse files

scsi: lpfc: Remove NVMe support if kernel has NVME_FC disabled 

commit c80b27cfd93ba9f5161383f798414609e84729f3 upstream.

The driver is initiating NVMe PRLIs to determine device NVMe support.  This
should not be occurring if CONFIG_NVME_FC support is disabled.

Correct this by changing the default value for FC4 support. Currently it
defaults to FCP and NVMe. With change, when NVME_FC support is not enabled
in the kernel, the default value is just FCP.

Link: https://lore.kernel.org/r/20220207180516.73052-1-jsmart2021@gmail.com


Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1a018e2

drivers/scsi/lpfc/lpfc.h

+10 −3
Original line number Diff line number Diff line
@@ -870,6 +870,16 @@ struct lpfc_hba { 
	uint32_t cfg_hostmem_hgp;

	uint32_t cfg_log_verbose;

	uint32_t cfg_enable_fc4_type;

#define LPFC_ENABLE_FCP  1

#define LPFC_ENABLE_NVME 2

#define LPFC_ENABLE_BOTH 3

#if (IS_ENABLED(CONFIG_NVME_FC))

#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_BOTH

#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_BOTH

#else

#define LPFC_MAX_ENBL_FC4_TYPE LPFC_ENABLE_FCP

#define LPFC_DEF_ENBL_FC4_TYPE LPFC_ENABLE_FCP

#endif

	uint32_t cfg_aer_support;

	uint32_t cfg_sriov_nr_virtfn;

	uint32_t cfg_request_firmware_upgrade;
@@ -892,9 +902,6 @@ struct lpfc_hba { 
	uint32_t cfg_ras_fwlog_func;

	uint32_t cfg_enable_bbcr;	/* Enable BB Credit Recovery */

	uint32_t cfg_enable_dpp;	/* Enable Direct Packet Push */

#define LPFC_ENABLE_FCP  1

#define LPFC_ENABLE_NVME 2

#define LPFC_ENABLE_BOTH 3

	uint32_t cfg_enable_pbde;

	struct nvmet_fc_target_port *targetport;

	lpfc_vpd_t vpd;		/* vital product data */

drivers/scsi/lpfc/lpfc_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -3839,8 +3839,8 @@ LPFC_ATTR_R(nvmet_mrq_post, 
 *                    3 - register both FCP and NVME

 * Supported values are [1,3]. Default value is 3

 */

LPFC_ATTR_R(enable_fc4_type, LPFC_ENABLE_BOTH,

	    LPFC_ENABLE_FCP, LPFC_ENABLE_BOTH,

LPFC_ATTR_R(enable_fc4_type, LPFC_DEF_ENBL_FC4_TYPE,

	    LPFC_ENABLE_FCP, LPFC_MAX_ENBL_FC4_TYPE,

	    "Enable FC4 Protocol support - FCP / NVME");



/*