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

iwlwifi: add support for Bz-Z HW 



Add support for Bz Z step HW with GF RF.

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.20211204083238.fc8626515758.Ibfeffc8bb071f9773ea189992ebef056f51be1be@changeid


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

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

+10 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#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_GL_A_FM_A_FW_PRE		"iwlwifi-gl-a0-fm7-a0-"

#define IWL_BZ_Z_GF_A_FW_PRE		"iwlwifi-bz-z0-gf-a0-"





#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \
@@ -113,6 +114,8 @@ 
		IWL_BZ_A_FM_A_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_BZ_Z_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_Z_GF_A_FW_PRE __stringify(api) ".ucode"



static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -879,6 +882,13 @@ const struct iwl_cfg iwl_cfg_gl_a0_fm_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_z0_gf_a0 = {

	.fw_name_pre = IWL_BZ_Z_GF_A_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));

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

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

extern const struct iwl_cfg iwl_cfg_bz_z0_gf_a0;

#endif /* CONFIG_IWLMVM */



#endif /* __IWL_CONFIG_H__ */

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

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ enum { 
	SILICON_A_STEP = 0,

	SILICON_B_STEP,

	SILICON_C_STEP,

	SILICON_Z_STEP = 0xf,

};

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

+7 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,13 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_gl_a0_fm_a0, iwl_bz_name),



/* BZ Z step */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, SILICON_Z_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_z0_gf_a0, iwl_bz_name),



/* SoF with JF2 */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_SOF, IWL_CFG_ANY,