Commit b96e516c authored by Golan Ben Ami's avatar Golan Ben Ami Committed by Johannes Berg
Browse files

wifi: iwlwifi: Add support for B step of BnJ-Fm4 



Support new HW step of BnJ-Fm4 device

Signed-off-by: default avatarGolan Ben Ami <golan.ben.ami@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230305124407.bb0591c59898.If04d7a45707ba008981f8c8ea7f7f107880f146c@changeid


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

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

+12 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#define IWL_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0-"

#define IWL_BNJ_A_FM_A_FW_PRE		"iwlwifi-BzBnj-a0-fm-a0-"

#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_A_GF4_A_FW_PRE		"iwlwifi-BzBnj-a0-gf4-a0-"

#define IWL_BNJ_A_HR_B_FW_PRE		"iwlwifi-BzBnj-a0-hr-b0-"
@@ -132,6 +133,8 @@ 
	IWL_BNJ_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM4_A_MODULE_FIRMWARE(api) \

	IWL_BNJ_A_FM4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_B_FM4_B_MODULE_FIRMWARE(api) \

	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_A_GF4_A_MODULE_FIRMWARE(api) \
@@ -998,6 +1001,14 @@ const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_b0_fm4_b0 = {

	.fw_name_pre = IWL_BNJ_B_FM4_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_a0_gf_a0 = {

	.fw_name_pre = IWL_BNJ_A_GF_A_FW_PRE,

	.uhb_supported = true,
@@ -1059,6 +1070,7 @@ MODULE_FIRMWARE(IWL_BZ_A_FM_A_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_A_GF4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

+1 −0
Original line number Diff line number Diff line
@@ -659,6 +659,7 @@ extern const struct iwl_cfg iwl_cfg_bnj_a0_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;

extern const struct iwl_cfg iwl_cfg_bnj_b0_fm4_b0;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+5 −0
Original line number Diff line number Diff line
@@ -1193,6 +1193,11 @@ 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_IS_JACKET,

		      iwl_cfg_bnj_a0_fm4_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_FM, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB, IWL_CFG_IS_JACKET,

		      iwl_cfg_bnj_b0_fm4_b0, 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,