* Re: [edk2-devel] [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy
[not found] <1689208912383FDD.3893@groups.io>
@ 2021-06-16 22:42 ` Kenneth Lautner
0 siblings, 0 replies; 2+ messages in thread
From: Kenneth Lautner @ 2021-06-16 22:42 UTC (permalink / raw)
To: devel, kenlautner3; +Cc: Jian J Wang, Hao A Wu, Zhichao Gao, Ray Ni, Liming Gao
[-- Attachment #1: Type: text/plain, Size: 4703 bytes --]
This needs more editorial changes so disregard for now and I'll resend it
when it's better. Sorry about that.
On Wed, Jun 16, 2021 at 10:35 AM Kenneth Lautner via groups.io <kenlautner3=
gmail.com@groups.io> wrote:
> From: Ken Lautner <klautner@microsoft.com>
>
> Changed BdsEntry.c to use Variable Policy instead of Variable Lock
> as Variable Lock will be Deprecated eventually
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
>
> Fixed Library References
>
> Quick revert
>
> MdeModulePkg/BdsDxe: Fixed Library References
>
> Fixed incorrect library reference in BdsEntry.c
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
> ---
> 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/Universal/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
>
> [FeaturePcd]
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> b/MdeModulePkg/Universal/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"
> #include "Language.h"
> #include "HwErrRecSupport.h"
> +#include <Library/VariablePolicyHelperLib.h>
>
> #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \
> (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << LowBitSet32
> (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 = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL,
> (VOID **) &VariableLock);
> - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n",
> Status));
> + Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL,
> (VOID**)&VariablePolicy);
> + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n",
> Status));
> if (!EFI_ERROR (Status)) {
> for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
> - Status = VariableLock->RequestToLock (VariableLock,
> mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);
> - ASSERT_EFI_ERROR (Status);
> + Status = 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);
> }
> }
>
> --
> 2.31.1.windows.1
>
>
>
> ------------
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#76602): https://edk2.groups.io/g/devel/message/76602
> Mute This Topic: https://groups.io/mt/83586104/6193780
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [kenlautner3@gmail.com]
> ------------
>
>
>
[-- Attachment #2: Type: text/html, Size: 6893 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy
@ 2021-06-21 19:59 Kenneth Lautner
2021-06-23 9:52 ` [edk2-devel] " Laszlo Ersek
0 siblings, 1 reply; 2+ messages in thread
From: Kenneth Lautner @ 2021-06-21 19:59 UTC (permalink / raw)
To: devel; +Cc: Jian J Wang, Hao A Wu, Zhichao Gao, Ray Ni, Liming Gao
From: Ken Lautner <klautner@microsoft.com>
Changed BdsEntry.c to use Variable Policy instead of Variable Lock
as Variable Lock will be Deprecated eventually
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
---
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/BdsDxe/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
#include <Protocol/Bds.h>
#include <Protocol/LoadedImage.h>
-#include <Protocol/VariableLock.h>
#include <Protocol/DeferredImageLoad.h>
#include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
index 9310b4dccb18..5bac635def93 100644
--- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -50,6 +50,7 @@
BaseMemoryLib
DebugLib
UefiBootManagerLib
+ VariablePolicyHelperLib
PlatformBootManagerLib
PcdLib
PrintLib
@@ -77,7 +78,7 @@
[Protocols]
gEfiBdsArchProtocolGuid ## PRODUCES
gEfiSimpleTextInputExProtocolGuid ## CONSUMES
- gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES
+ gEdkiiVariablePolicyProtocolGuid ## SOMETIMES_CONSUMES
gEfiDeferredImageLoadProtocolGuid ## CONSUMES
[FeaturePcd]
diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/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"
#include "Language.h"
#include "HwErrRecSupport.h"
+#include <Library/VariablePolicyHelperLib.h>
#define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \
(a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << LowBitSet32 (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 = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);
- DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n", Status));
+ Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL, (VOID**)&VariablePolicy);
+ DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n", Status));
if (!EFI_ERROR (Status)) {
for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
- Status = VariableLock->RequestToLock (VariableLock, mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);
- ASSERT_EFI_ERROR (Status);
+ Status = 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);
}
}
--
2.31.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [edk2-devel] [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy
2021-06-21 19:59 Kenneth Lautner
@ 2021-06-23 9:52 ` Laszlo Ersek
0 siblings, 0 replies; 2+ messages in thread
From: Laszlo Ersek @ 2021-06-23 9:52 UTC (permalink / raw)
To: devel, kenlautner3; +Cc: Jian J Wang, Hao A Wu, Zhichao Gao, Ray Ni, Liming Gao
On 06/21/21 21:59, Kenneth Lautner wrote:
> From: Ken Lautner <klautner@microsoft.com>
>
> Changed BdsEntry.c to use Variable Policy instead of Variable Lock
> as Variable Lock will be Deprecated eventually
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>
> Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> ---
> 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/BdsDxe/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
>
> #include <Protocol/Bds.h>
> #include <Protocol/LoadedImage.h>
> -#include <Protocol/VariableLock.h>
> #include <Protocol/DeferredImageLoad.h>
>
> #include <Library/UefiDriverEntryPoint.h>
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> index 9310b4dccb18..5bac635def93 100644
> --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> @@ -50,6 +50,7 @@
> BaseMemoryLib
> DebugLib
> UefiBootManagerLib
> + VariablePolicyHelperLib
> PlatformBootManagerLib
> PcdLib
> PrintLib
> @@ -77,7 +78,7 @@
> [Protocols]
> gEfiBdsArchProtocolGuid ## PRODUCES
> gEfiSimpleTextInputExProtocolGuid ## CONSUMES
> - gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES
> + gEdkiiVariablePolicyProtocolGuid ## SOMETIMES_CONSUMES
> gEfiDeferredImageLoadProtocolGuid ## CONSUMES
>
> [FeaturePcd]
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/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"
> #include "Language.h"
> #include "HwErrRecSupport.h"
> +#include <Library/VariablePolicyHelperLib.h>
>
> #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \
> (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) << LowBitSet32 (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 = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);
> - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n", Status));
> + Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL, (VOID**)&VariablePolicy);
> + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n", Status));
> if (!EFI_ERROR (Status)) {
> for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
> - Status = VariableLock->RequestToLock (VariableLock, mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);
> - ASSERT_EFI_ERROR (Status);
> + Status = 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);
> }
> }
>
>
We should have a TianoCore BZ ticket for this change; please reference
the ticket in the commit message.
(No need to repost just for this; I think whoever merges the patch
should please update the commit message.)
Thanks
Laszlo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-23 9:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1689208912383FDD.3893@groups.io>
2021-06-16 22:42 ` [edk2-devel] [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy Kenneth Lautner
2021-06-21 19:59 Kenneth Lautner
2021-06-23 9:52 ` [edk2-devel] " Laszlo Ersek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox