wifi: iwlwifi: fix the ECKV UEFI variable name

This UEFI variable name was badly named. Fix its name and also use the
right GUID to find it: we need to use the BT_WIFI (a.k.a. Common) GUID.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250308231426.78c998d0fa71.I2bc9d72c1dc2c4d7028f0265634a940c2fadbbb5@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
index 78bd0eb7aa92970c2d02bb244cb4fc2d17e43351..b4438b1f8dad84b0a88a8480c7aa333028647a7c 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
 /*
- * Copyright(c) 2021-2024 Intel Corporation
+ * Copyright(c) 2021-2025 Intel Corporation
  */
 
 #include "iwl-drv.h"
@@ -681,8 +681,10 @@ int iwl_uefi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk)
        struct uefi_cnv_var_eckv *data;
        int ret = 0;
 
-       data = iwl_uefi_get_verified_variable(fwrt->trans, IWL_UEFI_ECKV_NAME,
-                                             "ECKV", sizeof(*data), NULL);
+       data = iwl_uefi_get_verified_variable_guid(fwrt->trans,
+                                                  &IWL_EFI_WIFI_BT_GUID,
+                                                  IWL_UEFI_ECKV_NAME,
+                                                  "ECKV", sizeof(*data), NULL);
        if (IS_ERR(data))
                return -EINVAL;
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
index 0c8943a8bd01155f02d135b3939e0bc38476ded5..eb3c05417da371b41c140b2877574d5f2c1cf78d 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
 /*
- * Copyright(c) 2021-2024 Intel Corporation
+ * Copyright(c) 2021-2025 Intel Corporation
  */
 #ifndef __iwl_fw_uefi__
 #define __iwl_fw_uefi__
@@ -19,7 +19,7 @@
 #define IWL_UEFI_WTAS_NAME             L"UefiCnvWlanWTAS"
 #define IWL_UEFI_SPLC_NAME             L"UefiCnvWlanSPLC"
 #define IWL_UEFI_WRDD_NAME             L"UefiCnvWlanWRDD"
-#define IWL_UEFI_ECKV_NAME             L"UefiCnvWlanECKV"
+#define IWL_UEFI_ECKV_NAME             L"UefiCnvCommonECKV"
 #define IWL_UEFI_DSM_NAME              L"UefiCnvWlanGeneralCfg"
 #define IWL_UEFI_WBEM_NAME             L"UefiCnvWlanWBEM"
 #define IWL_UEFI_PUNCTURING_NAME       L"UefiCnvWlanPuncturing"