ArmVirtPkg/ArmVirtQemu: Use PEI flavor of ArmMmuLib for all PEIMs

The PEI flavor of the ArmMmuLib will install a HOB that exposes its
implementation of the special helper routine that is used to update live
entries, so that other instantiations of ArmMmuLib can invoke it. This
is needed to ensure that splitting page tables using break-before-make
(BBM) does not unmap the code that is performing the split.

However, the BASE variety of ArmMmuLib discovers the HOB and sets a
global pointer to refer to it, which is not possible in PEIMs, and so
all PEIMs must use the PEI variety of this library if one does.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 72a0cacab4..449e73b9e1 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -107,6 +107,9 @@
   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

 !endif

 

+[LibraryClasses.AARCH64.PEIM]

+  ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf

+

 [LibraryClasses.common.DXE_DRIVER]

   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

 

@@ -333,12 +336,7 @@
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

   MdeModulePkg/Core/Pei/PeiMain.inf

   ArmPlatformPkg/PlatformPei/PlatformPeim.inf

-  ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf {

-    <LibraryClasses>

-!if $(ARCH) == AARCH64

-      ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf

-!endif

-  }

+  ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf

   ArmPkg/Drivers/CpuPei/CpuPei.inf

 

 !if $(TPM2_ENABLE) == TRUE