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

wifi: iwlwifi: Update configurations for Bnj and Bz devices 



Add missing rf support for Bz device and B-Step for BnJ device

Signed-off-by: default avatarMukesh Sisodiya <mukesh.sisodiya@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230314194113.14c373dcfe15.I96b96a8b149ac181e962f4b82e0d15b172823d0f@changeid


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

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

+36 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ 
#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0-"

#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

#define IWL_BZ_A_FM4_A_FW_PRE		"iwlwifi-bz-a0-fm4-a0-"

#define IWL_BZ_A_FM_B_FW_PRE		"iwlwifi-bz-a0-fm-b0-"

#define IWL_BZ_A_FM4_B_FW_PRE		"iwlwifi-bz-a0-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_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0-"
@@ -64,6 +66,7 @@ 
#define IWL_BNJ_A_FM4_A_FW_PRE		"iwlwifi-BzBnj-a0-fm4-a0-"

#define IWL_BNJ_B_FM4_B_FW_PRE		"iwlwifi-BzBnj-b0-fm4-b0-"

#define IWL_BNJ_A_GF_A_FW_PRE		"iwlwifi-BzBnj-a0-gf-a0-"

#define IWL_BNJ_B_GF_A_FW_PRE		"iwlwifi-BzBnj-b0-gf-a0-"

#define IWL_BNJ_A_GF4_A_FW_PRE		"iwlwifi-BzBnj-a0-gf4-a0-"

#define IWL_BNJ_A_HR_B_FW_PRE		"iwlwifi-BzBnj-a0-hr-b0-"

#define IWL_BNJ_B_FM_B_FW_PRE		"iwlwifi-BzBnj-b0-fm-b0-"
@@ -125,6 +128,10 @@ 
		IWL_BZ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM4_A_MODULE_FIRMWARE(api) \

		IWL_BZ_A_FM4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_FM_B_MODULE_FIRMWARE(api) \

		IWL_BZ_A_FM_B_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_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) \
@@ -137,6 +144,8 @@ 
	IWL_BNJ_B_FM4_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_GF_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \
@@ -961,6 +970,22 @@ const struct iwl_cfg iwl_cfg_bz_a0_fm4_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_fm_b0 = {

	.fw_name_pre = IWL_BZ_A_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_a0_fm4_b0 = {

	.fw_name_pre = IWL_BZ_A_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,
@@ -1017,6 +1042,14 @@ const struct iwl_cfg iwl_cfg_bnj_a0_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_gf_a0 = {

	.fw_name_pre = IWL_BNJ_B_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0 = {

	.fw_name_pre = IWL_BNJ_A_GF4_A_FW_PRE,

	.uhb_supported = true,
@@ -1067,13 +1100,16 @@ MODULE_FIRMWARE(IWL_BZ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_BZ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_FM4_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_FM4_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+3 −0
Original line number Diff line number Diff line
@@ -650,12 +650,15 @@ extern const struct iwl_cfg iwl_cfg_bz_a0_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_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_bz_z0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0;

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

+15 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,16 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY,

		      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_RF_TYPE_FM, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_IS_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_RF_TYPE_FM, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bz_a0_fm4_b0, iwl_bz_name),

	_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,
@@ -1203,6 +1213,11 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bnj_a0_gf_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bnj_b0_gf_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,