From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from alexa-out-sd-02.qualcomm.com (alexa-out-sd-02.qualcomm.com [199.106.114.39]) by mx.groups.io with SMTP id smtpd.web09.2716.1642626214860242667 for ; Wed, 19 Jan 2022 13:03:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=IkFjwszO; spf=pass (domain: quicinc.com, ip: 199.106.114.39, mailfrom: quic_rcran@quicinc.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1642626214; x=1674162214; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=W9ByM1PT0gXMiuj88FUVc/l0FAIio8Pfm8/TKRBrw7Q=; b=IkFjwszOXyUXWvOs1rvqq6q6RJHRgIwEqt5OaCWsuJL2/YV5ZBcMXjGi Z35MqKhqLpUAbBzAA76Hs+GAJeiMM4IeUEtskC+JXASNYzCfiR/eqPtfI /e3c4Y3EEBbLnS6XULfSUgQDeU3ZnyRDpfMvuQ7/YpKXAo61J22igbR7a I=; Received: from unknown (HELO ironmsg02-sd.qualcomm.com) ([10.53.140.142]) by alexa-out-sd-02.qualcomm.com with ESMTP; 19 Jan 2022 13:03:34 -0800 X-QCInternal: smtphost Received: from nasanex01b.na.qualcomm.com ([10.46.141.250]) by ironmsg02-sd.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 13:03:34 -0800 Received: from [10.110.78.216] (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.922.19; Wed, 19 Jan 2022 13:03:33 -0800 Message-ID: Date: Wed, 19 Jan 2022 14:03:33 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: =?UTF-8?B?UmU6IOWbnuWkjTogW2VkazItZGV2ZWxdIOWbnuWkjTogW1BBVENIIHYyIDEvMV0gTWRlTW9kdWxlUGtnL0Jkc0R4ZTogVXBkYXRlIEJkc0VudHJ5IHRvIHVzZSBWYXJpYWJsZSBQb2xpY3k=?= To: gaoliming , , CC: 'Jian J Wang' , 'Hao A Wu' , 'Zhichao Gao' , 'Ray Ni' References: <20210616224526.1523-1-kenlautner3@gmail.com> <004401d76313$de84c2d0$9b8e4870$@byosoft.com.cn> <01e4e221-6291-955d-68c7-a573f526435d@quicinc.com> <015501d80cfe$0dfed2a0$29fc77e0$@byosoft.com.cn> From: "Rebecca Cran" In-Reply-To: <015501d80cfe$0dfed2a0$29fc77e0$@byosoft.com.cn> Return-Path: quic_rcran@quicinc.com X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01b.na.qualcomm.com (10.46.141.250) Content-Language: en-US Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit Oh, thanks! It turns out there was one remaining use in MdeModulePkg, by UefiBootManagerLib. I've sent the following patch to fix it: [PATCH 1/1] MdeModulePkg/UefiBootManagerLib: Convert BmLoadOption to Variable Policy . -- Rebecca Cran On 1/18/22 23:30, gaoliming wrote: > Rebecca: > It has been merged @ d9a7612f8d1da197883bd1cb9f91f229522d39b1 > > Thanks > Liming >> -----邮件原件----- >> 发件人: Rebecca Cran >> 发送时间: 2022年1月19日 8:18 >> 收件人: devel@edk2.groups.io; gaoliming@byosoft.com.cn; >> kenlautner3@gmail.com >> 抄送: 'Jian J Wang' ; 'Hao A Wu' >> ; 'Zhichao Gao' ; 'Ray Ni' >> >> 主题: Re: [edk2-devel] 回复: [PATCH v2 1/1] MdeModulePkg/BdsDxe: >> Update BdsEntry to use Variable Policy >> >> It looks like the BZ associated with this change is >> https://bugzilla.tianocore.org/show_bug.cgi?id=3421 . >> >> It would be nice to get this fix committed, to stop the loud deprecated >> interface messages. >> >> >> -- >> Rebecca Cran >> >> >> On 6/16/21 18:58, gaoliming wrote: >>> Ken: >>> Thanks for your update. Please also update >>> MdeModulePkg\Universal\BdsDxe\Bds.h to remove #include >>> , because EDKII_VARIABLE_LOCK_PROTOCOL is >> not used >>> any more. >>> >>> Thanks >>> Liming >>>> -----邮件原件----- >>>> 发件人: kenlautner3@gmail.com >>>> 发送时间: 2021年6月17日 6:45 >>>> 收件人: devel@edk2.groups.io >>>> 抄送: Jian J Wang ; Hao A Wu >>>> ; Zhichao Gao ; Ray Ni >>>> ; Liming Gao >>>> 主题: [PATCH v2 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use >>>> Variable Policy >>>> >>>> From: Ken Lautner >>>> >>>> Changed BdsEntry.c to use Variable Policy instead of Variable Lock >>>> as Variable Lock will be Deprecated eventually >>>> >>>> Cc: Jian J Wang >>>> Cc: Hao A Wu >>>> Cc: Zhichao Gao >>>> Cc: Ray Ni >>>> Cc: Liming Gao >>>> Signed-off-by: Kenneth Lautner >>>> >>>> Reviewed-by Liming Gao >>>> --- >>>> MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 4 +++- >>>> MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 20 >> +++++++++++++++----- >>>> 2 files changed, 18 insertions(+), 6 deletions(-) >>>> >>>> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf >>>> b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf >>>> index 9310b4dccb18..76ff6a0f5fc3 100644 >>>> --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf >>>> +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf >>>> @@ -50,6 +50,8 @@ >>>> BaseMemoryLib >>>> >>>> DebugLib >>>> >>>> UefiBootManagerLib >>>> >>>> + VariablePolicyLib >>>> >>>> + VariablePolicyHelperLib >>>> >>>> PlatformBootManagerLib >>>> >>>> PcdLib >>>> >>>> PrintLib >>>> >>>> @@ -77,7 +79,7 @@ >>>> [Protocols] >>>> >>>> gEfiBdsArchProtocolGuid ## PRODUCES >>>> >>>> gEfiSimpleTextInputExProtocolGuid ## CONSUMES >>>> >>>> - gEdkiiVariableLockProtocolGuid ## >>>> SOMETIMES_CONSUMES >>>> >>>> + gEdkiiVariablePolicyProtocolGuid ## >>>> SOMETIMES_CONSUMES >>>> >>>> gEfiDeferredImageLoadProtocolGuid ## CONSUMES >>>> >>>> >>>> >>>> [FeaturePcd] >>>> >>>> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>>> b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>>> index 83b773a2fa5f..13c10bdc5bf8 100644 >>>> --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>>> +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>>> @@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >>>> #include "Bds.h" >>>> >>>> #include "Language.h" >>>> >>>> #include "HwErrRecSupport.h" >>>> >>>> +#include >>>> >>>> >>>> >>>> #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \ >>>> >>>> (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << >>>> LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)) & >>>> EFI_BOOT_OPTION_SUPPORT_COUNT); \ >>>> >>>> @@ -670,7 +671,7 @@ BdsEntry ( >>>> EFI_STATUS Status; >>>> >>>> UINT32 BootOptionSupport; >>>> >>>> UINT16 BootTimeOut; >>>> >>>> - EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock; >>>> >>>> + EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy; >>>> >>>> UINTN Index; >>>> >>>> EFI_BOOT_MANAGER_LOAD_OPTION LoadOption; >>>> >>>> UINT16 *BootNext; >>>> >>>> @@ -716,12 +717,21 @@ BdsEntry ( >>>> // >>>> >>>> // Mark the read-only variables if the Variable Lock protocol exists >>>> >>>> // >>>> >>>> - Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, >>>> (VOID **) &VariableLock); >>>> >>>> - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n", >>>> Status)); >>>> >>>> + Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL, >>>> (VOID**)&VariablePolicy); >>>> >>>> + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol >> - %r\n", >>>> Status)); >>>> >>>> if (!EFI_ERROR (Status)) { >>>> >>>> for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) >> { >>>> - Status = VariableLock->RequestToLock (VariableLock, >>>> mReadOnlyVariables[Index], &gEfiGlobalVariableGuid); >>>> >>>> - ASSERT_EFI_ERROR (Status); >>>> >>>> + Status = RegisterBasicVariablePolicy( >>>> >>>> + VariablePolicy, >>>> >>>> + &gEfiGlobalVariableGuid, >>>> >>>> + mReadOnlyVariables[Index], >>>> >>>> + VARIABLE_POLICY_NO_MIN_SIZE, >>>> >>>> + VARIABLE_POLICY_NO_MAX_SIZE, >>>> >>>> + VARIABLE_POLICY_NO_MUST_ATTR, >>>> >>>> + VARIABLE_POLICY_NO_CANT_ATTR, >>>> >>>> + VARIABLE_POLICY_TYPE_LOCK_NOW >>>> >>>> + ); >>>> >>>> + ASSERT_EFI_ERROR(Status); >>>> >>>> } >>>> >>>> } >>>> >>>> >>>> >>>> -- >>>> 2.31.1.windows.1 >>> >>> >>> >>> >>> >>> >