iwlwifi: Add a new card for MA family (ac1a98e1) · Commits · 戴 / test

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@
		#define IWL_SNJ_A_HR_B_FW_PRE "iwlwifi-SoSnj-a0-hr-b0-"
		#define IWL_MA_A_GF_A_FW_PRE "iwlwifi-ma-a0-gf-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_QU_B_HR_B_MODULE_FIRMWARE(api) \
		IWL_QU_B_HR_B_FW_PRE __stringify(api) ".ucode"
		@@ -79,6 +80,8 @@
		IWL_MA_A_GF_A_FW_PRE __stringify(api) ".ucode"
		#define IWL_MA_A_MR_A_FW_MODULE_FIRMWARE(api) \
		IWL_MA_A_MR_A_FW_PRE __stringify(api) ".ucode"
		#define IWL_SNJ_A_MR_A_MODULE_FIRMWARE(api) \
		IWL_SNJ_A_MR_A_FW_PRE __stringify(api) ".ucode"

		static const struct iwl_base_params iwl_22000_base_params = {
		.eeprom_size = OTP_LOW_IMAGE_SIZE_32K,
		@@ -600,6 +603,13 @@ const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = {
		.num_rbds = IWL_NUM_RBDS_AX210_HE,
		};

		const struct iwl_cfg iwl_cfg_snj_a0_mr_a0 = {
		.fw_name_pre = IWL_SNJ_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_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));
		@@ -617,3 +627,4 @@ MODULE_FIRMWARE(IWL_SNJ_A_GF_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_SNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
		MODULE_FIRMWARE(IWL_MA_A_GF_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));

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -418,6 +418,7 @@ struct iwl_cfg {
		#define IWL_CFG_MAC_TYPE_QU 0x33
		#define IWL_CFG_MAC_TYPE_QUZ 0x35
		#define IWL_CFG_MAC_TYPE_QNJ 0x36
		#define IWL_CFG_MAC_TYPE_SNJ 0x42
		#define IWL_CFG_MAC_TYPE_MA 0x44

		#define IWL_CFG_RF_TYPE_TH 0x105
		@@ -599,6 +600,7 @@ extern const struct iwl_cfg iwlax211_cfg_snj_gf_a0;
		extern const struct iwl_cfg iwlax201_cfg_snj_hr_b0;
		extern const struct iwl_cfg iwl_cfg_ma_a0_gf_a0;
		extern const struct iwl_cfg iwl_cfg_ma_a0_mr_a0;
		extern const struct iwl_cfg iwl_cfg_snj_a0_mr_a0;
		#endif /* CONFIG_IWLMVM */

		#endif /* __IWL_CONFIG_H__ */

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -936,6 +936,12 @@ static const struct iwl_dev_info iwl_dev_info_table[] = {
		IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,
		IWL_CFG_ANY, IWL_CFG_ANY,
		iwl_cfg_ma_a0_mr_a0, iwl_ma_name),
		_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
		IWL_CFG_MAC_TYPE_SNJ, IWL_CFG_ANY,
		IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY,
		IWL_CFG_ANY, IWL_CFG_ANY,
		iwl_cfg_snj_a0_mr_a0, iwl_ma_name),


		#endif /* CONFIG_IWLMVM */
		};

Admin message