From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.1675.1623368893786212879 for ; Thu, 10 Jun 2021 16:48:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=pDdbgFxy; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: kenlautner3@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id d5-20020a17090ab305b02901675357c371so4745280pjr.1 for ; Thu, 10 Jun 2021 16:48: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=G8s2myxYmOrTxEFVay7VzdVL7SVtF51S98rmGnFkvT8=; b=pDdbgFxyFSh6mwKXuQhJKpqDSqhWGpfbF0T02uHPt6C7dUo1OUCuc0APoWwT3YOKW0 AQu796CaIQGVxGmiAJUZ3kg4UUCRVMEzNhQQ2Xa+aX2ApIyIGS8yHZI3jdpsnUcA01jB zgGrXoFO15wshBkQv5kyMrL9As7QPSIBiRoGHSZjWq3uul9Fj1sC4U49oKvOEz6Q3F22 TqhSN8YqXOuTkHzimzQbLmG9JIRN6TzTHO1+GY9EHI6VVHBQakEGMJaCNL/MpxwkUFGg 7YanzJVzMDjNKvk/4G1t4MiCp46V8VFVO/OxqZy2Sw84tEXlfiKUr4zR0hdyT41ay9p7 2ULQ== 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=G8s2myxYmOrTxEFVay7VzdVL7SVtF51S98rmGnFkvT8=; b=H+ZYLZjrMmdDmtse0/pR+vq7bwayAIIDmj9RohzwX7K+uNK5McaVSyY/Qb88tb2Hhy 94WH3BKaeYmftbB7qtroI5NcVV0rF7fZaCnp8m7ojLhxe9rWJziK4zYKaPMNnEn2OV0m 8jw6LxmIHHsGP7NSlX0vKBMeJBetVI2t24sbUHCnjDeGHY31rcn8+4WCT60cEBHtHFqp W1mG1qVru/XO8elaU0UGpXIC0mZIDlzPHz1ZxHOeBdJbBFfpEHzfTiNXHGg/5mI2uRvT odFpxFNaxWV7jsUFPVySllvEAZj5BPFMZHTE71MP9iRfvRpwAfcKIPLPvrpV7JmhcLC/ Rzxg== X-Gm-Message-State: AOAM5312WFf6cubAtCl3knIMsrPhVHQbaBqdEPGCvooKjcms06ZgwfwZ 8JjvVro0qYFDjtL+MPU57XPzBrMSZcs= X-Google-Smtp-Source: ABdhPJwWXFvds+kx+NYamq11fgrNHzZon/H0HiRPuOoOBOq5+OQnMKijpHUUqxCh+OTfBNlt4SomnQ== X-Received: by 2002:a17:90a:ea96:: with SMTP id h22mr5925350pjz.221.1623368892820; Thu, 10 Jun 2021 16:48:12 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([12.157.155.61]) by smtp.gmail.com with ESMTPSA id h8sm3358562pfn.0.2021.06.10.16.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jun 2021 16:48: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/2] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy Date: Thu, 10 Jun 2021 16:47:59 -0700 Message-Id: <20210610234800.3341-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 --- 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..13723bee299b 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 "library/VariablePolicyHelperLib.h"=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