wifi: iwlwifi: prepare for reading WPFC from UEFI

IWL_BIOS_TABLE_LOADER generates the code that determines from what source
to read a BIOS table (ACPI or UEFI).
As we want to read WPFC from UEFI to, iwl_acpi_get_phy_filters needs to
have the prototype that is required by this macro:
receive fwrt and return a int on success/failure.
Do that.

This allowes us to make to version of iwl_acpi_get_phy_filters for non
ACPI builds back to an iniline function.

Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Reviewed-by: Pagadala Yesu Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>
Link: https://patch.msgid.link/20250430151952.8046a2db775b.Ifbcf4168183d3cd635e3e800ec7ecd903e57d361@changeid

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
index efa7b673ebc73f04909d7a1a00e88346fe1b2e73..dfd5365995b6b7aa3271e4b3b8f26abbb1045ea1 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
  * Copyright (C) 2017 Intel Deutschland GmbH
- * Copyright (C) 2019-2024 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  */
 #include <linux/uuid.h>
 #include "iwl-drv.h"
@@ -919,40 +919,39 @@ out_free:
        return ret;
 }
 
-void iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt,
-                             struct iwl_phy_specific_cfg *filters)
+int iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt)
 {
+       struct iwl_phy_specific_cfg *filters = &fwrt->phy_filters;
        struct iwl_phy_specific_cfg tmp = {};
-       union acpi_object *wifi_pkg, *data;
+       union acpi_object *wifi_pkg, *data __free(kfree);
        int tbl_rev, i;
 
        data = iwl_acpi_get_object(fwrt->dev, ACPI_WPFC_METHOD);
        if (IS_ERR(data))
-               return;
+               return PTR_ERR(data);
 
        wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,
                                         ACPI_WPFC_WIFI_DATA_SIZE,
                                         &tbl_rev);
        if (IS_ERR(wifi_pkg))
-               goto out_free;
+               return PTR_ERR(wifi_pkg);
 
        if (tbl_rev != 0)
-               goto out_free;
+               return -EINVAL;
 
        BUILD_BUG_ON(ARRAY_SIZE(filters->filter_cfg_chains) !=
                     ACPI_WPFC_WIFI_DATA_SIZE - 1);
 
        for (i = 0; i < ARRAY_SIZE(filters->filter_cfg_chains); i++) {
                if (wifi_pkg->package.elements[i + 1].type != ACPI_TYPE_INTEGER)
-                       goto out_free;
+                       return -EINVAL;
                tmp.filter_cfg_chains[i] =
                        cpu_to_le32(wifi_pkg->package.elements[i + 1].integer.value);
        }
 
        IWL_DEBUG_RADIO(fwrt, "Loaded WPFC filter config from ACPI\n");
        *filters = tmp;
-out_free:
-       kfree(data);
+       return 0;
 }
 IWL_EXPORT_SYMBOL(iwl_acpi_get_phy_filters);
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
index e50b93472dd2dbc73b1d810a821adbd12a90041b..68d8fb5f6357e911c092f2631dadf7030ad6b6e8 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/acpi.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
  * Copyright (C) 2017 Intel Deutschland GmbH
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2023, 2025 Intel Corporation
  */
 #ifndef __iwl_fw_acpi__
 #define __iwl_fw_acpi__
@@ -180,8 +180,7 @@ int iwl_acpi_get_tas_table(struct iwl_fw_runtime *fwrt,
 
 int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt);
 
-void iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt,
-                             struct iwl_phy_specific_cfg *filters);
+int iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt);
 
 void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt);
 
@@ -244,8 +243,10 @@ static inline int iwl_acpi_get_ppag_table(struct iwl_fw_runtime *fwrt)
        return -ENOENT;
 }
 
-/* macro since the second argument doesn't always exist */
-#define iwl_acpi_get_phy_filters(fwrt, filters) do { } while (0)
+static inline int iwl_acpi_get_phy_filters(struct iwl_fw_runtime *fwrt)
+{
+       return -ENOENT;
+}
 
 static inline void iwl_acpi_get_guid_lock_status(struct iwl_fw_runtime *fwrt)
 {

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 94b08bb6fd4f622fcef91bc126695e66b69b0c66..5bdd35b433e8808c199b18f3875ee36aac809eb6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -1265,7 +1265,7 @@ void iwl_mvm_get_bios_tables(struct iwl_mvm *mvm)
                }
        }
 
-       iwl_acpi_get_phy_filters(&mvm->fwrt, &mvm->fwrt.phy_filters);
+       iwl_acpi_get_phy_filters(&mvm->fwrt);
 
        if (iwl_bios_get_eckv(&mvm->fwrt, &mvm->ext_clock_valid))
                IWL_DEBUG_RADIO(mvm, "ECKV table doesn't exist in BIOS\n");