Commit 92fd0ce9 authored by Mike Golant's avatar Mike Golant Committed by Luca Coelho
Browse files

iwlwifi: add support for BNJ HW 



Add support for BNJ HW with GF, GF4, HR1, FM and FM4 RF modules

Signed-off-by: default avatarMike Golant <michael.golant@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20211210090244.e94c1f921245.I8cba209b1366dc0636a04711fc6a85539ca878d0@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2856f623

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

+54 −0
Original line number Diff line number Diff line
@@ -56,6 +56,11 @@ 
#define IWL_BZ_A_FM_A_FW_PRE		"iwlwifi-bz-a0-fm-a0-"

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

#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_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-"





#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
@@ -116,6 +121,16 @@ 
		IWL_GL_A_FM_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_Z_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_Z_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BNJ_A_FM_A_MODULE_FIRMWARE(api) \

	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_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) \

	IWL_BNJ_A_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"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -882,6 +897,40 @@ const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_fm_a0 = {

	.fw_name_pre = IWL_BNJ_A_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bnj_a0_fm4_a0 = {

	.fw_name_pre = IWL_BNJ_A_FM4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_BZ,

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

	IWL_DEVICE_BZ,

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

	IWL_DEVICE_BZ,

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

	IWL_DEVICE_BZ,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};

MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QNJ_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -910,3 +959,8 @@ 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_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_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

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

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_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bnj_a0_hr_b0;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+28 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB, IWL_CFG_NO_JACKET,

		      iwl_cfg_gl_a0_fm_a0, iwl_bz_name),



/* BZ Z step */
@@ -1148,6 +1148,33 @@ 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_z0_gf_a0, iwl_bz_name),



/* BNJ */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_GL, 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_bnj_a0_fm_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_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, IWL_CFG_ANY,

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

		      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_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),



/* SoF with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,