From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web09.118.1623864913498248934 for ; Wed, 16 Jun 2021 10:35:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DzugH0e7; spf=pass (domain: gmail.com, ip: 209.85.215.171, mailfrom: kenlautner3@gmail.com) Received: by mail-pg1-f171.google.com with SMTP id t13so2559664pgu.11 for ; Wed, 16 Jun 2021 10:35:13 -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=lesZc+AP5qCJseG7S5Qi99kfdiASwTrhUuhil5me0+g=; b=DzugH0e76mX5bMvFYnFcEppKZaWHVXnp5Huey4ZJDn9cQPujUfrZI3tMiyEgMGtH70 CnWzJMHQSsATrldWTNVbOICjbaDYNGMPfQ0avAnKKoKeB9qqw7BytKrqbX1PYGB2r+Gc Gw8N7r7K804aM42NgCjpNHPdzMWLEAF9dFyTuTFV08rCXDVc1uERz6xhaaY/QNSxGm+K wKN6IaGleee2DajsADwT2B5Qj2c9DOzQoSPZdzK3ouHqupTJywYSJGLza0tGkohUH+FQ B7d8ToUbcYgF604o0RJxKQVswUSrKr4X52g4umbI880bUZBdhMBR8QHqTrJiPFJjsO54 7byw== 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=lesZc+AP5qCJseG7S5Qi99kfdiASwTrhUuhil5me0+g=; b=msO9GE3VTcSpevRB1y3utGw912jEZetFbI2SiWCzSch4HxBE1PL+Utd3IJVdHAOn+f M2VrmC7I91FwZXiELb4JZ4Jsypvh/s/jI6TugxSTCWtyvMSn9xvDXckCVIxraPtDWIK0 XiiBhrc6Mx3skq/coIoHpR3PZJKn2eg9aGa5DTtfBibwqjWWRZV7lTKU4p/cVpoKVciU l71q+/KrydtXRQVS1ZeeowSVKa3sshFMBbm+v3BLG0EL0fevV2Y7tSXYt9gLKm8zxfY3 p3lGqduqvk+lKJ1pF2J+N1nFLvceKrqkd0p2YC+lCN4xRmhxjkkoowth6bEM8Q4SXdge 23mQ== X-Gm-Message-State: AOAM533Z1KMKAOB2tUw+Kxrh3FdhdCkbrUlJ3VU3+GwfFoOKTrT5Wn3L kxpQb7r8mzLSefV9E4p9wRTnWPYMj+s= X-Google-Smtp-Source: ABdhPJxabaPWnQAE7+qFiclKFUstbHuaASMfGq5buEUGPk6SeZwVGutWkVEVimUtCRVRIrp8azAWfw== X-Received: by 2002:a63:7404:: with SMTP id p4mr667124pgc.405.1623864912780; Wed, 16 Jun 2021 10:35:12 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([12.157.155.61]) by smtp.gmail.com with ESMTPSA id y34sm2697957pfa.181.2021.06.16.10.35.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jun 2021 10:35:12 -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 v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy Date: Wed, 16 Jun 2021 10:35:01 -0700 Message-Id: <20210616173501.864-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 Signed-off-by: Kenneth Lautner Fixed Library References Quick revert MdeModulePkg/BdsDxe: Fixed Library References Fixed incorrect library reference in BdsEntry.c Cc: Jian J Wang Cc: Hao A Wu Cc: Zhichao Gao Cc: Ray Ni Cc: Liming Gao Signed-off-by: Kenneth Lautner --- 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