From nobody Thu May 16 13:32:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76140+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76140+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623081576; cv=none; d=zohomail.com; s=zohoarc; b=Xpur2RxAdv80R6i6IzRudMbO1iugjXSYpyQCUzV5vHvVQRsQyaaK/CQBUVGogHc1GXmWHPgmWX8qkSap80Sb8yGfIESsfN0L0l3cnyG2aWUfitO03WUKxrEgMF0rnGeN9gmL4ZHH4CrdkiqURRlzQjOiQCqgC/J8S1JU0jeRB4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623081576; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=seFjFxZCHDDzxmlXTq0IYqt3u72SP2QU5Pj1MB3ghYE=; b=nj9rbBufY8JDilMpU7Nyc1ZFfczgQBu0E4IxCZ/ja3jcXYGw7qU3AAB5XFmCq3F61lMwo3tao12DJ0APEZCoKawZuvsd1vx90GDnNrbbovOkS2aZysnL+elIjZ4gmZhXs6Y0OybTLECUKbASlvMsGEZYTnFNF1Kw4QINdOOpcbo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76140+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1623081576164867.7470772670529; Mon, 7 Jun 2021 08:59:36 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 51h7YY1788612xHCoaX3RJOe; Mon, 07 Jun 2021 08:59:31 -0700 X-Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web09.4364.1622837619165698230 for ; Fri, 04 Jun 2021 13:13:39 -0700 X-Received: by mail-pg1-f174.google.com with SMTP id y11so591709pgp.11 for ; Fri, 04 Jun 2021 13:13:39 -0700 (PDT) X-Gm-Message-State: 4gyh681uA3ITYX0WYBBPaC4Wx1787277AA= X-Google-Smtp-Source: ABdhPJyzawvNi/nn7TqBa4t/jUkRrqW0uBDCKIsxATMhFXtwDnx/rB/8+kcE7dRViY2Bf4nvADuM3Q== X-Received: by 2002:a63:b40d:: with SMTP id s13mr6600929pgf.271.1622837618469; Fri, 04 Jun 2021 13:13:38 -0700 (PDT) X-Received: from localhost.localdomain ([12.157.155.61]) by smtp.gmail.com with ESMTPSA id j12sm2689403pgs.83.2021.06.04.13.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jun 2021 13:13:38 -0700 (PDT) From: kenlautner3@gmail.com To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Zhichao Gao , Ray Ni Subject: [edk2-devel] [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy Date: Fri, 4 Jun 2021 13:13:26 -0700 Message-Id: <20210604201326.1383-2-kenlautner3@gmail.com> In-Reply-To: <20210604201326.1383-1-kenlautner3@gmail.com> References: <20210604201326.1383-1-kenlautner3@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kenlautner3@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1623081571; bh=JbkYlhWS+7McKiiERUpkUYtH98yXo1vK7OxH2rZz9mk=; h=Cc:Date:From:Reply-To:Subject:To; b=YNtZXiNw6pGl43gHGZBZRKt+t5vzuWy9/GJN/bJ89eHtvLcx62YSL+Mj/8v2uy6MJNm GjRh3uO2aCKXUanb6iEuAzloUcKZGFTA2hEfpGVT0iGa2MC6uNvlSwEDYySCCpVTeYBoB 6UDO7hMRqMMHV3KFTPv9OblecXNaot9pMV0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 --- 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 DebugLib UefiBootManagerLib + VariablePolicyLib + VariablePolicyHelperLib PlatformBootManagerLib PcdLib PrintLib @@ -77,7 +79,7 @@ [Protocols] gEfiBdsArchProtocolGuid ## PRODUCES gEfiSimpleTextInputExProtocolGuid ## CONSUMES - gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES + gEdkiiVariablePolicyProtocolGuid ## SOMETIMES_CONSUMES gEfiDeferredImageLoadProtocolGuid ## CONSUMES =20 [FeaturePcd] 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" #include "Language.h" #include "HwErrRecSupport.h" +#include "library/VariablePolicyHelperLib.h" =20 #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \ (a) =3D ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << LowBitSet3= 2 (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 =3D gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (= VOID **) &VariableLock); - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n", Sta= tus)); + Status =3D gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL, = (VOID**)&VariablePolicy); + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n", St= atus)); if (!EFI_ERROR (Status)) { for (Index =3D 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) { - Status =3D VariableLock->RequestToLock (VariableLock, mReadOnlyVaria= bles[Index], &gEfiGlobalVariableGuid); - ASSERT_EFI_ERROR (Status); + Status =3D 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); } } =20 --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76140): https://edk2.groups.io/g/devel/message/76140 Mute This Topic: https://groups.io/mt/83373679/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-