wifi: iwlwifi: cfg: clean up JF device matching

This really only needs to be distinguished based on the
RF type, bandwidth limit and possibly diversity (JF1).
Some of the names that are defined don't even exist.

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.bca83604aa92.I35301d2d8b57c072284fff7bf6682b4a9424e56c@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
index 816cf72e32e73947817736917de19ce362a54d12..ac1fa291cf2f0376e28dc3f6c65d40974deb2212 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/9000.c
@@ -100,26 +100,5 @@ const struct iwl_mac_cfg iwl9560_shared_clk_mac_cfg = {
        .extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK
 };
 
-const char iwl9162_name[] = "Intel(R) Wireless-AC 9162";
-const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";
-const char iwl9260_1_name[] = "Intel(R) Wireless-AC 9260-1";
-const char iwl9270_name[] = "Intel(R) Wireless-AC 9270";
-const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";
-const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";
-const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";
-const char iwl9162_160_name[] = "Intel(R) Wireless-AC 9162 160MHz";
-const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";
-const char iwl9270_160_name[] = "Intel(R) Wireless-AC 9270 160MHz";
-const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";
-const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";
-const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";
-
-const char iwl9260_killer_1550_name[] =
-       "Killer(R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz";
-const char iwl9560_killer_1550i_name[] =
-       "Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz";
-const char iwl9560_killer_1550s_name[] =
-       "Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz";
-
 MODULE_FIRMWARE(IWL9000_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL9260_MODULE_FIRMWARE(IWL9000_UCODE_API_MAX));

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c
index 60f5fcfb1f46661d89972f19fb886115b092722b..467eaeae6deb215f5b37510382c0b321133c259a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-jf.c
@@ -66,3 +66,19 @@ const struct iwl_rf_cfg iwl_rf_jf_80mhz = {
        IWL_DEVICE_JF,
        .bw_limit = 80,
 };
+
+const char iwl9260_name[] = "Intel(R) Wireless-AC 9260";
+const char iwl9461_name[] = "Intel(R) Wireless-AC 9461";
+const char iwl9462_name[] = "Intel(R) Wireless-AC 9462";
+const char iwl9560_name[] = "Intel(R) Wireless-AC 9560";
+const char iwl9260_160_name[] = "Intel(R) Wireless-AC 9260 160MHz";
+const char iwl9461_160_name[] = "Intel(R) Wireless-AC 9461 160MHz";
+const char iwl9462_160_name[] = "Intel(R) Wireless-AC 9462 160MHz";
+const char iwl9560_160_name[] = "Intel(R) Wireless-AC 9560 160MHz";
+
+const char iwl9260_killer_1550_name[] =
+       "Killer(R) Wireless-AC 1550 Wireless Network Adapter (9260NGW) 160MHz";
+const char iwl9560_killer_1550i_name[] =
+       "Killer(R) Wireless-AC 1550i Wireless Network Adapter (9560NGW) 160MHz";
+const char iwl9560_killer_1550s_name[] =
+       "Killer(R) Wireless-AC 1550s Wireless Network Adapter (9560D2W) 160MHz";

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 415523acfa409978864e9558fde362b8434576f3..d9df88d10324a2461967762388c78bc27d6b1916 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -944,6 +944,25 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
        IWL_DEV_INFO(iwl8265_cfg, iwl8275_2ac_name,
                     DEVICE(0x24FD), SUBDEV(0x0012)),
 
+/* JF1 RF */
+       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name,
+                    RF_TYPE(JF1)),
+       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name,
+                    RF_TYPE(JF1), BW_LIMITED),
+       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name,
+                    RF_TYPE(JF1), RF_ID(JF1_DIV)),
+       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name,
+                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_LIMITED),
+/* JF2 RF */
+       IWL_DEV_INFO(iwl_rf_jf, iwl9260_160_name,
+                    RF_TYPE(JF2)),
+       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9260_name,
+                    RF_TYPE(JF2), BW_LIMITED),
+       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name,
+                    RF_TYPE(JF2), RF_ID(JF)),
+       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name,
+                    RF_TYPE(JF2), RF_ID(JF), BW_LIMITED),
+
 /* HR RF */
        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)),
@@ -972,9 +991,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
                     DEVICE(0x2723), SUBDEV(0x1654)),
 
 /* JF RF */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9260_1_name,
-                    DEVICE(0x271C), SUBDEV(0x0214)),
-
        /* So with HR */
        IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
                     DEVICE(0x2725), SUBDEV(0x0090)),
@@ -1025,116 +1041,6 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
        IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name,
                     DEVICE(0x7AF0), SUBDEV(0x0A10)),
 
