From: Nidhish A N nidhish.a.n@intel.com
[ Upstream commit c5318e6e1c6436ce35ba521d96975e13cc5119f7 ]
Add ASUS to the list of OEMs that are allowed to use the PPAG and TAS feature.
Signed-off-by: Nidhish A N nidhish.a.n@intel.com Reviewed-by: Pagadala Yesu Anjaneyulu pagadala.yesu.anjaneyulu@intel.com Signed-off-by: Miri Korenblit miriam.rachel.korenblit@intel.com Link: https://patch.msgid.link/20250909061931.499af6568e89.Iafb2cb1c83ff82712c0e9d... Signed-off-by: Sasha Levin sashal@kernel.org ---
LLM Generated explanations, may be completely bogus:
YES
- What changed - Adds a new DMI allowlist entry for `DMI_SYS_VENDOR == "ASUS"` alongside the existing `ASUSTeK COMPUTER INC.` entry for both PPAG and TAS: - PPAG list: drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:46 adds an `ASUSTEK` entry for `"ASUSTeK COMPUTER INC."` and a new `ASUS` entry for `"ASUS"` at drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:67. - TAS list: mirrors the same pattern at drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:149 (ASUSTEK) and drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:154 (ASUS). - The `.ident` strings are only labels; matching logic depends on `.matches`.
- How the lists are used - PPAG gating: `iwl_is_ppag_approved()` checks `dmi_ppag_approved_list` and, if not approved, disables PPAG by clearing `fwrt->ppag_flags` (drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:427–439). Callers gate PPAG setup on this: - MVM: drivers/net/wireless/intel/iwlwifi/mvm/fw.c:1068 - MLD: drivers/net/wireless/intel/iwlwifi/mld/regulatory.c:203 - TAS gating: `iwl_is_tas_approved()` checks `dmi_tas_approved_list` (drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:441–445). If not approved, MVM/MLD explicitly add US and Canada to the TAS block list to disable the feature there: - MVM: drivers/net/wireless/intel/iwlwifi/mvm/fw.c:1110–1120 - MLD: drivers/net/wireless/intel/iwlwifi/mld/regulatory.c:352–366
- Why this fits stable backport criteria - User-visible bug fix: On some ASUS systems the DMI vendor is reported as `"ASUS"` (not `"ASUSTeK COMPUTER INC."`). Without this change, those systems are treated as unapproved, which disables PPAG and restricts TAS (notably in US/CA), reducing performance or altering behavior despite the OEM providing valid BIOS/UEFI tables. This is a real-world mismatch rather than a new feature. - Small and contained: The patch is limited to two allowlist arrays in a single file and adds no new code paths or APIs. - Low regression risk: - Enabling PPAG/TAS still depends on valid BIOS/UEFI data and firmware capabilities. If tables are missing/invalid, the driver already logs and exits gracefully (e.g., `iwl_bios_get_ppag_table()` and `iwl_fill_ppag_table()` validation flows). No change for non-ASUS systems. - The allowlist pattern is established (e.g., other OEMs like HP, SAMSUNG, DELL, HONOR, WIKO are present at drivers/net/wireless/intel/iwlwifi/fw/regulatory.c:46–116 and :118–177). - No architectural changes: Only DMI matching tables are updated; the control flow and firmware interfaces are unchanged.
- Backport notes - The change is a straightforward data addition and typically applies cleanly. If older stable trees differ slightly in array ordering/naming, the same two additions can be adapted with no logic changes.
Given the minimal, well-scoped nature of this OEM allowlist fix, its clear user impact for affected ASUS systems, and the existing safety checks around BIOS/UEFI data and firmware capabilities, it is a good candidate for backporting.
drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c index 3d6d1a85bb51b..a59f7f6b24da0 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c @@ -59,11 +59,16 @@ static const struct dmi_system_id dmi_ppag_approved_list[] = { DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), }, }, - { .ident = "ASUS", + { .ident = "ASUSTEK", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), }, }, + { .ident = "ASUS", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUS"), + }, + }, { .ident = "GOOGLE-HP", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Google"), @@ -141,11 +146,16 @@ static const struct dmi_system_id dmi_tas_approved_list[] = { DMI_MATCH(DMI_SYS_VENDOR, "Acer"), }, }, - { .ident = "ASUS", + { .ident = "ASUSTEK", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), }, }, + { .ident = "ASUS", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUS"), + }, + }, { .ident = "GOOGLE-HP", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Google"),