From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8337927FD76; Mon, 5 May 2025 22:21:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483701; cv=none; b=eaANhTzj7C/sa5DJa1Su6uIhYyEjcfCTsRTNL/5POObevDC5bWT1fNxWpo9kGf7dyaJHoMlVkr4EqKXQA6y5Z7defXeAn0+nYU3KtA/DZ7ZbzXuaAboLSssb0pLHkdEHCim9rNNH1ANW7Lg51E9JCC60jtGODFSEcfGYA9MZ7yI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746483701; c=relaxed/simple; bh=4R+SlTfleeYh5Tq9ohXAtlnZOD0il/qYG9rugtcCPFs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AadeQRfNMoupb2irEfWRfxU3GgMVW/X096f1VKJ2F2qO2JEztshYM0ZhKV5mwZG9JWjKnAH6+lqrScJj5tYLVq3qkZFUm7SNEMs6rO1QFEG7LezpkNQ4sdBDAN+IFx8sKos3x/OtE4UIxIoCeZuDvpyL0RptkULNRcSy5wnHvvk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZGWJghRS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZGWJghRS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51B9BC4CEE4; Mon, 5 May 2025 22:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746483701; bh=4R+SlTfleeYh5Tq9ohXAtlnZOD0il/qYG9rugtcCPFs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZGWJghRSpwy6e3gGpY5yKBrt057PXX+AFaErlo3xtFaOsCfRDRadih8+GgwWOQlUU u4zaqYDWjTwp3d6zletIu5pKKEJ+wFfp5NveuD3c7Q99dGe96db0k63HgeNr38IvV+ BseiM+LdK6zJ07SiRVGibPTzwsZTm77fDNYLbtF+1r6rBYDmHLlQWTD1JkiC5ubopC X6HtPIhkahzXVrPFlAy3JRBCpvH+ne5BCxvpw0lFI/k2ccTO7pyiTbk/Zt5S40nE39 A4642XP1llTrhDzsupx7LC3Yicb8OV/AEsA2Vqi+5pfjYj4yHyK7jlZ1UYQ3rIzzVW mFjFc3Ik1OLkw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Emmanuel Grumbach , Miri Korenblit , Johannes Berg , Sasha Levin , pagadala.yesu.anjaneyulu@intel.com, daniel.gabay@intel.com, somashekhar.puttagangaiah@intel.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 185/642] wifi: iwlwifi: fix the ECKV UEFI variable name Date: Mon, 5 May 2025 18:06:41 -0400 Message-Id: <20250505221419.2672473-185-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Emmanuel Grumbach [ Upstream commit 3ea2970b0578011ab8402ad0cff39712255f63df ] 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 Signed-off-by: Miri Korenblit Link: https://patch.msgid.link/20250308231426.78c998d0fa71.I2bc9d72c1dc2c4d7028f0265634a940c2fadbbb5@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 8 +++++--- drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c index 434eed4130b90..91bcff499311d 100644 --- 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" @@ -678,8 +678,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 0c8943a8bd011..eb3c05417da37 100644 --- 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" -- 2.39.5