wifi: iwlwifi: cfg: clean up GF device matching

Again some names don't actually exist, and we only need a
few entries to cover Ty (discrete) and AX211/AX411.

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.8888f6798581.If332ebfc3b3f4a335a79ccee13e90f93b1ee4df7@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
index 2002b14bb82d61b3a8fdea4c1042037f0cec842e..15309e6815c7eeddd46b50220b466c627525feed 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
@@ -134,24 +134,7 @@ const struct iwl_mac_cfg iwl_ma_mac_cfg = {
        .umac_prph_offset = 0x300000
 };
 
-const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";
 const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz";
-const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";
-
-const char iwl_ax210_killer_1675w_name[] =
-       "Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)";
-const char iwl_ax210_killer_1675x_name[] =
-       "Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)";
-const char iwl_ax211_killer_1675s_name[] =
-       "Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211NGW)";
-const char iwl_ax211_killer_1675i_name[] =
-       "Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW)";
-const char iwl_ax411_killer_1690s_name[] =
-       "Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W)";
-const char iwl_ax411_killer_1690i_name[] =
-       "Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW)";
-
-const char iwl_ax210_name[] = "Intel(R) Wi-Fi 6 AX210 160MHz";
 
 MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
index 6184d7ca55f93386f8e03d8660bb8ecc205e9d59..424f92b34510241300ca52ee477313539fa62ee3 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
@@ -31,10 +31,6 @@
 #define IWL_BZ_A_HR_B_MODULE_FIRMWARE(api) \
        IWL_BZ_A_HR_B_FW_PRE "-" __stringify(api) ".ucode"
 
-#if !IS_ENABLED(CONFIG_IWLMVM)
-const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";
-#endif
-
 static const struct iwl_family_base_params iwl_bz_base = {
        .num_of_queues = 512,
        .max_tfd_queue_size = 65536,

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c
index a90dba3220945b632faf2fd27c83bf75b9e6f92d..f55c286e83bea1f9197f3e88284eaaf4c062467f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-gf.c
@@ -23,3 +23,20 @@ const struct iwl_rf_cfg iwl_rf_gf = {
        .nvm_type = IWL_NVM_EXT,
        .num_rbds = IWL_NUM_RBDS_HE,
 };
+
+const char iwl_ax210_killer_1675w_name[] =
+       "Killer(R) Wi-Fi 6E AX1675w 160MHz Wireless Network Adapter (210D2W)";
+const char iwl_ax210_killer_1675x_name[] =
+       "Killer(R) Wi-Fi 6E AX1675x 160MHz Wireless Network Adapter (210NGW)";
+const char iwl_ax211_killer_1675s_name[] =
+       "Killer(R) Wi-Fi 6E AX1675s 160MHz Wireless Network Adapter (211D2W)";
+const char iwl_ax211_killer_1675i_name[] =
+       "Killer(R) Wi-Fi 6E AX1675i 160MHz Wireless Network Adapter (211NGW)";
+const char iwl_ax411_killer_1690s_name[] =
+       "Killer(R) Wi-Fi 6E AX1690s 160MHz Wireless Network Adapter (411D2W)";
+const char iwl_ax411_killer_1690i_name[] =
+       "Killer(R) Wi-Fi 6E AX1690i 160MHz Wireless Network Adapter (411NGW)";
+
+const char iwl_ax210_name[] = "Intel(R) Wi-Fi 6E AX210 160MHz";
+const char iwl_ax211_name[] = "Intel(R) Wi-Fi 6E AX211 160MHz";
+const char iwl_ax411_name[] = "Intel(R) Wi-Fi 6E AX411 160MHz";

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index d9df88d10324a2461967762388c78bc27d6b1916..7e6edf6f204054420dc62245c65e38e3898e2468 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -969,6 +969,11 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
        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)),
 
+/* GF RF */
+       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, RF_TYPE(GF)),
+       IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, RF_TYPE(GF), CDB),
+       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name, DEVICE(0x2725)),
+
 /* Killer CRFs */
        IWL_DEV_INFO(iwl_rf_jf, iwl9260_killer_1550_name, SUBDEV(0x1550)),
        IWL_DEV_INFO(iwl_rf_jf, iwl9560_killer_1550s_name, SUBDEV(0x1551)),
