[iwlwifi-next,08/15] wifi: iwlwifi: cfg: clean up HR device matching

Message ID	20250510214621.fa0cde465de0.I6a3f9ed9a7341e2c58c69af50a9f126992a745f2@changeid
State	New
Headers	show Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7945B28153C for <linux-wireless@vger.kernel.org>; Sat, 10 May 2025 18:48:52 +0000 (UTC) From: Miri Korenblit <miriam.rachel.korenblit@intel.com> To: linux-wireless@vger.kernel.org Cc: Johannes Berg <johannes.berg@intel.com> Subject: [PATCH iwlwifi-next 08/15] wifi: iwlwifi: cfg: clean up HR device matching Date: Sat, 10 May 2025 21:48:20 +0300 Message-Id: <20250510214621.fa0cde465de0.I6a3f9ed9a7341e2c58c69af50a9f126992a745f2@changeid> In-Reply-To: <20250510184827.3800322-1-miriam.rachel.korenblit@intel.com> References: <20250510184827.3800322-1-miriam.rachel.korenblit@intel.com> Precedence: bulk MIME-Version: 1.0 Organization: Intel Israel (74) Limited Content-Transfer-Encoding: 8bit
Series	wifi: iwlwifi: updates - 2025-05-10 \| expand [iwlwifi-next,00/15] wifi: iwlwifi: updates - 2025-05-10 [iwlwifi-next,02/15] wifi: iwlwifi: mld: add debug log instead of warning [iwlwifi-next,04/15] wifi: iwlwifi: cfg: fix some device names [iwlwifi-next,06/15] wifi: iwlwifi: cfg: fix and unify Killer/JF configs [iwlwifi-next,08/15] wifi: iwlwifi: cfg: clean up HR device matching [iwlwifi-next,10/15] wifi: iwlwifi: cfg: clean up JF device matching [iwlwifi-next,12/15] wifi: iwlwifi: cfg: fix and clean up FM/WH device matching [iwlwifi-next,14/15] wifi: iwlwifi: cfg: add a couple of older devices

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c index 5855cf430798..52e0beebf9ce 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c @@ -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[] = diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c index 8b07289f4921..6184d7ca55f9 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c @@ -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 = { diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c b/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c index 7d444ee0a187..db02664e3917 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/rf-hr.c @@ -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"; diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index b41b8aa75739..415523acfa40 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -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)),

[iwlwifi-next,08/15] wifi: iwlwifi: cfg: clean up HR device matching

Commit Message

Patch