Commit ecf11f4e authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: also unify Ma device configurations 



Again, they're all the same except for the radio and
steps, so use the new logic to unify them.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230621130443.676887cc8180.I29994dec43bfb29aad5e4ab0126c06a9ea4670cb@changeid


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

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

+2 −72
Original line number Diff line number Diff line
@@ -273,76 +273,6 @@ const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long = { 
	.trans.low_latency_xtal = true,

};



const struct iwl_cfg iwl_cfg_ma_a0_hr_b0 = {

	.fw_name_pre = IWL_MA_A_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_gf_a0 = {

	.fw_name_pre = IWL_MA_A_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0 = {

	.fw_name_pre = IWL_MA_A_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_mr_a0 = {

	.fw_name_pre = IWL_MA_A_MR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_ms_a0 = {

	.fw_name_pre = IWL_MA_A_MR_A_FW_PRE,

	.uhb_supported = false,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_b0_fm_a0 = {

	.fw_name_pre = IWL_MA_B_FM_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_b0_hr_b0 = {

	.fw_name_pre = IWL_MA_B_HR_B_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_b0_gf_a0 = {

	.fw_name_pre = IWL_MA_B_GF_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_b0_gf4_a0 = {

	.fw_name_pre = IWL_MA_B_GF4_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_b0_mr_a0 = {

	.fw_name_pre = IWL_MA_B_MR_A_FW_PRE,

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_so_a0_ms_a0 = {

	.fw_name_pre = IWL_SO_A_MR_A_FW_PRE,

	.uhb_supported = false,
@@ -350,8 +280,8 @@ const struct iwl_cfg iwl_cfg_so_a0_ms_a0 = { 
	.num_rbds = IWL_NUM_RBDS_AX210_HE,

};



const struct iwl_cfg iwl_cfg_ma_a0_fm_a0 = {

	.fw_name_pre = IWL_MA_A_FM_A_FW_PRE,

const struct iwl_cfg iwl_cfg_ma = {

	.fw_name_mac = "ma",

	.uhb_supported = true,

	IWL_DEVICE_AX210,

	.num_rbds = IWL_NUM_RBDS_AX210_HE,

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

+3 −11
Original line number Diff line number Diff line
@@ -632,17 +632,9 @@ extern const struct iwl_cfg iwlax211_2ax_cfg_so_gf_a0_long; 
extern const struct iwl_cfg iwlax210_2ax_cfg_ty_gf_a0;

extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0;

extern const struct iwl_cfg iwlax411_2ax_cfg_so_gf4_a0_long;

extern const struct iwl_cfg iwl_cfg_ma_a0_hr_b0;

extern const struct iwl_cfg iwl_cfg_ma_a0_gf_a0;

extern const struct iwl_cfg iwl_cfg_ma_a0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_ma_a0_mr_a0;

extern const struct iwl_cfg iwl_cfg_ma_a0_ms_a0;

extern const struct iwl_cfg iwl_cfg_ma_a0_fm_a0;

extern const struct iwl_cfg iwl_cfg_ma_b0_hr_b0;

extern const struct iwl_cfg iwl_cfg_ma_b0_gf_a0;

extern const struct iwl_cfg iwl_cfg_ma_b0_gf4_a0;

extern const struct iwl_cfg iwl_cfg_ma_b0_mr_a0;

extern const struct iwl_cfg iwl_cfg_ma_b0_fm_a0;



extern const struct iwl_cfg iwl_cfg_ma;



extern const struct iwl_cfg iwl_cfg_so_a0_hr_a0;

extern const struct iwl_cfg iwl_cfg_so_a0_ms_a0;

extern const struct iwl_cfg iwl_cfg_quz_a0_hr_b0;

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

+14 −44
Original line number Diff line number Diff line
@@ -551,8 +551,8 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
	IWL_DEV_INFO(0x7A70, 0x1692, iwlax411_2ax_cfg_so_gf4_a0, iwl_ax411_killer_1690i_name),



	IWL_DEV_INFO(0x271C, 0x0214, iwl9260_2ac_cfg, iwl9260_1_name),

	IWL_DEV_INFO(0x7E40, 0x1691, iwl_cfg_ma_a0_gf4_a0, iwl_ax411_killer_1690s_name),

	IWL_DEV_INFO(0x7E40, 0x1692, iwl_cfg_ma_a0_gf4_a0, iwl_ax411_killer_1690i_name),

	IWL_DEV_INFO(0x7E40, 0x1691, iwl_cfg_ma, iwl_ax411_killer_1690s_name),

	IWL_DEV_INFO(0x7E40, 0x1692, iwl_cfg_ma, iwl_ax411_killer_1690i_name),



/* AX200 */

	IWL_DEV_INFO(0x2723, IWL_CFG_ANY, iwl_ax200_cfg_cc, iwl_ax200_name),
@@ -677,8 +677,8 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
	IWL_DEV_INFO(0x7F70, 0x1672, iwlax211_2ax_cfg_so_gf_a0, iwl_ax211_killer_1675i_name),



	/* MA with GF2 */

	IWL_DEV_INFO(0x7E40, 0x1671, iwl_cfg_ma_a0_gf_a0, iwl_ax211_killer_1675s_name),

	IWL_DEV_INFO(0x7E40, 0x1672, iwl_cfg_ma_a0_gf_a0, iwl_ax211_killer_1675i_name),

	IWL_DEV_INFO(0x7E40, 0x1671, iwl_cfg_ma, iwl_ax211_killer_1675s_name),

	IWL_DEV_INFO(0x7E40, 0x1672, iwl_cfg_ma, iwl_ax211_killer_1675i_name),



	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_PU, IWL_CFG_ANY,
@@ -927,55 +927,25 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 


/* Ma */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_a0_hr_b0, iwl_ax201_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_a0_gf_a0, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB,

		      iwl_cfg_ma_a0_gf4_a0, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_a0_mr_a0, iwl_ax221_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_A_STEP,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_a0_fm_a0, iwl_ax231_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_B_STEP,

		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_HR2, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_b0_hr_b0, iwl_ax201_name),

		      iwl_cfg_ma, iwl_ax201_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_B_STEP,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_b0_gf_a0, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_B_STEP,

		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_CDB,

		      iwl_cfg_ma_b0_gf4_a0, iwl_ax211_name),

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_ANY,

		      iwl_cfg_ma, iwl_ax211_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_B_STEP,

		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MR, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_b0_mr_a0, iwl_ax221_name),

		      iwl_cfg_ma, iwl_ax221_name),

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_MAC_TYPE_MA, SILICON_B_STEP,

		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_FM, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_b0_fm_a0, iwl_ax231_name),

		      iwl_cfg_ma, iwl_ax231_name),



/* So with Hr */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,
@@ -1138,7 +1108,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { 
		      IWL_CFG_MAC_TYPE_MA, IWL_CFG_ANY,

		      IWL_CFG_RF_TYPE_MS, IWL_CFG_ANY, IWL_CFG_ANY,

		      IWL_CFG_160, IWL_CFG_ANY, IWL_CFG_NO_CDB,

		      iwl_cfg_ma_a0_ms_a0, iwl_ax204_name),

		      iwl_cfg_ma, iwl_ax204_name),



/* Sc */

	_IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY,