Commit 8a18d46b authored by Mukesh Sisodiya's avatar Mukesh Sisodiya Committed by Johannes Berg
Browse files

wifi: iwlwifi: Add support for new Bz version 



Add support for the new version of the Bz CNVI device.

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.82d436d5f346.I0154c202c5d895cb002a2b7c827b9536e81a84b5@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 69f77827

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+44 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ 
#define IWL_BZ_A_FM_B_FW_PRE		"iwlwifi-bz-a0-fm-b0-"

#define IWL_BZ_A_FM_C_FW_PRE		"iwlwifi-bz-a0-fm-c0-"

#define IWL_BZ_A_FM4_B_FW_PRE		"iwlwifi-bz-a0-fm4-b0-"

#define IWL_BZ_B_GF_A_FW_PRE		"iwlwifi-bz-b0-gf-a0-"

#define IWL_BZ_B_GF4_A_FW_PRE		"iwlwifi-bz-b0-gf4-a0-"

#define IWL_BZ_B_FM_B_FW_PRE		"iwlwifi-bz-b0-fm-b0-"

#define IWL_BZ_B_FM4_B_FW_PRE		"iwlwifi-bz-b0-fm4-b0-"

#define IWL_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm-a0-"

#define IWL_GL_B_FM_B_FW_PRE		"iwlwifi-gl-b0-fm-b0-"

#define IWL_GL_C_FM_C_FW_PRE		"iwlwifi-gl-c0-fm-c0-"
@@ -160,6 +164,14 @@ 
		IWL_BZ_A_FM_C_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM4_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_FM4_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_B_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_B_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_B_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BZ_B_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_BZ_B_FM_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_B_FM4_B_MODULE_FIRMWARE(api) \

	IWL_BZ_B_FM4_B_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_A_FM_A_MODULE_FIRMWARE(api) \

	IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_GL_B_FM_B_MODULE_FIRMWARE(api) \
@@ -1029,6 +1041,22 @@ const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_b0_gf_a0 = {

	.fw_name_pre = IWL_BZ_B_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_b0_gf4_a0 = {

	.fw_name_pre = IWL_BZ_B_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = {

	.fw_name_pre = IWL_BZ_A_MR_A_FW_PRE,

	.uhb_supported = true,
@@ -1077,6 +1105,22 @@ const struct iwl_cfg iwl_cfg_bz_a0_fm4_b0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_b0_fm_b0 = {

	.fw_name_pre = IWL_BZ_B_FM_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_b0_fm4_b0 = {

	.fw_name_pre = IWL_BZ_B_FM4_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS_BZ | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = {

	.fw_name_pre = IWL_GL_A_FM_A_FW_PRE,

	.uhb_supported = true,

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+4 −0
Original line number Diff line number Diff line
@@ -653,12 +653,16 @@ extern const struct iwl_cfg iwl_cfg_bz_a0_hr_a0; 
extern const struct iwl_cfg iwl_cfg_bz_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bz_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bz_b0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bz_b0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_mr_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm4_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm_b0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm_c0;

extern const struct iwl_cfg iwl_cfg_bz_a0_fm4_b0;

extern const struct iwl_cfg iwl_cfg_bz_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_bz_b0_fm4_b0;

extern const struct iwl_cfg iwl_cfg_gl_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_gl_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_gl_c0_fm_c0;

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

+27 −6
Original line number Diff line number Diff line
@@ -1173,15 +1173,25 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_bz_a0_hr_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_bz_a0_gf_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_ANY,

		      iwl_cfg_bz_a0_gf4_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_bz_b0_gf_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_ANY,

		      iwl_cfg_bz_b0_gf4_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1193,25 +1203,36 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      iwl_cfg_bz_a0_fm_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_A_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm4_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_C_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm_c0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_a0_fm4_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_b0_fm_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_B_STEP,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bz_b0_fm4_b0, iwl_bz_name),

/* Ga (Gl) */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, SILICON_A_STEP,