MdeModulePkg/UefiBootManagerLib: Convert BmLoadOption to Variable Policy

Since the Variable Lock protocol is deprecated, convert locking of
PlatformRecovery#### in EfiBootManagerLoadOptionToVariable to use the
Variable Policy protocol.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Rebecca Cran <quic_rcran@quicinc.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
index 32a9cbb425fa5262355447eb5f99171cc635d0f1..2087f0b91df7826bf1ebc691c601ca3439c76d48 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmLoadOption.c
@@ -9,6 +9,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "InternalBm.h"\r
 \r
+#include <Library/VariablePolicyHelperLib.h>\r
+\r
 GLOBAL_REMOVE_IF_UNREFERENCED\r
 CHAR16  *mBmLoadOptionName[] = {\r
   L"Driver",\r
@@ -169,15 +171,15 @@ EfiBootManagerLoadOptionToVariable (
   IN CONST EFI_BOOT_MANAGER_LOAD_OPTION  *Option\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  UINTN                         VariableSize;\r
-  UINT8                         *Variable;\r
-  UINT8                         *Ptr;\r
-  CHAR16                        OptionName[BM_OPTION_NAME_LEN];\r
-  CHAR16                        *Description;\r
-  CHAR16                        NullChar;\r
-  EDKII_VARIABLE_LOCK_PROTOCOL  *VariableLock;\r
-  UINT32                        VariableAttributes;\r
+  EFI_STATUS                      Status;\r
+  UINTN                           VariableSize;\r
+  UINT8                           *Variable;\r
+  UINT8                           *Ptr;\r
+  CHAR16                          OptionName[BM_OPTION_NAME_LEN];\r
+  CHAR16                          *Description;\r
+  CHAR16                          NullChar;\r
+  EDKII_VARIABLE_POLICY_PROTOCOL  *VariablePolicy;\r
+  UINT32                          VariableAttributes;\r
 \r
   if ((Option->OptionNumber == LoadOptionNumberUnassigned) ||\r
       (Option->FilePath == NULL) ||\r
@@ -242,9 +244,18 @@ structure.
     //\r
     // Lock the PlatformRecovery####\r
     //\r
-    Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **)&VariableLock);\r
+    Status = gBS->LocateProtocol (&gEdkiiVariablePolicyProtocolGuid, NULL, (VOID **)&VariablePolicy);\r
     if (!EFI_ERROR (Status)) {\r
-      Status = VariableLock->RequestToLock (VariableLock, OptionName, &gEfiGlobalVariableGuid);\r
+      Status = RegisterBasicVariablePolicy (\r
+                 VariablePolicy,\r
+                 &gEfiGlobalVariableGuid,\r
+                 OptionName,\r
+                 VARIABLE_POLICY_NO_MIN_SIZE,\r
+                 VARIABLE_POLICY_NO_MAX_SIZE,\r
+                 VARIABLE_POLICY_NO_MUST_ATTR,\r
+                 VARIABLE_POLICY_NO_CANT_ATTR,\r
+                 VARIABLE_POLICY_TYPE_LOCK_NOW\r
+                 );\r
       ASSERT_EFI_ERROR (Status);\r
     }\r
 \r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
index a9b0d485cace272f6baabc9c9fbf34a662e00612..b7dfe2a7e0bd45cdd8f56ee3d4ad2d8a5cf97839 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
+++ b/MdeModulePkg/Library/UefiBootManagerLib/InternalBm.h
@@ -39,7 +39,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/BootLogo.h>\r
 #include <Protocol/DriverHealth.h>\r
 #include <Protocol/FormBrowser2.h>\r
-#include <Protocol/VariableLock.h>\r
 #include <Protocol/RamDisk.h>\r
 #include <Protocol/DeferredImageLoad.h>\r
 #include <Protocol/PlatformBootManager.h>\r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
index cf5908692fa72a79c6e3b909560b47353c4aa7af..fe05d5f1cc9ddf81266798eadf376677b568be8c 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+++ b/MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
@@ -62,6 +62,7 @@
   PerformanceLib\r
   HiiLib\r
   SortLib\r
+  VariablePolicyHelperLib\r
 \r
 [Guids]\r
   ## SOMETIMES_CONSUMES ## SystemTable (The identifier of memory type information type in system table)\r
@@ -99,7 +100,7 @@
   gEfiDevicePathProtocolGuid                    ## SOMETIMES_CONSUMES\r
   gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES\r
   gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES\r
-  gEdkiiVariableLockProtocolGuid                ## SOMETIMES_CONSUMES\r
+  gEdkiiVariablePolicyProtocolGuid              ## SOMETIMES_CONSUMES\r
   gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES\r
   gEfiUsbIoProtocolGuid                         ## SOMETIMES_CONSUMES\r
   gEfiNvmExpressPassThruProtocolGuid            ## SOMETIMES_CONSUMES\r