From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web11.160.1623883538807069588 for ; Wed, 16 Jun 2021 15:45:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PMjTeDa3; spf=pass (domain: gmail.com, ip: 209.85.214.178, mailfrom: kenlautner3@gmail.com) Received: by mail-pl1-f178.google.com with SMTP id c15so1815810pls.13 for ; Wed, 16 Jun 2021 15:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DBq9Px/EoagopHeIu1ESizEVaXGrek6M3diyv7gRZoc=; b=PMjTeDa3ptw+5raorSCbzVD1zMVtYRrQgipl9NZYGlRE/25b66J2wiPpuordcPsUiV AgZ6eizltyxUJYvf2EtBZoKaqOOchQcfpRjsfttg6OBH4grIHJtKpPrBYiu0RoMVdtUp imGL3DDG1c7AOJgOmAwNl5tsa7DHYTT5rfrUj6rp92KAgSrDdB6Yq8i8W4wBUM30H4Xi RIq/Jz/ScH/8EnqrxHJ+hE37LE/594EFuQ/PPcNXMINYkxikLMB0rVzjX+NKKpWXjILf 4IMQZEr36GtzdONT/bk+oxFIYQGoEHm8tDx0ZCVmdFodkW2XmYzH12xcn3+Y+lxNWKHa cNNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DBq9Px/EoagopHeIu1ESizEVaXGrek6M3diyv7gRZoc=; b=Af3Jccgj+a2setrdeOCV7pJwulsqlveZtSd48tPlXgm0eEXKBSb68EZJceQxdNcmLy eLJQ2qQFg6e5sDgT56U2N1aX7BT5uyNfc2iXNGIxigNjwH9oLF5f3Uhysb8t+h55+wp/ k/TMdPFDnfJ0P81JM/1/OG16mWOnnnaGXsFzLYQfnIXpuW5Q4WPd4s4JDe/+AksK2RX1 3rMrk6jLhEzCjkPxVq01AT7BXj+VokOVo68+5UytvV7PfU0GPVQMNa9rCpV79APdSGHR b6YlV4pH+f7drkgWXTDELDKHBrml8k4OnZBwSqLizLSBAp9C2Tp1jCTObwUY7eWZcI8D l/Nw== X-Gm-Message-State: AOAM5318zED7eXaZVV2Z6j1hao8ReekN3KEAmQOx5SikA660jEoayLVP zBJMKdfQhJB2EP0beXxmUjD+Ssh8XgY= X-Google-Smtp-Source: ABdhPJx56HvyjaV5uIc9KuXlHul0/AirnuvblgS6xR5bzXXKgEukWFHUzEzBNfhT0/Se+w1i0K/14w== X-Received: by 2002:a17:90b:3144:: with SMTP id ip4mr13222030pjb.2.1623883538028; Wed, 16 Jun 2021 15:45:38 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([12.157.155.61]) by smtp.gmail.com with ESMTPSA id w71sm3034979pfc.164.2021.06.16.15.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 15:45:37 -0700 (PDT) From: "Kenneth Lautner" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Zhichao Gao , Ray Ni , Liming Gao Subject: [PATCH v2 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy Date: Wed, 16 Jun 2021 15:45:26 -0700 Message-Id: <20210616224526.1523-1-kenlautner3@gmail.com> X-Mailer: git-send-email 2.31.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/Univer= sal/BdsDxe/BdsDxe.inf index 9310b4dccb18..76ff6a0f5fc3 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -50,6 +50,8 @@ BaseMemoryLib=0D DebugLib=0D UefiBootManagerLib=0D + VariablePolicyLib=0D + VariablePolicyHelperLib=0D PlatformBootManagerLib=0D PcdLib=0D PrintLib=0D @@ -77,7 +79,7 @@ [Protocols]=0D gEfiBdsArchProtocolGuid ## PRODUCES=0D gEfiSimpleTextInputExProtocolGuid ## CONSUMES=0D - gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES=0D + gEdkiiVariablePolicyProtocolGuid ## SOMETIMES_CONSUMES=0D gEfiDeferredImageLoadProtocolGuid ## CONSUMES=0D =0D [FeaturePcd]=0D diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Univer= sal/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"=0D #include "Language.h"=0D #include "HwErrRecSupport.h"=0D +#include =0D =0D #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \=0D (a) =3D ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << LowBitSet3= 2 (EFI_BOOT_OPTION_SUPPORT_COUNT)) & EFI_BOOT_OPTION_SUPPORT_COUNT); \=0D @@ -670,7 +671,7 @@ BdsEntry ( EFI_STATUS Status;=0D UINT32 BootOptionSupport;=0D UINT16 BootTimeOut;=0D - EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;=0D + EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy;=0D UINTN Index;=0D EFI_BOOT_MANAGER_LOAD_OPTION LoadOption;=0D UINT16 *BootNext;=0D @@ -716,12 +717,21 @@ BdsEntry ( //=0D // Mark the read-only variables if the Variable Lock protocol exists=0D //=0D - Status =3D gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (= VOID **) &VariableLock);=0D - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n", Sta= tus));=0D + Status =3D gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL, = (VOID**)&VariablePolicy);=0D + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n", St= atus));=0D if (!EFI_ERROR (Status)) {=0D for (Index =3D 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {= =0D - Status =3D VariableLock->RequestToLock (VariableLock, mReadOnlyVaria= bles[Index], &gEfiGlobalVariableGuid);=0D - ASSERT_EFI_ERROR (Status);=0D + Status =3D RegisterBasicVariablePolicy(=0D + VariablePolicy,=0D + &gEfiGlobalVariableGuid,=0D + mReadOnlyVariables[Index],=0D + VARIABLE_POLICY_NO_MIN_SIZE,=0D + VARIABLE_POLICY_NO_MAX_SIZE,=0D + VARIABLE_POLICY_NO_MUST_ATTR,=0D + VARIABLE_POLICY_NO_CANT_ATTR,=0D + VARIABLE_POLICY_TYPE_LOCK_NOW=0D + );=0D + ASSERT_EFI_ERROR(Status);=0D }=0D }=0D =0D --=20 2.31.1.windows.1