-       /* MA with GF2 */
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name, MAC_TYPE(PU),
-                    RF_TYPE(JF1), RF_ID(JF1),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name, MAC_TYPE(PU),
-                    RF_TYPE(JF1), RF_ID(JF1),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name, MAC_TYPE(PU),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name, MAC_TYPE(PU),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name, MAC_TYPE(PU),
-                    RF_TYPE(JF2), RF_ID(JF),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name, MAC_TYPE(PU),
-                    RF_TYPE(JF2), RF_ID(JF),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9270_160_name, DEVICE(0x2526),
-                    MAC_TYPE(TH), RF_TYPE(JF2),
-                    BW_NOT_LIMITED, CORES(BT_GNSS), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9270_name, DEVICE(0x2526),
-                    MAC_TYPE(TH), RF_TYPE(JF2),
-                    BW_LIMITED, CORES(BT_GNSS), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9162_160_name, DEVICE(0x271B),
-                    MAC_TYPE(TH), RF_TYPE(JF1),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9162_name, DEVICE(0x271B),
-                    MAC_TYPE(TH), RF_TYPE(JF1),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9260_160_name, DEVICE(0x2526),
-                    MAC_TYPE(TH), RF_TYPE(JF2),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9260_name, DEVICE(0x2526),
-                    MAC_TYPE(TH), RF_TYPE(JF2),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-/* Qu with Jf */
-       /* Qu B step */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name,
-                    MAC_TYPE(QU), MAC_STEP(B), RF_TYPE(JF1), RF_ID(JF1),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name,
-                    MAC_TYPE(QU), MAC_STEP(B), RF_TYPE(JF1), RF_ID(JF1),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name,
-                    MAC_TYPE(QU), MAC_STEP(B),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name,
-                    MAC_TYPE(QU), MAC_STEP(B),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name,
-                    MAC_TYPE(QU), MAC_STEP(B),
-                    RF_TYPE(JF2), RF_ID(JF),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name,
-                    MAC_TYPE(QU), MAC_STEP(B),
-                    RF_TYPE(JF2), RF_ID(JF),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-       /* Qu C step */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name,
-                    MAC_TYPE(QU), MAC_STEP(C),
-                    RF_TYPE(JF1), RF_ID(JF1),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name,
-                    MAC_TYPE(QU), MAC_STEP(C),
-                    RF_TYPE(JF1), RF_ID(JF1),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name,
-                    MAC_TYPE(QU), MAC_STEP(C),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV),
-                    BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name,
-                    MAC_TYPE(QU), MAC_STEP(C),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV),
-                    BW_LIMITED, CORES(BT), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name, MAC_TYPE(QU),
-                    MAC_STEP(C), RF_TYPE(JF2), RF_ID(JF), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name, MAC_TYPE(QU),
-                    MAC_STEP(C), RF_TYPE(JF2), RF_ID(JF), BW_LIMITED, CORES(BT),
-                    NO_CDB),
-
-       /* QuZ */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name, MAC_TYPE(QUZ),
-                    RF_TYPE(JF1), RF_ID(JF1), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name, MAC_TYPE(QUZ),
-                    RF_TYPE(JF1), RF_ID(JF1), BW_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name, MAC_TYPE(QUZ),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name, MAC_TYPE(QUZ),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_LIMITED, CORES(BT), NO_CDB),
-
-       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name, MAC_TYPE(QUZ),
-                    RF_TYPE(JF2), RF_ID(JF), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name, MAC_TYPE(QUZ),
-                    RF_TYPE(JF2), RF_ID(JF), BW_LIMITED, CORES(BT), NO_CDB),
-
-/* Qu with Hr */
-       /* Qu B step */
 
 /* Ma */
        IWL_DEV_INFO(iwl_rf_gf, iwl_ax211_name, MAC_TYPE(MA), RF_TYPE(GF)),
@@ -1145,44 +1051,12 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
        IWL_DEV_INFO(iwl_rf_gf, iwl_ax411_name, MAC_TYPE(SOF),
                     RF_TYPE(GF), BW_NOT_LIMITED, CDB),
 
-/* SoF with JF2 */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name, MAC_TYPE(SOF),
-                    RF_TYPE(JF2), RF_ID(JF), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name, MAC_TYPE(SOF),
-                    RF_TYPE(JF2), RF_ID(JF), BW_LIMITED, CORES(BT), NO_CDB),
-
-/* SoF with JF */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name, MAC_TYPE(SOF),
-                    RF_TYPE(JF1), RF_ID(JF1), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name, MAC_TYPE(SOF),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name, MAC_TYPE(SOF),
-                    RF_TYPE(JF1), RF_ID(JF1), BW_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name, MAC_TYPE(SOF),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_LIMITED, CORES(BT), NO_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),
 
-/* So with JF2 */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9560_160_name, MAC_TYPE(SO),
-                    RF_TYPE(JF2), RF_ID(JF), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9560_name, MAC_TYPE(SO),
-                    RF_TYPE(JF2), RF_ID(JF), BW_LIMITED, CORES(BT), NO_CDB),
-
-/* So with JF */
-       IWL_DEV_INFO(iwl_rf_jf, iwl9461_160_name, MAC_TYPE(SO),
-                    RF_TYPE(JF1), RF_ID(JF1), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf, iwl9462_160_name, MAC_TYPE(SO),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_NOT_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9461_name, MAC_TYPE(SO),
-                    RF_TYPE(JF1), RF_ID(JF1), BW_LIMITED, CORES(BT), NO_CDB),
-       IWL_DEV_INFO(iwl_rf_jf_80mhz, iwl9462_name, MAC_TYPE(SO),
-                    RF_TYPE(JF1), RF_ID(JF1_DIV), BW_LIMITED, CORES(BT), NO_CDB),
-
 #endif /* CONFIG_IWLMVM */
 #if IS_ENABLED(CONFIG_IWLMLD)
        IWL_DEV_INFO(iwl_rf_fm, iwl_ax231_name, MAC_TYPE(MA), RF_TYPE(FM),