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

wifi: iwlwifi: Update configurations for Bnj device 



Add missing rf support for spacific rf 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/20230320122330.eeb7ebb9ed87.I30c3938221aeb6f6ba2c84b1a77eea54c9dd3ba1@changeid


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

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

+24 −0
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ 
#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_B_GF4_A_FW_PRE		"iwlwifi-BzBnj-b0-gf4-a0-"

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

#define IWL_BNJ_B_HR_B_FW_PRE		"iwlwifi-BzBnj-b0-hr-b0-"

#define IWL_BNJ_B_FM_B_FW_PRE		"iwlwifi-BzBnj-b0-fm-b0-"
@@ -148,8 +150,12 @@ 
	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_B_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_FM_B_MODULE_FIRMWARE(api) \

	IWL_BNJ_B_FM_B_FW_PRE __stringify(api) ".ucode"
@@ -1058,6 +1064,14 @@ const struct iwl_cfg iwl_cfg_bnj_a0_gf4_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_gf4_a0 = {

	.fw_name_pre = IWL_BNJ_B_GF4_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_hr_b0 = {

	.fw_name_pre = IWL_BNJ_A_HR_B_FW_PRE,

	.uhb_supported = true,
@@ -1066,6 +1080,14 @@ const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_hr_b0 = {

	.fw_name_pre = IWL_BNJ_B_HR_B_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_b0_fm_b0 = {

	.fw_name_pre = IWL_BNJ_B_FM_B_FW_PRE,

	.uhb_supported = true,
@@ -1108,7 +1130,9 @@ 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_B_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_BNJ_B_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));

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

+2 −0
Original line number Diff line number Diff line
@@ -660,7 +660,9 @@ 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_b0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm_b0;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm4_b0;

#endif /* CONFIG_IWLMVM */

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

+12 −2
Original line number Diff line number Diff line
@@ -1219,15 +1219,25 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      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_MAC_TYPE_GL, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bnj_a0_gf4_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, 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_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bnj_b0_gf4_a0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bnj_a0_hr_b0, iwl_bz_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_HR1, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_bnj_b0_hr_b0, iwl_bz_name),



/* SoF with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,