Commit 2be05dfd authored by Matti Gottlieb's avatar Matti Gottlieb Committed by Luca Coelho
Browse files

iwlwifi: pcie: Add support for Bz Family 



Add support for different combinations of Bz
and CRFs.

Note: As of now we do not know the exact values
for ltr_delay and xtal_latency, so for now use the
worst case scenario values until the actual values
are clarified.

Signed-off-by: default avatarMatti Gottlieb <matti.gottlieb@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210330162204.caac8d996532.I6a22d6decb106cd50d7954b19236b69d685dcc39@changeid


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

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

+58 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,10 @@ 
#define IWL_MA_A_GF4_A_FW_PRE		"iwlwifi-ma-a0-gf4-a0-"

#define IWL_MA_A_GF4_A_FW_PRE		"iwlwifi-ma-a0-gf4-a0-"

#define IWL_MA_A_MR_A_FW_PRE		"iwlwifi-ma-a0-mr-a0-"

#define IWL_MA_A_MR_A_FW_PRE		"iwlwifi-ma-a0-mr-a0-"

#define IWL_SNJ_A_MR_A_FW_PRE		"iwlwifi-SoSnj-a0-mr-a0-"

#define IWL_SNJ_A_MR_A_FW_PRE		"iwlwifi-SoSnj-a0-mr-a0-"

#define IWL_BZ_A_HR_B_FW_PRE		"iwlwifi-bz-a0-hr-b0-"

#define IWL_BZ_A_GF_A_FW_PRE		"iwlwifi-bz-a0-gf-a0-"

#define IWL_BZ_A_GF4_A_FW_PRE		"iwlwifi-bz-a0-gf4-a0-"

#define IWL_BZ_A_MR_A_FW_PRE		"iwlwifi-bz-a0-mr-a0-"





#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

#define IWL_QU_B_HR_B_MODULE_FIRMWARE(api) \

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"

	IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
@@ -91,6 +95,14 @@ 
	IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode"

	IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \

#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \

	IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode"

	IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \

	IWL_BZ_A_HR_B_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_GF_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_GF_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_GF4_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_GF4_A_FW_PRE __stringify(api) ".ucode"

#define IWL_BZ_A_MR_A_MODULE_FIRMWARE(api) \

	IWL_BZ_A_MR_A_FW_PRE __stringify(api) ".ucode"





static const struct iwl_base_params iwl_22000_base_params = {

static const struct iwl_base_params iwl_22000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
@@ -357,6 +369,20 @@ const struct iwl_cfg_trans_params iwl_ma_trans_cfg = { 
	.umac_prph_offset = 0x300000

	.umac_prph_offset = 0x300000

};

};





const struct iwl_cfg_trans_params iwl_bz_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_AX210,

	.base_params = &iwl_ax210_base_params,

	.mq_rx_supported = true,

	.use_tfh = true,

	.rf_id = true,

	.gen2 = true,

	.integrated = true,

	.umac_prph_offset = 0x300000,

	.xtal_latency = 12000,

	.low_latency_xtal = true,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US,

};



const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";

const char iwl_ax101_name[] = "Intel(R) Wi-Fi 6 AX101";

const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";

const char iwl_ax200_name[] = "Intel(R) Wi-Fi 6 AX200 160MHz";

const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";

const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
@@ -719,6 +745,34 @@ const struct iwl_cfg iwl_cfg_quz_a0_hr_b0 = { 
	.num_rbds = IWL_NUM_RBDS_22000_HE,

	.num_rbds = IWL_NUM_RBDS_22000_HE,

};

};





const struct iwl_cfg iwl_cfg_bz_a0_hr_b0 = {

	.fw_name_pre = IWL_BZ_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_gf_a0 = {

	.fw_name_pre = IWL_BZ_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0 = {

	.fw_name_pre = IWL_BZ_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_bz_a0_mr_a0 = {

	.fw_name_pre = IWL_BZ_A_MR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
@@ -740,3 +794,7 @@ MODULE_FIRMWARE(IWL_MA_A_GF_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX)); 
MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_GF4_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SNJ_A_MR_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));

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

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -416,6 +416,7 @@ struct iwl_cfg { 
#define IWL_CFG_MAC_TYPE_SNJ		0x42

#define IWL_CFG_MAC_TYPE_SNJ		0x42

#define IWL_CFG_MAC_TYPE_SOF		0x43

#define IWL_CFG_MAC_TYPE_SOF		0x43

#define IWL_CFG_MAC_TYPE_MA		0x44

#define IWL_CFG_MAC_TYPE_MA		0x44

#define IWL_CFG_MAC_TYPE_BZ		0x46





#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH		0x105

#define IWL_CFG_RF_TYPE_TH1		0x108

#define IWL_CFG_RF_TYPE_TH1		0x108
@@ -477,6 +478,7 @@ extern const struct iwl_cfg_trans_params iwl_snj_trans_cfg; 
extern const struct iwl_cfg_trans_params iwl_so_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_so_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_so_long_latency_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ma_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_ma_trans_cfg;

extern const struct iwl_cfg_trans_params iwl_bz_trans_cfg;

extern const char iwl9162_name[];

extern const char iwl9162_name[];

extern const char iwl9260_name[];

extern const char iwl9260_name[];

extern const char iwl9260_1_name[];

extern const char iwl9260_1_name[];
@@ -612,6 +614,10 @@ extern const struct iwl_cfg iwl_cfg_ma_a0_mr_a0; 
extern const struct iwl_cfg iwl_cfg_snj_a0_mr_a0;

extern const struct iwl_cfg iwl_cfg_snj_a0_mr_a0;

extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0;

extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0;

extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bz_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_bz_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_bz_a0_mr_a0;

#endif /* CONFIG_IWLMVM */

#endif /* CONFIG_IWLMVM */





#endif /* __IWL_CONFIG_H__ */
 
#endif /* __IWL_CONFIG_H__ */

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

+24 −0
Original line number Original line Diff line number Diff line
@@ -490,6 +490,8 @@ static const struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x2729, PCI_ANY_ID, iwl_ma_trans_cfg)},

	{IWL_PCI_DEVICE(0x2729, PCI_ANY_ID, iwl_ma_trans_cfg)},

	{IWL_PCI_DEVICE(0x7E40, PCI_ANY_ID, iwl_ma_trans_cfg)},

	{IWL_PCI_DEVICE(0x7E40, PCI_ANY_ID, iwl_ma_trans_cfg)},





/* Bz devices */

	{IWL_PCI_DEVICE(0x2727, PCI_ANY_ID, iwl_bz_trans_cfg)},

#endif /* CONFIG_IWLMVM */

#endif /* CONFIG_IWLMVM */





	{0}

	{0}
@@ -1067,6 +1069,28 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name),

		      iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_name),





/* Bz */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_hr_b0, iwl_ax201_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_gf_a0, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB,

		      iwl_cfg_bz_a0_gf4_a0, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_BZ, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_bz_a0_mr_a0, iwl_ma_name),



#endif /* CONFIG_IWLMVM */

#endif /* CONFIG_IWLMVM */

};

};