@@ -989,74 +994,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
                     DEVICE(0x2723), SUBDEV(0x1653)),
        IWL_DEV_INFO(iwl_rf_hr, iwl_ax200_killer_1650x_name,
                     DEVICE(0x2723), SUBDEV(0x1654)),
-
-/* JF RF */
-       /* So with HR */
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x2725), SUBDEV(0x0090)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x0020)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x2020)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x0024)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x0310)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x0510)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x0A10)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0xE020)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0xE024)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x4020)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x6020)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax210_name,
-                    DEVICE(0x2725), SUBDEV(0x6024)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7A70), SUBDEV(0x0090)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7A70), SUBDEV(0x0098)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name,
-                    DEVICE(0x7A70), SUBDEV(0x00B0)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7A70), SUBDEV(0x0310)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7A70), SUBDEV(0x0510)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7A70), SUBDEV(0x0A10)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7AF0), SUBDEV(0x0090)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7AF0), SUBDEV(0x0098)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name,
-                    DEVICE(0x7AF0), SUBDEV(0x00B0)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7AF0), SUBDEV(0x0310)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7AF0), SUBDEV(0x0510)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
-                    DEVICE(0x7AF0), SUBDEV(0x0A10)),
-
-
-/* Ma */
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(MA), RF_TYPE(GF)),
-
-/* So-F with Gf */
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SOF),
-                    RF_TYPE(GF), BW_NOT_LIMITED, NO_CDB),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, MAC_TYPE(SOF),
-                    RF_TYPE(GF), BW_NOT_LIMITED, CDB),
-
-/* So with GF */
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SO),
-                    RF_TYPE(GF), BW_NOT_LIMITED, NO_CDB),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, MAC_TYPE(SO),
-                    RF_TYPE(GF), BW_NOT_LIMITED, CDB),
-
 #endif /* CONFIG_IWLMVM */
 #if IS_ENABLED(CONFIG_IWLMLD)
        IWL_DEV_INFO(iwl_rf_fm, iwl_ax231_name, MAC_TYPE(MA), RF_TYPE(FM),
@@ -1073,14 +1010,10 @@ 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_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_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)),
 
        IWL_DEV_INFO(iwl_rf_fm, iwl_wh_name, MAC_TYPE(BZ_W), RF_TYPE(WH)),
@@ -1092,21 +1025,18 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
                     BW_LIMITED, NO_CDB),
 
 /* Sc */
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SC), RF_TYPE(GF)),
        IWL_DEV_INFO(iwl_rf_fm, iwl_fm_name, MAC_TYPE(SC), RF_TYPE(FM)),
        IWL_DEV_INFO(iwl_rf_wh, iwl_wh_name, MAC_TYPE(SC), RF_TYPE(WH),
                     BW_NOT_LIMITED),
        IWL_DEV_INFO(iwl_rf_wh_160mhz, iwl_sp_name, MAC_TYPE(SC), RF_TYPE(WH),
                     BW_LIMITED),
        IWL_DEV_INFO(iwl_rf_pe, iwl_pe_name, MAC_TYPE(SC), RF_TYPE(PE)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SC2), RF_TYPE(GF)),
        IWL_DEV_INFO(iwl_rf_fm, iwl_fm_name, MAC_TYPE(SC2), RF_TYPE(FM)),
        IWL_DEV_INFO(iwl_rf_wh, iwl_wh_name, MAC_TYPE(SC2), RF_TYPE(WH),
                     BW_NOT_LIMITED),
        IWL_DEV_INFO(iwl_rf_wh_160mhz, iwl_sp_name, MAC_TYPE(SC2), RF_TYPE(WH),
                     BW_LIMITED),
        IWL_DEV_INFO(iwl_rf_pe, iwl_pe_name, MAC_TYPE(SC2), RF_TYPE(PE)),
-       IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(SC2F), RF_TYPE(GF)),
        IWL_DEV_INFO(iwl_rf_fm, iwl_fm_name, MAC_TYPE(SC2F), RF_TYPE(FM)),
        IWL_DEV_INFO(iwl_rf_wh, iwl_wh_name, MAC_TYPE(SC2F), RF_TYPE(WH),
                     BW_NOT_LIMITED),