When neither UEFI variables nor ACPI methods provide a BIOS configuration table, fall back to Device Tree. This preserves the existing UEFI -> ACPI priority order and extends it with DT as the lowest-priority source. Signed-off-by: Avinash Bhatt --- drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 3 +++ drivers/net/wireless/intel/iwlwifi/mld/mld.c | 3 +++ drivers/net/wireless/intel/iwlwifi/mld/regulatory.c | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c index 640e729091..d7ead787c2 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/regulatory.c @@ -8,6 +8,7 @@ #include "regulatory.h" #include "fw/runtime.h" #include "fw/uefi.h" +#include "fw/dt.h" #define GET_BIOS_TABLE(__name, ...) \ do { \ @@ -16,6 +17,8 @@ do { \ ret = iwl_uefi_get_ ## __name(__VA_ARGS__); \ if (ret < 0) \ ret = iwl_acpi_get_ ## __name(__VA_ARGS__); \ + if (ret < 0 && iwl_dt_is_compatible(fwrt)) \ + ret = iwl_dt_get_ ## __name(__VA_ARGS__); \ return ret; \ } while (0) diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mld.c b/drivers/net/wireless/intel/iwlwifi/mld/mld.c index 130eba60b4..1a95b19d33 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/mld.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/mld.c @@ -12,6 +12,7 @@ #include "fw/api/coex.h" #include "fw/dbg.h" #include "fw/uefi.h" +#include "fw/dt.h" #include "mld.h" #include "mlo.h" @@ -466,6 +467,8 @@ iwl_op_mode_mld_start(struct iwl_trans *trans, const struct iwl_rf_cfg *cfg, iwl_mld_get_bios_tables(mld); iwl_uefi_get_sgom_table(trans, &mld->fwrt); mld->bios_enable_puncturing = iwl_uefi_get_puncturing(&mld->fwrt); + if (!mld->bios_enable_puncturing && iwl_dt_is_compatible(&mld->fwrt)) + mld->bios_enable_puncturing = iwl_dt_get_puncturing(&mld->fwrt); mld->rfi.bios_enabled = iwl_rfi_is_enabled_in_bios(&mld->fwrt); iwl_mld_hw_set_regulatory(mld); diff --git a/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c b/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c index 97b2283f51..ce539a0be7 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/regulatory.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2024-2025 Intel Corporation + * Copyright (C) 2024-2026 Intel Corporation */ #include @@ -8,6 +8,7 @@ #include "fw/regulatory.h" #include "fw/acpi.h" #include "fw/uefi.h" +#include "fw/dt.h" #include "regulatory.h" #include "mld.h" @@ -64,6 +65,8 @@ void iwl_mld_get_bios_tables(struct iwl_mld *mld) } iwl_uefi_get_uats_table(mld->trans, &mld->fwrt); + if (!mld->fwrt.ap_type_cmd_valid && iwl_dt_is_compatible(&mld->fwrt)) + iwl_dt_get_uats_table(&mld->fwrt); iwl_uefi_get_uneb_table(mld->trans, &mld->fwrt); iwl_bios_get_phy_filters(&mld->fwrt); -- 2.34.1