[PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[Leif Lindholm]

The recently merged VariablePolicy set in edk2,
d448574e7310..124b3f9289f1, broke everything[tm].
Fix up the ARM platforms I have any sort of history about,
including some unrelated things that popped up along the way.

Note: the hisilicon server platforms still don't build due to use
of now deleted (previously deprecated) string functions in
the SMBIOS code. Rebecca Cran has been sending out a genericised
set *based* on this code, but now fixed. If Hisilicon could look
into making use of that version instead, that might be less hassle
than fixing the current implementation:
https://edk2.groups.io/g/devel/message/67255

Cc: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Bret Barkelew <brbarkel@microsoft.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Graeme Gregory <graeme@nuviainc.com>
Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Cc: Ming Huang <huangming23@huawei.com>
Cc: Radoslaw Biernacki <rad@semihalf.com>
Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
Cc: Thomas Abraham <thomas.abraham@arm.com>

Leif Lindholm (15):
  Silicon/AMD: update Styx to use PcdSet*S APIs
  Platform/AMD: add RngLib for Overdriveboard
  Platform,Silicon: fix beagleboard tautological compares
  Silicon/Hisilicon: add RngLib for Hisilicon
  Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib
  Platform/AMD: add VariablePolicy library resolutions for Overdrive
  Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000
  Platform/LeMaker: add VariablePolicy resolutions for cello
  Platform/SiFive: add VariablePolicy resolutions
  Platform/Qemu: add VariablePolicy resolutions
  Silicon/Marvell: add VariablePolicy resolutions
  Platform/BeagleBoard: add VariablePolicy resolutions
  Silicon/NXP: add VariablePolicy resolutions
  Platform/SocioNext: add VariablePolicy resolutions
  Silicon/Hisilicon: add VariablePolicy resolutions

 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  |  1 +
 Silicon/Hisilicon/Hisilicon.dsc.inc           |  4 ++++
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  5 ++++-
 Silicon/NXP/NxpQoriqLs.dsc.inc                |  4 ++++
 .../AMD/OverdriveBoard/OverdriveBoard.dsc     |  4 ++++
 .../BeagleBoardPkg/BeagleBoardPkg.dsc         |  4 ++++
 Platform/LeMaker/CelloBoard/CelloBoard.dsc    |  4 ++++
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  3 +++
 .../FreedomU500VC707Board/U500.dsc            |  4 ++++
 .../FreedomU540HiFiveUnleashedBoard/U540.dsc  |  4 ++++
 .../Socionext/DeveloperBox/DeveloperBox.dsc   |  3 +++
 .../Overdrive1000Board/Overdrive1000Board.dsc |  4 ++++
 .../Library/ResetSystemLib/ResetSystemLib.c   |  2 +-
 .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
 .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
 .../Omap35xxPkg/SmbusDxe/Smbus.c              |  2 +-
 16 files changed, 64 insertions(+), 15 deletions(-)

-- 
2.20.1

[PATCH edk2-platforms 01/15] Silicon/AMD: update Styx to use PcdSet*S APIs

[Leif Lindholm]

The non-status reporting PcdSet functions were deprecated and have now
been removed. Update Styx code to assert on error status.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
 .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c
index 4de26404a8a7..3f359ffbd2d8 100644
--- a/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c
+++ b/Silicon/AMD/Styx/Drivers/PlatInitPei/PlatInitPei.c
@@ -111,7 +111,7 @@ PlatInitPeiEntryPoint (
   IN       CONST EFI_PEI_SERVICES   **PeiServices
   )
 {
-  EFI_STATUS                  Status = EFI_SUCCESS;
+  EFI_STATUS                  Status;
   AMD_MEMORY_RANGE_DESCRIPTOR IscpMemDescriptor = {0};
   ISCP_FUSE_INFO              IscpFuseInfo = {0};
   ISCP_CPU_RESET_INFO         CpuResetInfo = {0};
@@ -124,7 +124,8 @@ PlatInitPeiEntryPoint (
   DEBUG ((EFI_D_ERROR, "PlatInit PEIM Loaded\n"));
 
   // CPUID
-  PcdSet32 (PcdSocCpuId, *CpuIdReg);
+  Status = PcdSet32S (PcdSocCpuId, *CpuIdReg);
+  ASSERT_EFI_ERROR (Status);
   DEBUG ((EFI_D_ERROR, "SocCpuId = 0x%X\n", PcdGet32 (PcdSocCpuId)));
 
   // Update core count based on PCD option
@@ -186,7 +187,8 @@ PlatInitPeiEntryPoint (
 
   // Update SocCoreCount on Dynamic PCD
   if (PcdGet32 (PcdSocCoreCount) != mAmdCoreCount) {
-    PcdSet32 (PcdSocCoreCount, mAmdCoreCount);
+    Status = PcdSet32S (PcdSocCoreCount, mAmdCoreCount);
+    ASSERT_EFI_ERROR (Status);
   }
 
   DEBUG ((EFI_D_ERROR, "SocCoreCount = %d\n", PcdGet32 (PcdSocCoreCount)));
@@ -201,7 +203,8 @@ PlatInitPeiEntryPoint (
 
   // Update SystemMemorySize on Dynamic PCD
   if (IscpMemDescriptor.Size0) {
-    PcdSet64 (PcdSystemMemorySize, IscpMemDescriptor.Size0);
+    Status = PcdSet64S (PcdSystemMemorySize, IscpMemDescriptor.Size0);
+    ASSERT_EFI_ERROR (Status);
   }
   if (IscpMemDescriptor.Size0 == 0) {
     DEBUG ((EFI_D_ERROR, "Warning: Could not get SystemMemorySize via ISCP, using default value.\n"));
diff --git a/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c b/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c
index 0cbd960f30fb..c047d7444620 100644
--- a/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c
+++ b/Silicon/AMD/Styx/Library/MemoryInitPei/MemoryInitPeiLib.c
@@ -55,8 +55,9 @@ MoveNvStoreImage (
   VOID
   )
 {
-  VOID      *OldBase, *NewBase;
-  UINTN     Size;
+  VOID        *OldBase, *NewBase;
+  UINTN       Size;
+  EFI_STATUS  Status;
 
   //
   // Move the in-memory image of the NV store firmware volume to a dynamically
@@ -77,14 +78,17 @@ MoveNvStoreImage (
   DEBUG ((EFI_D_INFO, "%a: Relocating NV store FV from %p to %p\n",
     __FUNCTION__, OldBase, NewBase));
 
-  PcdSet64 (PcdFlashNvStorageVariableBase64, (UINT64)NewBase);
+  Status = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT64)NewBase);
+  ASSERT_EFI_ERROR (Status);
 
-  PcdSet64 (PcdFlashNvStorageFtwWorkingBase64, (UINT64)NewBase +
-    FixedPcdGet32 (PcdFlashNvStorageVariableSize));
+  Status = PcdSet64S (PcdFlashNvStorageFtwWorkingBase64,
+             (UINT64)NewBase + FixedPcdGet32 (PcdFlashNvStorageVariableSize));
+  ASSERT_EFI_ERROR (Status);
 
-  PcdSet64 (PcdFlashNvStorageFtwSpareBase64, (UINT64)NewBase +
-    FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
-    FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize));
+  Status = PcdSet64S (PcdFlashNvStorageFtwSpareBase64, (UINT64)NewBase +
+             FixedPcdGet32 (PcdFlashNvStorageVariableSize) +
+             FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize));
+  ASSERT_EFI_ERROR (Status);
 }
 
 /*++
-- 
2.20.1

[PATCH edk2-platforms 02/15] Platform/AMD: add RngLib for Overdriveboard

[Leif Lindholm]

OpenSSL now requires an RngLib. Add the generic
MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
to fix Overdrive build.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index 5a38b9dd96ae..bf4d6dd7b804 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -119,6 +119,7 @@ [LibraryClasses.common]
   PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
 
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
-- 
2.20.1

[PATCH edk2-platforms 03/15] Platform,Silicon: fix beagleboard tautological compares

[Leif Lindholm]

Fix two instances of masking a single bit and testing another.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 .../BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c      | 2 +-
 Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c b/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c
index f3e0201a6f1f..e673afda6414 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c
+++ b/Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.c
@@ -34,7 +34,7 @@ ResetCold (
 {
   //Perform cold reset of the system.
   MmioOr32 (PRM_RSTCTRL, RST_DPLL3);
-  while ((MmioRead32(PRM_RSTST) & GLOBAL_COLD_RST) != 0x1);
+  while (!(MmioRead32(PRM_RSTST) & GLOBAL_COLD_RST));
 }
 
 /**
diff --git a/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.c b/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.c
index 894ba3313cdf..a8b820e84800 100644
--- a/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.c
+++ b/Silicon/TexasInstruments/Omap35xxPkg/SmbusDxe/Smbus.c
@@ -28,7 +28,7 @@ WaitForBusBusy (
 {
   UINTN Retry = 0;
 
-  while (++Retry < MAX_RETRY && (MmioRead16(I2C_STAT) & BB) == 0x1);
+  while (++Retry < MAX_RETRY && (MmioRead16(I2C_STAT) & BB));
 
   if (Retry == MAX_RETRY) {
     return EFI_TIMEOUT;
-- 
2.20.1

[PATCH edk2-platforms 04/15] Silicon/Hisilicon: add RngLib for Hisilicon

[Leif Lindholm]

OpenSSL now requires an RngLib. Add the generic
MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
to fix build.

Cc: Ming Huang <huangming23@huawei.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Silicon/Hisilicon/Hisilicon.dsc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index 7bc965e97350..eef7d4e85d51 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -103,6 +103,7 @@ [LibraryClasses.common]
 
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
   FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
-- 
2.20.1

[PATCH edk2-platforms 05/15] Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib

[Leif Lindholm]

Update .dsc.inc by adding mappings for:
- SafeIntLib
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (runtime)

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Thomas Abraham <thomas.abraham@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index b0a48d6c041c..274b2a297c3c 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -237,6 +237,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
   #
-- 
2.20.1

[PATCH edk2-platforms 06/15] Platform/AMD: add VariablePolicy library resolutions for Overdrive

[Leif Lindholm]

Add resolutions for
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
index bf4d6dd7b804..eb4938a94ba9 100644
--- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
+++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
@@ -121,6 +121,7 @@ [LibraryClasses.common]
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
   RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -212,6 +213,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -572,6 +574,7 @@ [Components.common]
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
 
-- 
2.20.1

[PATCH edk2-platforms 07/15] Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000

[Leif Lindholm]

Add resolutions for
- SafeIntLib
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
index 5cf865d9cd03..e515aaade126 100644
--- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
+++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc
@@ -45,6 +45,7 @@ [LibraryClasses.common]
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
 
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
@@ -116,6 +117,7 @@ [LibraryClasses.common]
   ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
   RealTimeClockLib|Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
 
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   PlatformBootManagerLib|ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -205,6 +207,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -506,6 +509,7 @@ [Components.common]
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
 
-- 
2.20.1

[PATCH edk2-platforms 08/15] Platform/LeMaker: add VariablePolicy resolutions for cello

[Leif Lindholm]

Add resolutions for
- SafeIntLib
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/LeMaker/CelloBoard/CelloBoard.dsc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
index 9ed4e03b2400..3bf67adce680 100644
--- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc
+++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc
@@ -44,6 +44,7 @@ [LibraryClasses.common]
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
 
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
@@ -114,6 +115,7 @@ [LibraryClasses.common]
   ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSystemLib.inf
   RealTimeClockLib|Silicon/AMD/Styx/Library/RealTimeClockLib/RealTimeClockLib.inf
 
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf
@@ -203,6 +205,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -519,6 +522,7 @@ [Components.common]
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   Silicon/AMD/Styx/Drivers/StyxSpiFvDxe/StyxSpiFvDxe.inf
 
-- 
2.20.1

[PATCH edk2-platforms 09/15] Platform/SiFive: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- SafeIntLib
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

for u500/u540 platforms.

Cc: Abner Chang <abner.chang@hpe.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc    | 4 ++++
 .../U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc b/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
index 6a4e029c358b..2d652d215f82 100644
--- a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
+++ b/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
@@ -65,6 +65,7 @@ [LibraryClasses]
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -239,6 +240,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
 !endif
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.common.UEFI_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -253,6 +255,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
 !endif
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -447,6 +450,7 @@ [Components]
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
index 682504ba5fde..9f6047518905 100644
--- a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
+++ b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
@@ -65,6 +65,7 @@ [LibraryClasses]
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -240,6 +241,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
 !endif
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.common.UEFI_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -254,6 +256,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
 !endif
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_DRIVER]
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
@@ -446,6 +449,7 @@ [Components]
   MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
-- 
2.20.1

[PATCH edk2-platforms 10/15] Platform/Qemu: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)
for SbsaQemu platform.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Graeme Gregory <graeme@nuviainc.com>
Cc: Radoslaw Biernacki <rad@semihalf.com>
Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
index 49bc5033f438..fb806ecef3f7 100644
--- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
+++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc
@@ -246,6 +246,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
 
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
@@ -255,6 +256,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !endif
 
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 ###################################################################################################
 # BuildOptions Section - Define the module specific tool chain flags that should be used as
@@ -589,6 +591,7 @@ [Components.common]
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
       # don't use unaligned CopyMem () on the UEFI varstore NOR flash region
       BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {
     <LibraryClasses>
-- 
2.20.1

[PATCH edk2-platforms 11/15] Silicon/Marvell: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

These need SafeIntLib, so move that out of the ifdef restricting it to
capsule builds.

Cc: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
index ce8e120ea4fd..017c6287f712 100644
--- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
+++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc
@@ -38,8 +38,8 @@ [LibraryClasses.common]
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
 !if $(CAPSULE_ENABLE)
   BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf
+!endif
   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
-!endif
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
@@ -185,6 +185,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -197,6 +198,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.ARM, LibraryClasses.AARCH64]
   #
@@ -560,6 +562,7 @@ [Components.common]
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
 
   # UEFI application (Shell Embedded Boot Loader)
-- 
2.20.1

[PATCH edk2-platforms 12/15] Platform/BeagleBoard: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- SafeIntLib
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
index dfc31ab4018b..471f80ce3cf0 100644
--- a/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/Platform/BeagleBoard/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -47,6 +47,7 @@ [LibraryClasses.common]
 
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
 
   ResetSystemLib|Platform/BeagleBoard/BeagleBoardPkg/Library/ResetSystemLib/ResetSystemLib.inf
 
@@ -134,6 +135,7 @@ [LibraryClasses.common]
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
 
@@ -182,6 +184,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -189,6 +192,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
 #  PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
   PeCoffLib|Platform/BeagleBoard/BeagleBoardPkg/Library/DxeHobPeCoffLib/DxeHobPeCoffLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 
 [LibraryClasses.ARM]
-- 
2.20.1

[PATCH edk2-platforms 13/15] Silicon/NXP: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- SafeIntLib
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)

Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Silicon/NXP/NxpQoriqLs.dsc.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Silicon/NXP/NxpQoriqLs.dsc.inc b/Silicon/NXP/NxpQoriqLs.dsc.inc
index 21c87df73220..38aa1f22a49d 100644
--- a/Silicon/NXP/NxpQoriqLs.dsc.inc
+++ b/Silicon/NXP/NxpQoriqLs.dsc.inc
@@ -49,6 +49,7 @@ [LibraryClasses.common]
   DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
   SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -89,6 +90,7 @@ [LibraryClasses.common]
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf
@@ -160,6 +162,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -167,6 +170,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
   ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.AARCH64]
   #
-- 
2.20.1

[PATCH edk2-platforms 14/15] Platform/SocioNext: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)
to DeveloperBox platform.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
index a459079b1f26..c79792eef0aa 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
@@ -127,6 +127,7 @@ [LibraryClasses.common.UEFI_APPLICATION]
   # UiApp dependencies
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -143,6 +144,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.ARM]
  ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
@@ -366,6 +368,7 @@ [Components.common]
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
       TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
       VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
   }
 !else
   ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf {
-- 
2.20.1

[PATCH edk2-platforms 15/15] Silicon/Hisilicon: add VariablePolicy resolutions

[Leif Lindholm]

Add resolutions for
- VariablePolicyLib
- VariablePolicyHelperLib
- VariablePolicyLib (DXE_RUNTIME_DRIVER)
to Hisilicon platforms.

Cc: Ming Huang <huangming23@huawei.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Silicon/Hisilicon/Hisilicon.dsc.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
index eef7d4e85d51..6bacd9cafd7a 100644
--- a/Silicon/Hisilicon/Hisilicon.dsc.inc
+++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
@@ -91,6 +91,7 @@ [LibraryClasses.common]
   UefiDevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
 
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
   ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
   LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
@@ -193,6 +194,7 @@ [LibraryClasses.common.UEFI_DRIVER]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
 
 [LibraryClasses.common.DXE_RUNTIME_DRIVER]
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
@@ -205,6 +207,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
 !if $(TARGET) != RELEASE
   DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
 !endif
+  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
 
 [LibraryClasses.AARCH64]
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
-- 
2.20.1

Re: [PATCH edk2-platforms 02/15] Platform/AMD: add RngLib for Overdriveboard

[Ard Biesheuvel]

On 11/25/20 1:55 PM, Leif Lindholm wrote:
> OpenSSL now requires an RngLib. Add the generic
> MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
> to fix Overdrive build.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> ---
>   Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> index 5a38b9dd96ae..bf4d6dd7b804 100644
> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> @@ -119,6 +119,7 @@ [LibraryClasses.common]
>     PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
>   
>     OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
>     TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
>   
>     UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> 

Could we use DxeRngLib here? That will be backed by the h/w RNG instead 
of the cycle counter.

Re: [PATCH edk2-platforms 14/15] Platform/SocioNext: add VariablePolicy resolutions

[Ard Biesheuvel]

On 11/25/20 1:55 PM, Leif Lindholm wrote:
> Add resolutions for
> - VariablePolicyLib
> - VariablePolicyHelperLib
> - VariablePolicyLib (DXE_RUNTIME_DRIVER)
> to DeveloperBox platform.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Leif Lindholm <leif@nuviainc.com>

Does this unbreak the build of DeveloperBoxMm.dsc as well? If not, we 
should probably drop some of these into the .dsc.in file instead.

> ---
>   Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 3 +++
>   1 file changed, 3 insertions(+)
> 
> diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> index a459079b1f26..c79792eef0aa 100644
> --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> @@ -127,6 +127,7 @@ [LibraryClasses.common.UEFI_APPLICATION]
>     # UiApp dependencies
>     FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
>     DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> +  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
>   
>     ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>     ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -143,6 +144,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>   !if $(TARGET) != RELEASE
>     DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
>   !endif
> +  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
>   
>   [LibraryClasses.ARM]
>    ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
> @@ -366,6 +368,7 @@ [Components.common]
>         NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>         TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
>         VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> +      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
>     }
>   !else
>     ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf {
> 

Re: [PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[Leif Lindholm]

On Wed, Nov 25, 2020 at 12:55:44 +0000, Leif Lindholm wrote:
> The recently merged VariablePolicy set in edk2,
> d448574e7310..124b3f9289f1, broke everything[tm].
> Fix up the ARM platforms I have any sort of history about,
> including some unrelated things that popped up along the way.
> 
> Note: the hisilicon server platforms still don't build due to use
> of now deleted (previously deprecated) string functions in
> the SMBIOS code. Rebecca Cran has been sending out a genericised
> set *based* on this code, but now fixed. If Hisilicon could look
> into making use of that version instead, that might be less hassle
> than fixing the current implementation:
> https://edk2.groups.io/g/devel/message/67255

Double-whoops on the Hisilicon patches:
1) Ming Huang bounces.
2) I have a misfiled v3 of a set to deal with the above in my inbox
   from Wenyi Xie <xiewenyi2@huawei.com>
Adding them to this posting.

Wenyi - could you add an entry or entries to Maintainers.txt for the
Hisilicon platforms?

Best Regards,

Leif

> Cc: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Bret Barkelew <brbarkel@microsoft.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> Cc: Graeme Gregory <graeme@nuviainc.com>
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
> Cc: Ming Huang <huangming23@huawei.com>
> Cc: Radoslaw Biernacki <rad@semihalf.com>
> Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> 
> Leif Lindholm (15):
>   Silicon/AMD: update Styx to use PcdSet*S APIs
>   Platform/AMD: add RngLib for Overdriveboard
>   Platform,Silicon: fix beagleboard tautological compares
>   Silicon/Hisilicon: add RngLib for Hisilicon
>   Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib
>   Platform/AMD: add VariablePolicy library resolutions for Overdrive
>   Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000
>   Platform/LeMaker: add VariablePolicy resolutions for cello
>   Platform/SiFive: add VariablePolicy resolutions
>   Platform/Qemu: add VariablePolicy resolutions
>   Silicon/Marvell: add VariablePolicy resolutions
>   Platform/BeagleBoard: add VariablePolicy resolutions
>   Silicon/NXP: add VariablePolicy resolutions
>   Platform/SocioNext: add VariablePolicy resolutions
>   Silicon/Hisilicon: add VariablePolicy resolutions
> 
>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  |  1 +
>  Silicon/Hisilicon/Hisilicon.dsc.inc           |  4 ++++
>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  5 ++++-
>  Silicon/NXP/NxpQoriqLs.dsc.inc                |  4 ++++
>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     |  4 ++++
>  .../BeagleBoardPkg/BeagleBoardPkg.dsc         |  4 ++++
>  Platform/LeMaker/CelloBoard/CelloBoard.dsc    |  4 ++++
>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  3 +++
>  .../FreedomU500VC707Board/U500.dsc            |  4 ++++
>  .../FreedomU540HiFiveUnleashedBoard/U540.dsc  |  4 ++++
>  .../Socionext/DeveloperBox/DeveloperBox.dsc   |  3 +++
>  .../Overdrive1000Board/Overdrive1000Board.dsc |  4 ++++
>  .../Library/ResetSystemLib/ResetSystemLib.c   |  2 +-
>  .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
>  .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
>  .../Omap35xxPkg/SmbusDxe/Smbus.c              |  2 +-
>  16 files changed, 64 insertions(+), 15 deletions(-)
> 
> -- 
> 2.20.1
> 

Re: [PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[Ard Biesheuvel]

On 11/25/20 1:55 PM, Leif Lindholm wrote:
> The recently merged VariablePolicy set in edk2,
> d448574e7310..124b3f9289f1, broke everything[tm].
> Fix up the ARM platforms I have any sort of history about,
> including some unrelated things that popped up along the way.
> 

Thanks for fixing this mess.

For the patches I did not reply to individually,

Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>


> Note: the hisilicon server platforms still don't build due to use
> of now deleted (previously deprecated) string functions in
> the SMBIOS code. Rebecca Cran has been sending out a genericised
> set *based* on this code, but now fixed. If Hisilicon could look
> into making use of that version instead, that might be less hassle
> than fixing the current implementation:
> https://edk2.groups.io/g/devel/message/67255
> 
> Cc: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Bret Barkelew <brbarkel@microsoft.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> Cc: Graeme Gregory <graeme@nuviainc.com>
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
> Cc: Ming Huang <huangming23@huawei.com>
> Cc: Radoslaw Biernacki <rad@semihalf.com>
> Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
> Cc: Thomas Abraham <thomas.abraham@arm.com>
> 
> Leif Lindholm (15):
>    Silicon/AMD: update Styx to use PcdSet*S APIs
>    Platform/AMD: add RngLib for Overdriveboard
>    Platform,Silicon: fix beagleboard tautological compares
>    Silicon/Hisilicon: add RngLib for Hisilicon
>    Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib
>    Platform/AMD: add VariablePolicy library resolutions for Overdrive
>    Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000
>    Platform/LeMaker: add VariablePolicy resolutions for cello
>    Platform/SiFive: add VariablePolicy resolutions
>    Platform/Qemu: add VariablePolicy resolutions
>    Silicon/Marvell: add VariablePolicy resolutions
>    Platform/BeagleBoard: add VariablePolicy resolutions
>    Silicon/NXP: add VariablePolicy resolutions
>    Platform/SocioNext: add VariablePolicy resolutions
>    Silicon/Hisilicon: add VariablePolicy resolutions
> 
>   Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  |  1 +
>   Silicon/Hisilicon/Hisilicon.dsc.inc           |  4 ++++
>   Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  5 ++++-
>   Silicon/NXP/NxpQoriqLs.dsc.inc                |  4 ++++
>   .../AMD/OverdriveBoard/OverdriveBoard.dsc     |  4 ++++
>   .../BeagleBoardPkg/BeagleBoardPkg.dsc         |  4 ++++
>   Platform/LeMaker/CelloBoard/CelloBoard.dsc    |  4 ++++
>   Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  3 +++
>   .../FreedomU500VC707Board/U500.dsc            |  4 ++++
>   .../FreedomU540HiFiveUnleashedBoard/U540.dsc  |  4 ++++
>   .../Socionext/DeveloperBox/DeveloperBox.dsc   |  3 +++
>   .../Overdrive1000Board/Overdrive1000Board.dsc |  4 ++++
>   .../Library/ResetSystemLib/ResetSystemLib.c   |  2 +-
>   .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
>   .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
>   .../Omap35xxPkg/SmbusDxe/Smbus.c              |  2 +-
>   16 files changed, 64 insertions(+), 15 deletions(-)
> 

Re: [PATCH edk2-platforms 04/15] Silicon/Hisilicon: add RngLib for Hisilicon

[Leif Lindholm]

+Wenyi

On Wed, Nov 25, 2020 at 12:55:48 +0000, Leif Lindholm wrote:
> OpenSSL now requires an RngLib. Add the generic
> MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
> to fix build.
> 
> Cc: Ming Huang <huangming23@huawei.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> ---
>  Silicon/Hisilicon/Hisilicon.dsc.inc | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
> index 7bc965e97350..eef7d4e85d51 100644
> --- a/Silicon/Hisilicon/Hisilicon.dsc.inc
> +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
> @@ -103,6 +103,7 @@ [LibraryClasses.common]
>  
>    CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf
>    OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> +  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
>    IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>    FmpAuthenticationLib|SecurityPkg/Library/FmpAuthenticationLibPkcs7/FmpAuthenticationLibPkcs7.inf
> -- 
> 2.20.1
> 

Re: [PATCH edk2-platforms 15/15] Silicon/Hisilicon: add VariablePolicy resolutions

[Leif Lindholm]

+Wenyi

On Wed, Nov 25, 2020 at 12:55:59 +0000, Leif Lindholm wrote:
> Add resolutions for
> - VariablePolicyLib
> - VariablePolicyHelperLib
> - VariablePolicyLib (DXE_RUNTIME_DRIVER)
> to Hisilicon platforms.
> 
> Cc: Ming Huang <huangming23@huawei.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> ---
>  Silicon/Hisilicon/Hisilicon.dsc.inc | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc
> index eef7d4e85d51..6bacd9cafd7a 100644
> --- a/Silicon/Hisilicon/Hisilicon.dsc.inc
> +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc
> @@ -91,6 +91,7 @@ [LibraryClasses.common]
>    UefiDevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
>  
>    VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> +  VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
>  
>    ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf
>    LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
> @@ -193,6 +194,7 @@ [LibraryClasses.common.UEFI_DRIVER]
>    PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
>    MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
> +  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
>  
>  [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>    HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
> @@ -205,6 +207,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>  !if $(TARGET) != RELEASE
>    DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
>  !endif
> +  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
>  
>  [LibraryClasses.AARCH64]
>    ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
> -- 
> 2.20.1
> 

Re: [PATCH edk2-platforms 14/15] Platform/SocioNext: add VariablePolicy resolutions

[Leif Lindholm]

On Wed, Nov 25, 2020 at 14:11:00 +0100, Ard Biesheuvel wrote:
> On 11/25/20 1:55 PM, Leif Lindholm wrote:
> > Add resolutions for
> > - VariablePolicyLib
> > - VariablePolicyHelperLib
> > - VariablePolicyLib (DXE_RUNTIME_DRIVER)
> > to DeveloperBox platform.
> > 
> > Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> > Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> 
> Does this unbreak the build of DeveloperBoxMm.dsc as well?

No. I was unsure of that being pretty much our reference for secure
variable handling, just cargo culting a fix in place was the correct
course of action.

> If not, we should
> probably drop some of these into the .dsc.in file instead.

Unless the above is an issue, sure.

/
    Leif

> > ---
> >   Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 3 +++
> >   1 file changed, 3 insertions(+)
> > 
> > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> > index a459079b1f26..c79792eef0aa 100644
> > --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> > +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc
> > @@ -127,6 +127,7 @@ [LibraryClasses.common.UEFI_APPLICATION]
> >     # UiApp dependencies
> >     FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
> >     DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
> > +  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
> >     ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >     ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> > @@ -143,6 +144,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
> >   !if $(TARGET) != RELEASE
> >     DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf
> >   !endif
> > +  VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLibRuntimeDxe.inf
> >   [LibraryClasses.ARM]
> >    ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf
> > @@ -366,6 +368,7 @@ [Components.common]
> >         NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
> >         TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> >         VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
> > +      VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
> >     }
> >   !else
> >     ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf {
> > 
> 

Re: [PATCH edk2-platforms 02/15] Platform/AMD: add RngLib for Overdriveboard

[Leif Lindholm]

On Wed, Nov 25, 2020 at 14:09:00 +0100, Ard Biesheuvel wrote:
> On 11/25/20 1:55 PM, Leif Lindholm wrote:
> > OpenSSL now requires an RngLib. Add the generic
> > MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
> > to fix Overdrive build.
> > 
> > Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> > Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> > ---
> >   Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> > index 5a38b9dd96ae..bf4d6dd7b804 100644
> > --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> > +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
> > @@ -119,6 +119,7 @@ [LibraryClasses.common]
> >     PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
> >     OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
> > +  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
> >     TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> >     UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
> > 
> 
> Could we use DxeRngLib here? That will be backed by the h/w RNG instead of
> the cycle counter.

You mean since we have EFI_RNG_PROTOCOL from StyxRngDxe?
Good point, had forgotten about that.
OK to fold in before pushing?

/
    Leif

Re: [PATCH edk2-platforms 02/15] Platform/AMD: add RngLib for Overdriveboard

[Ard Biesheuvel]

On 11/25/20 2:20 PM, Leif Lindholm wrote:
> On Wed, Nov 25, 2020 at 14:09:00 +0100, Ard Biesheuvel wrote:
>> On 11/25/20 1:55 PM, Leif Lindholm wrote:
>>> OpenSSL now requires an RngLib. Add the generic
>>> MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
>>> to fix Overdrive build.
>>>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
>>> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
>>> ---
>>>    Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
>>> index 5a38b9dd96ae..bf4d6dd7b804 100644
>>> --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
>>> +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc
>>> @@ -119,6 +119,7 @@ [LibraryClasses.common]
>>>      PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessLib/StyxPlatformFlashAccessLib.inf
>>>      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
>>> +  RngLib|MdePkg/Library/BaseRngLibTimerLib/BaseRngLibTimerLib.inf
>>>      TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
>>>      UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
>>>
>>
>> Could we use DxeRngLib here? That will be backed by the h/w RNG instead of
>> the cycle counter.
> 
> You mean since we have EFI_RNG_PROTOCOL from StyxRngDxe?
> Good point, had forgotten about that.
> OK to fold in before pushing?
> 


Sure

Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

Re: [PATCH edk2-platforms 14/15] Platform/SocioNext: add VariablePolicy resolutions

[Ard Biesheuvel]

On 11/25/20 2:16 PM, Leif Lindholm wrote:
> On Wed, Nov 25, 2020 at 14:11:00 +0100, Ard Biesheuvel wrote:
>> On 11/25/20 1:55 PM, Leif Lindholm wrote:
>>> Add resolutions for
>>> - VariablePolicyLib
>>> - VariablePolicyHelperLib
>>> - VariablePolicyLib (DXE_RUNTIME_DRIVER)
>>> to DeveloperBox platform.
>>>
>>> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
>>> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
>>
>> Does this unbreak the build of DeveloperBoxMm.dsc as well?
> 
> No. I was unsure of that being pretty much our reference for secure
> variable handling, just cargo culting a fix in place was the correct
> course of action.
> 
>> If not, we should
>> probably drop some of these into the .dsc.in file instead.
> 
> Unless the above is an issue, sure.
> 

I double checked, and Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc 
is indeed broken as well, and it needs resolutions of both 
VariablePolicyLib and VariablePolicyHelperLib.

So adding those to [LibraryClasses] in 
Platform/Socionext/DeveloperBox/DeveloperBox.dsc.inc instead of 
elsewhere is probably the best approach here.

With that,

Acked-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

Re: [PATCH edk2-platforms 09/15] Platform/SiFive: add VariablePolicy resolutions

[Abner Chang]

Reviewed-by: Abner Chang <abner.chang@hpe.com>


> -----Original Message-----
> From: Leif Lindholm [mailto:leif@nuviainc.com]
> Sent: Wednesday, November 25, 2020 8:56 PM
> To: devel@edk2.groups.io
> Cc: Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>;
> Schaefer, Daniel <daniel.schaefer@hpe.com>
> Subject: [PATCH edk2-platforms 09/15] Platform/SiFive: add VariablePolicy
> resolutions
> 
> Add resolutions for
> - SafeIntLib
> - VariablePolicyLib
> - VariablePolicyHelperLib
> - VariablePolicyLib (DXE_RUNTIME_DRIVER)
> 
> for u500/u540 platforms.
> 
> Cc: Abner Chang <abner.chang@hpe.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> ---
>  Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc    | 4
> ++++
>  .../U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc      | 4 ++++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
> b/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
> index 6a4e029c358b..2d652d215f82 100644
> --- a/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
> +++ b/Platform/SiFive/U5SeriesPkg/FreedomU500VC707Board/U500.dsc
> @@ -65,6 +65,7 @@ [LibraryClasses]
>    PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
>    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> +  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
> 
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniz
> ationLib.inf
>    CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
> 
> PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanc
> eLibNull.inf
> @@ -239,6 +240,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>  !endif
> 
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo
> tManagerLib.inf
> +
> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi
> bRuntimeDxe.inf
> 
>  [LibraryClasses.common.UEFI_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> @@ -253,6 +255,7 @@ [LibraryClasses.common.UEFI_DRIVER]
>    DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
>  !endif
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> +
> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi
> b.inf
> 
>  [LibraryClasses.common.DXE_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> @@ -447,6 +450,7 @@ [Components]
>    MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
>      <LibraryClasses>
>        NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
> +
> VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Va
> riablePolicyHelperLib.inf
>    }
>    MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> 
> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCoun
> terRuntimeDxe.inf
> diff --git
> a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.d
> sc
> b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.
> dsc
> index 682504ba5fde..9f6047518905 100644
> ---
> a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.d
> sc
> +++
> b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.
> dsc
> @@ -65,6 +65,7 @@ [LibraryClasses]
>    PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>    BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
>    BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
> +  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
> 
> SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniz
> ationLib.inf
>    CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
> 
> PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanc
> eLibNull.inf
> @@ -240,6 +241,7 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER]
>    BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
>  !endif
> 
> UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo
> tManagerLib.inf
> +
> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi
> bRuntimeDxe.inf
> 
>  [LibraryClasses.common.UEFI_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> @@ -254,6 +256,7 @@ [LibraryClasses.common.UEFI_DRIVER]
>    DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
>  !endif
>    UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
> +
> VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLi
> b.inf
> 
>  [LibraryClasses.common.DXE_DRIVER]
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
> @@ -446,6 +449,7 @@ [Components]
>    MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
>      <LibraryClasses>
>        NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
> +
> VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Va
> riablePolicyHelperLib.inf
>    }
>    MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
> 
> MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCoun
> terRuntimeDxe.inf
> --
> 2.20.1

Re: [PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[wenyi,xie]

On 2020/11/25 21:11, Leif Lindholm wrote:
> On Wed, Nov 25, 2020 at 12:55:44 +0000, Leif Lindholm wrote:
>> The recently merged VariablePolicy set in edk2,
>> d448574e7310..124b3f9289f1, broke everything[tm].
>> Fix up the ARM platforms I have any sort of history about,
>> including some unrelated things that popped up along the way.
>>
>> Note: the hisilicon server platforms still don't build due to use
>> of now deleted (previously deprecated) string functions in
>> the SMBIOS code. Rebecca Cran has been sending out a genericised
>> set *based* on this code, but now fixed. If Hisilicon could look
>> into making use of that version instead, that might be less hassle
>> than fixing the current implementation:
>> https://edk2.groups.io/g/devel/message/67255
> 
> Double-whoops on the Hisilicon patches:
> 1) Ming Huang bounces.
> 2) I have a misfiled v3 of a set to deal with the above in my inbox
>    from Wenyi Xie <xiewenyi2@huawei.com>
> Adding them to this posting.
> 
> Wenyi - could you add an entry or entries to Maintainers.txt for the
> Hisilicon platforms?
> 
May I ask what does entry mean, I don't understand.

Thanks
Wenyi

> Best Regards,
> 
> Leif
> 
>> Cc: Abner Chang <abner.chang@hpe.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
>> Cc: Bret Barkelew <brbarkel@microsoft.com>
>> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
>> Cc: Graeme Gregory <graeme@nuviainc.com>
>> Cc: Marcin Wojtas <mw@semihalf.com>
>> Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
>> Cc: Ming Huang <huangming23@huawei.com>
>> Cc: Radoslaw Biernacki <rad@semihalf.com>
>> Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
>> Cc: Thomas Abraham <thomas.abraham@arm.com>
>>
>> Leif Lindholm (15):
>>   Silicon/AMD: update Styx to use PcdSet*S APIs
>>   Platform/AMD: add RngLib for Overdriveboard
>>   Platform,Silicon: fix beagleboard tautological compares
>>   Silicon/Hisilicon: add RngLib for Hisilicon
>>   Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib
>>   Platform/AMD: add VariablePolicy library resolutions for Overdrive
>>   Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000
>>   Platform/LeMaker: add VariablePolicy resolutions for cello
>>   Platform/SiFive: add VariablePolicy resolutions
>>   Platform/Qemu: add VariablePolicy resolutions
>>   Silicon/Marvell: add VariablePolicy resolutions
>>   Platform/BeagleBoard: add VariablePolicy resolutions
>>   Silicon/NXP: add VariablePolicy resolutions
>>   Platform/SocioNext: add VariablePolicy resolutions
>>   Silicon/Hisilicon: add VariablePolicy resolutions
>>
>>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  |  1 +
>>  Silicon/Hisilicon/Hisilicon.dsc.inc           |  4 ++++
>>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  5 ++++-
>>  Silicon/NXP/NxpQoriqLs.dsc.inc                |  4 ++++
>>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     |  4 ++++
>>  .../BeagleBoardPkg/BeagleBoardPkg.dsc         |  4 ++++
>>  Platform/LeMaker/CelloBoard/CelloBoard.dsc    |  4 ++++
>>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  3 +++
>>  .../FreedomU500VC707Board/U500.dsc            |  4 ++++
>>  .../FreedomU540HiFiveUnleashedBoard/U540.dsc  |  4 ++++
>>  .../Socionext/DeveloperBox/DeveloperBox.dsc   |  3 +++
>>  .../Overdrive1000Board/Overdrive1000Board.dsc |  4 ++++
>>  .../Library/ResetSystemLib/ResetSystemLib.c   |  2 +-
>>  .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
>>  .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
>>  .../Omap35xxPkg/SmbusDxe/Smbus.c              |  2 +-
>>  16 files changed, 64 insertions(+), 15 deletions(-)
>>
>> -- 
>> 2.20.1
>>
> .
> 

Re: [PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[Leif Lindholm]

On Thu, Nov 26, 2020 at 18:44:55 +0800, xiewenyi (A) wrote:
> 
> 
> On 2020/11/25 21:11, Leif Lindholm wrote:
> > On Wed, Nov 25, 2020 at 12:55:44 +0000, Leif Lindholm wrote:
> >> The recently merged VariablePolicy set in edk2,
> >> d448574e7310..124b3f9289f1, broke everything[tm].
> >> Fix up the ARM platforms I have any sort of history about,
> >> including some unrelated things that popped up along the way.
> >>
> >> Note: the hisilicon server platforms still don't build due to use
> >> of now deleted (previously deprecated) string functions in
> >> the SMBIOS code. Rebecca Cran has been sending out a genericised
> >> set *based* on this code, but now fixed. If Hisilicon could look
> >> into making use of that version instead, that might be less hassle
> >> than fixing the current implementation:
> >> https://edk2.groups.io/g/devel/message/67255
> > 
> > Double-whoops on the Hisilicon patches:
> > 1) Ming Huang bounces.
> > 2) I have a misfiled v3 of a set to deal with the above in my inbox
> >    from Wenyi Xie <xiewenyi2@huawei.com>
> > Adding them to this posting.
> > 
> > Wenyi - could you add an entry or entries to Maintainers.txt for the
> > Hisilicon platforms?
> > 
> May I ask what does entry mean, I don't understand.

Maintainers.txt defines several sections, describing who should be
Cc:d on patches to different parts of the source tree.

Ah, now that I look, I see we already have:
HiSilicon
F: Platform/Hisilicon/
F: Silicon/Hisilicon/
M: Leif Lindholm <leif@nuviainc.com>
R: Ard Biesheuvel <ard.biesheuvel@arm.com>

However, it would be very useful to have someone from Hisilicon/Huawei
to help out with reviewing patches to the Hisilicon platforms.
And if the mobile/server platforms should have different reviewers, it
would be useful to reflect that as well.
At a minimum, could you send a patch adding yourself as a reviewer (R:
) to the existing Hisilicon section?

Best Regards,

Leif

> Thanks
> Wenyi
> 
> > Best Regards,
> > 
> > Leif
> > 
> >> Cc: Abner Chang <abner.chang@hpe.com>
> >> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> >> Cc: Bret Barkelew <brbarkel@microsoft.com>
> >> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> >> Cc: Graeme Gregory <graeme@nuviainc.com>
> >> Cc: Marcin Wojtas <mw@semihalf.com>
> >> Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
> >> Cc: Ming Huang <huangming23@huawei.com>
> >> Cc: Radoslaw Biernacki <rad@semihalf.com>
> >> Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
> >> Cc: Thomas Abraham <thomas.abraham@arm.com>
> >>
> >> Leif Lindholm (15):
> >>   Silicon/AMD: update Styx to use PcdSet*S APIs
> >>   Platform/AMD: add RngLib for Overdriveboard
> >>   Platform,Silicon: fix beagleboard tautological compares
> >>   Silicon/Hisilicon: add RngLib for Hisilicon
> >>   Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib
> >>   Platform/AMD: add VariablePolicy library resolutions for Overdrive
> >>   Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000
> >>   Platform/LeMaker: add VariablePolicy resolutions for cello
> >>   Platform/SiFive: add VariablePolicy resolutions
> >>   Platform/Qemu: add VariablePolicy resolutions
> >>   Silicon/Marvell: add VariablePolicy resolutions
> >>   Platform/BeagleBoard: add VariablePolicy resolutions
> >>   Silicon/NXP: add VariablePolicy resolutions
> >>   Platform/SocioNext: add VariablePolicy resolutions
> >>   Silicon/Hisilicon: add VariablePolicy resolutions
> >>
> >>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  |  1 +
> >>  Silicon/Hisilicon/Hisilicon.dsc.inc           |  4 ++++
> >>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  5 ++++-
> >>  Silicon/NXP/NxpQoriqLs.dsc.inc                |  4 ++++
> >>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     |  4 ++++
> >>  .../BeagleBoardPkg/BeagleBoardPkg.dsc         |  4 ++++
> >>  Platform/LeMaker/CelloBoard/CelloBoard.dsc    |  4 ++++
> >>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  3 +++
> >>  .../FreedomU500VC707Board/U500.dsc            |  4 ++++
> >>  .../FreedomU540HiFiveUnleashedBoard/U540.dsc  |  4 ++++
> >>  .../Socionext/DeveloperBox/DeveloperBox.dsc   |  3 +++
> >>  .../Overdrive1000Board/Overdrive1000Board.dsc |  4 ++++
> >>  .../Library/ResetSystemLib/ResetSystemLib.c   |  2 +-
> >>  .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
> >>  .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
> >>  .../Omap35xxPkg/SmbusDxe/Smbus.c              |  2 +-
> >>  16 files changed, 64 insertions(+), 15 deletions(-)
> >>
> >> -- 
> >> 2.20.1
> >>
> > .
> > 

Re: [PATCH edk2-platforms 00/15] arm platform fixes triggered by VariablePolicy

[wenyi,xie]

I see. I will add myself to Maintainers.txt later.

Thanks
Wenyi

On 2020/11/26 21:31, Leif Lindholm wrote:
> On Thu, Nov 26, 2020 at 18:44:55 +0800, xiewenyi (A) wrote:
>>
>>
>> On 2020/11/25 21:11, Leif Lindholm wrote:
>>> On Wed, Nov 25, 2020 at 12:55:44 +0000, Leif Lindholm wrote:
>>>> The recently merged VariablePolicy set in edk2,
>>>> d448574e7310..124b3f9289f1, broke everything[tm].
>>>> Fix up the ARM platforms I have any sort of history about,
>>>> including some unrelated things that popped up along the way.
>>>>
>>>> Note: the hisilicon server platforms still don't build due to use
>>>> of now deleted (previously deprecated) string functions in
>>>> the SMBIOS code. Rebecca Cran has been sending out a genericised
>>>> set *based* on this code, but now fixed. If Hisilicon could look
>>>> into making use of that version instead, that might be less hassle
>>>> than fixing the current implementation:
>>>> https://edk2.groups.io/g/devel/message/67255
>>>
>>> Double-whoops on the Hisilicon patches:
>>> 1) Ming Huang bounces.
>>> 2) I have a misfiled v3 of a set to deal with the above in my inbox
>>>    from Wenyi Xie <xiewenyi2@huawei.com>
>>> Adding them to this posting.
>>>
>>> Wenyi - could you add an entry or entries to Maintainers.txt for the
>>> Hisilicon platforms?
>>>
>> May I ask what does entry mean, I don't understand.
> 
> Maintainers.txt defines several sections, describing who should be
> Cc:d on patches to different parts of the source tree.
> 
> Ah, now that I look, I see we already have:
> HiSilicon
> F: Platform/Hisilicon/
> F: Silicon/Hisilicon/
> M: Leif Lindholm <leif@nuviainc.com>
> R: Ard Biesheuvel <ard.biesheuvel@arm.com>
> 
> However, it would be very useful to have someone from Hisilicon/Huawei
> to help out with reviewing patches to the Hisilicon platforms.
> And if the mobile/server platforms should have different reviewers, it
> would be useful to reflect that as well.
> At a minimum, could you send a patch adding yourself as a reviewer (R:
> ) to the existing Hisilicon section?
> 
> Best Regards,
> 
> Leif
> 
>> Thanks
>> Wenyi
>>
>>> Best Regards,
>>>
>>> Leif
>>>
>>>> Cc: Abner Chang <abner.chang@hpe.com>
>>>> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
>>>> Cc: Bret Barkelew <brbarkel@microsoft.com>
>>>> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
>>>> Cc: Graeme Gregory <graeme@nuviainc.com>
>>>> Cc: Marcin Wojtas <mw@semihalf.com>
>>>> Cc: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
>>>> Cc: Ming Huang <huangming23@huawei.com>
>>>> Cc: Radoslaw Biernacki <rad@semihalf.com>
>>>> Cc: Tanmay Jagdale <tanmay.jagdale@linaro.org>
>>>> Cc: Thomas Abraham <thomas.abraham@arm.com>
>>>>
>>>> Leif Lindholm (15):
>>>>   Silicon/AMD: update Styx to use PcdSet*S APIs
>>>>   Platform/AMD: add RngLib for Overdriveboard
>>>>   Platform,Silicon: fix beagleboard tautological compares
>>>>   Silicon/Hisilicon: add RngLib for Hisilicon
>>>>   Platform/ARM: VExpressPkg fixes to work with new VariablePolicyLib
>>>>   Platform/AMD: add VariablePolicy library resolutions for Overdrive
>>>>   Platform/SoftIron: add VariablePolicy resolutions for Overdrive1000
>>>>   Platform/LeMaker: add VariablePolicy resolutions for cello
>>>>   Platform/SiFive: add VariablePolicy resolutions
>>>>   Platform/Qemu: add VariablePolicy resolutions
>>>>   Silicon/Marvell: add VariablePolicy resolutions
>>>>   Platform/BeagleBoard: add VariablePolicy resolutions
>>>>   Silicon/NXP: add VariablePolicy resolutions
>>>>   Platform/SocioNext: add VariablePolicy resolutions
>>>>   Silicon/Hisilicon: add VariablePolicy resolutions
>>>>
>>>>  Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc  |  1 +
>>>>  Silicon/Hisilicon/Hisilicon.dsc.inc           |  4 ++++
>>>>  Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc |  5 ++++-
>>>>  Silicon/NXP/NxpQoriqLs.dsc.inc                |  4 ++++
>>>>  .../AMD/OverdriveBoard/OverdriveBoard.dsc     |  4 ++++
>>>>  .../BeagleBoardPkg/BeagleBoardPkg.dsc         |  4 ++++
>>>>  Platform/LeMaker/CelloBoard/CelloBoard.dsc    |  4 ++++
>>>>  Platform/Qemu/SbsaQemu/SbsaQemu.dsc           |  3 +++
>>>>  .../FreedomU500VC707Board/U500.dsc            |  4 ++++
>>>>  .../FreedomU540HiFiveUnleashedBoard/U540.dsc  |  4 ++++
>>>>  .../Socionext/DeveloperBox/DeveloperBox.dsc   |  3 +++
>>>>  .../Overdrive1000Board/Overdrive1000Board.dsc |  4 ++++
>>>>  .../Library/ResetSystemLib/ResetSystemLib.c   |  2 +-
>>>>  .../Styx/Drivers/PlatInitPei/PlatInitPei.c    | 11 ++++++----
>>>>  .../Library/MemoryInitPei/MemoryInitPeiLib.c  | 20 +++++++++++--------
>>>>  .../Omap35xxPkg/SmbusDxe/Smbus.c              |  2 +-
>>>>  16 files changed, 64 insertions(+), 15 deletions(-)
>>>>
>>>> -- 
>>>> 2.20.1
>>>>
>>> .
>>>
> .
>