github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 12:03:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

wifi: iwlwifi: cfg: clean up HR device matching

Browse Source 
We only need a few entries on top of the Killer ones.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250510214621.fa0cde465de0.I6a3f9ed9a7341e2c58c69af50a9f126992a745f2@changeid
This commit is contained in:
Johannes Berg 2025-05-10 21:48:20 +03:00 committed by Miri Korenblit
parent 0efcd6bbab
commit daf14c9da1
4 changed files with 8 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/intel/iwlwifi/cfg/22000.c
View File

@ -123,11 +123,6 @@ const struct iwl_mac_cfg iwl_ax200_mac_cfg = {
.bisr_workaround = 1,
};
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_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";
const char iwl_ax200_killer_1650w_name[] =
"Killer(R) Wi-Fi 6 AX1650w 160MHz Wireless Network Adapter (200D2W)";
const char iwl_ax200_killer_1650x_name[] =

1
drivers/net/wireless/intel/iwlwifi/cfg/bz.c
View File

@ -33,7 +33,6 @@
#if !IS_ENABLED(CONFIG_IWLMVM)
const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";
const char iwl_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
#endif
static const struct iwl_family_base_params iwl_bz_base = {

5
drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c
View File

@ -35,3 +35,8 @@ const struct iwl_rf_cfg iwl_rf_hr_80mhz = {
IWL_DEVICE_HR,
.bw_limit = 80,
};
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_ax201_name[] = "Intel(R) Wi-Fi 6 AX201 160MHz";
const char iwl_ax203_name[] = "Intel(R) Wi-Fi 6 AX203";

154
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
View File

@ -945,7 +945,9 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x24FD), SUBDEV(0x0012)),
/* HR RF */
/* FIXME - should have some RF match */
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, RF_TYPE(HR2)),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax101_name, RF_TYPE(HR1)),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, RF_TYPE(HR2), BW_LIMITED),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax200_name, DEVICE(0x2723)),
/* Killer CRFs */
@ -973,114 +975,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
IWL_DEV_INFO(iwl_rf_jf, iwl9260_1_name,
DEVICE(0x271C), SUBDEV(0x0214)),
/* AX200 */
/* Qu with Hr */
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x43F0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x43F0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x43F0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x43F0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x43F0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x43F0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x0A10)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0xA0F0), SUBDEV(0x6074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x6074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x0310)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x02F0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x0310)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x06F0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x0310)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x34F0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x0310)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x3DF0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x0070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x0074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x0078)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x007C)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x0310)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x2074)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x4070)),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name,
DEVICE(0x4DF0), SUBDEV(0x6074)),
/* So with HR */
IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
DEVICE(0x2725), SUBDEV(0x0090)),
@ -1241,48 +1135,10 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
/* Qu with Hr */
/* Qu B step */
IWL_DEV_INFO(iwl_rf_hr1, iwl_ax101_name, MAC_TYPE(QU),
MAC_STEP(B), RF_TYPE(HR1), NO_CDB),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, MAC_TYPE(QU), MAC_STEP(B),
RF_TYPE(HR2), BW_LIMITED, NO_CDB),
/* Qu C step */
IWL_DEV_INFO(iwl_rf_hr1, iwl_ax101_name, MAC_TYPE(QU),
MAC_STEP(C), RF_TYPE(HR1), NO_CDB),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, MAC_TYPE(QU), MAC_STEP(C),
RF_TYPE(HR2), BW_LIMITED, NO_CDB),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, MAC_TYPE(QU), MAC_STEP(C),
RF_TYPE(HR2), BW_NOT_LIMITED, NO_CDB),
/* QuZ */
IWL_DEV_INFO(iwl_rf_hr1, iwl_ax101_name, MAC_TYPE(QUZ),
RF_TYPE(HR1), NO_CDB),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, MAC_TYPE(QUZ),
MAC_STEP(B), RF_TYPE(HR2), BW_LIMITED, NO_CDB),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, MAC_TYPE(QUZ),
MAC_STEP(B), RF_TYPE(HR2), BW_NOT_LIMITED, NO_CDB),
/* Ma */
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, MAC_TYPE(MA), RF_TYPE(HR2),
NO_CDB),
IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(MA), RF_TYPE(GF)),
/* So with Hr */
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, MAC_TYPE(SO),
RF_TYPE(HR2), BW_LIMITED, NO_CDB),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax101_name, MAC_TYPE(SO),
RF_TYPE(HR1), BW_LIMITED, NO_CDB),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, MAC_TYPE(SO),
RF_TYPE(HR2), BW_NOT_LIMITED, NO_CDB),
/* So-F with Hr */
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax203_name, MAC_TYPE(SOF),
RF_TYPE(HR2), BW_LIMITED, NO_CDB),
IWL_DEV_INFO(iwl_rf_hr_80mhz, iwl_ax101_name, MAC_TYPE(SOF),
RF_TYPE(HR1), BW_LIMITED, NO_CDB),
IWL_DEV_INFO(iwl_rf_hr, iwl_ax201_name, MAC_TYPE(SOF),
RF_TYPE(HR2), BW_NOT_LIMITED, NO_CDB),
/* So-F with Gf */
IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SOF),
RF_TYPE(GF), BW_NOT_LIMITED, NO_CDB),
@ -1343,16 +1199,12 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x272B), SUBDEV(0x1774)),
/* Bz */
IWL_DEV_INFO(iwl_rf_fm, iwl_ax201_name, MAC_TYPE(BZ), RF_TYPE(HR2)),
IWL_DEV_INFO(iwl_rf_fm, iwl_ax211_name, MAC_TYPE(BZ), RF_TYPE(GF)),
IWL_DEV_INFO(iwl_rf_fm, iwl_fm_name, MAC_TYPE(BZ), RF_TYPE(FM)),
IWL_DEV_INFO(iwl_rf_fm, iwl_wh_name, MAC_TYPE(BZ), RF_TYPE(WH)),
IWL_DEV_INFO(iwl_rf_fm, iwl_ax201_name, MAC_TYPE(BZ_W), RF_TYPE(HR2)),
IWL_DEV_INFO(iwl_rf_fm, iwl_ax211_name, MAC_TYPE(BZ_W), RF_TYPE(GF)),
IWL_DEV_INFO(iwl_rf_fm, iwl_fm_name, MAC_TYPE(BZ_W), RF_TYPE(FM)),