From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.2352.1624305606842464774 for ; Mon, 21 Jun 2021 13:00:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FUS7YZvh; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: kenlautner3@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id x16so14489343pfa.13 for ; Mon, 21 Jun 2021 13:00:06 -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=L2TvuesiQMCPxhx+X5/QliSR0Z6KJmrwuV3eerMUhXY=; b=FUS7YZvhBdAsxKgATVLNx3lpjmRW8foypEuk93VbXDnFDpiLo7zTv/MeeTHDn8g8MJ VDqE4rX2t6NDcuSuoA9dlKywPgCHM90CgJgUhH2WAx721vPPfUJendKZi+eVZQe5J3oc 5rjld8y6az6IvVh4pDCH1oZfkY8BmLG8K2G3Cl9HDRLOhGtzfZ1uXHCU2791AdpONzDc i4quEsAF+t4Adg8L//7eoV+seUv3HW2hpmJGylIEOMX6h4xOkBClSTgAVDHrdVAeYduP LrhV/wz4IYXSp7LKz5XBPEHTAXJOoetP2PWuoDrIMSIV7diadKrZMxSLiN+SC9Tf1uML iGvQ== 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=L2TvuesiQMCPxhx+X5/QliSR0Z6KJmrwuV3eerMUhXY=; b=YEB2/hICGsrH6g/vlhFhm3wVBqdGR50YjDfAwqpE3DDlZjnmYOCqfl8AGT4JMcsdfY kN3ognWV9whjQHxSIiWISqT+9nv6Uz5J0Odli6OdAeFt03ljdQPzEBMO6ZIrxyrnowP2 JY8ohbZ4OrfWeYGKpmLuH9e10vW7CsWBLHE7Z+2c8h2jU/FX2hP5wihRq9dgG/r3OE4B q32+ZHQluD0y1jRX5rvy97mJh1Weh2jX3h8h6tnExic6tGsAv2TBgvTD+A2pjigqkU/b VrTXF8nu8gIIKhTFsg/iJtjF7wT8tlkqWZ78tVwPii13ljiuB5KcANo3roENmHzp7MO5 fnWw== X-Gm-Message-State: AOAM5337ewXKvWMZZD/nF6K4H+NVE87+AGEGI21tnJwuBr2yRcqG/rpD nYosPgvdQRy/zK+2XqOYPYFIp00K2b8= X-Google-Smtp-Source: ABdhPJw99X/8kGN82Ae535473+F9Sa+lskql/DxbpJzLwhMgtOD+ooOI3rnrdLZcn0dg1jLQ/gB8zg== X-Received: by 2002:a05:6a00:23c2:b029:2f1:b41b:21ca with SMTP id g2-20020a056a0023c2b02902f1b41b21camr20898752pfc.13.1624305606138; Mon, 21 Jun 2021 13:00:06 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([12.157.155.61]) by smtp.gmail.com with ESMTPSA id h8sm16295946pfn.0.2021.06.21.13.00.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 13:00:05 -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: Mon, 21 Jun 2021 12:59:54 -0700 Message-Id: <20210621195954.852-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/Bds.h | 1 - MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 3 ++- MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 20 +++++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h b/MdeModulePkg/Universal/B= dsDxe/Bds.h index e7a9b5b4b7cb..84548041e861 100644 --- a/MdeModulePkg/Universal/BdsDxe/Bds.h +++ b/MdeModulePkg/Universal/BdsDxe/Bds.h @@ -17,7 +17,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =0D #include =0D #include =0D -#include =0D #include =0D =0D #include =0D diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Univer= sal/BdsDxe/BdsDxe.inf index 9310b4dccb18..5bac635def93 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -50,6 +50,7 @@ BaseMemoryLib=0D DebugLib=0D UefiBootManagerLib=0D + VariablePolicyHelperLib=0D PlatformBootManagerLib=0D PcdLib=0D PrintLib=0D @@ -77,7 +78,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