tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy 

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>
This commit is contained in:
Ken Lautner 2021-06-22 03:59:54 +08:00 committed by mergify[bot]
parent 6cfeeb71c4
commit d9a7612f8d
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Universal/BdsDxe/Bds.h
View File

@ -17,7 +17,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include <Protocol/Bds.h> #include <Protocol/Bds.h>
#include <Protocol/LoadedImage.h> #include <Protocol/LoadedImage.h>
#include <Protocol/VariableLock.h>
#include <Protocol/DeferredImageLoad.h> #include <Protocol/DeferredImageLoad.h>
#include <Library/UefiDriverEntryPoint.h> #include <Library/UefiDriverEntryPoint.h>

3
MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
View File

@ -50,6 +50,7 @@
BaseMemoryLib BaseMemoryLib
DebugLib DebugLib
UefiBootManagerLib UefiBootManagerLib
VariablePolicyHelperLib
PlatformBootManagerLib PlatformBootManagerLib
PcdLib PcdLib
PrintLib PrintLib
@ -77,7 +78,7 @@
[Protocols] [Protocols]
gEfiBdsArchProtocolGuid ## PRODUCES gEfiBdsArchProtocolGuid ## PRODUCES
gEfiSimpleTextInputExProtocolGuid ## CONSUMES gEfiSimpleTextInputExProtocolGuid ## CONSUMES
gEdkiiVariableLockProtocolGuid ## SOMETIMES_CONSUMES gEdkiiVariablePolicyProtocolGuid ## SOMETIMES_CONSUMES
gEfiDeferredImageLoadProtocolGuid ## CONSUMES gEfiDeferredImageLoadProtocolGuid ## CONSUMES
[FeaturePcd] [FeaturePcd]

20
MdeModulePkg/Universal/BdsDxe/BdsEntry.c
View File

@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
#include "Bds.h" #include "Bds.h"
#include "Language.h" #include "Language.h"
#include "HwErrRecSupport.h" #include "HwErrRecSupport.h"
#include <Library/VariablePolicyHelperLib.h>
#define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \ #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); \ (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; EFI_STATUS Status;
UINT32 BootOptionSupport; UINT32 BootOptionSupport;
UINT16 BootTimeOut; UINT16 BootTimeOut;
EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock; EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy;
UINTN Index; UINTN Index;
EFI_BOOT_MANAGER_LOAD_OPTION LoadOption; EFI_BOOT_MANAGER_LOAD_OPTION LoadOption;
UINT16 *BootNext; UINT16 *BootNext;
@ -716,12 +717,21 @@ BdsEntry (
// //
// Mark the read-only variables if the Variable Lock protocol exists // Mark the read-only variables if the Variable Lock protocol exists
// //
Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock); Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL, (VOID**)&VariablePolicy);
DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n", Status)); DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n", Status));
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) { for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
Status = VariableLock->RequestToLock (VariableLock, mReadOnlyVariables[Index], &gEfiGlobalVariableGuid); Status = RegisterBasicVariablePolicy(
ASSERT_EFI_ERROR (Status); 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);
} }
} }