Merge branch 'master' into dependabot/github_actions/github/issue-labeler-3.4dependabot/github_actions/github/issue-labeler-3.4

32 files changed, 486 insertions, 860 deletions

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 7044790a1e..3462adf9b6 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -114,7 +114,7 @@
 

   PlatformPeiLib|ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf

   MemoryInitPeiLib|ArmVirtPkg/Library/ArmVirtMemoryInitPeiLib/ArmVirtMemoryInitPeiLib.inf

-  ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf

+  ResetSystemLib|ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf

 

   # ARM PL031 RTC Driver

   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf

@@ -296,6 +296,8 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE

 

 [PcdsFixedAtBuild.common]

+  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE

+

 !ifdef $(FIRMWARE_VER)

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"

 !endif

diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index d5055a0341..234a2b5cf0 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -201,9 +201,6 @@
 [PcdsDynamicHii]

   gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS

 

-[PcdsPatchableInModule.common]

-  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE

-

 ################################################################################

 #

 # Components Section - list of all EDK II Modules needed by this Platform

@@ -213,7 +210,7 @@
   #

   # PEI Phase modules

   #

-  ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

+  ArmPlatformPkg/Sec/Sec.inf

   MdeModulePkg/Core/Pei/PeiMain.inf

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf {

     <LibraryClasses>

diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf
index 8554efc294..555604056c 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.fdf
+++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
@@ -236,7 +236,7 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE

 READ_LOCK_STATUS   = TRUE

 

-  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

+  INF ArmPlatformPkg/Sec/Sec.inf

   INF MdeModulePkg/Core/Pei/PeiMain.inf

   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf

   INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf

diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index ae0dd1497f..8688236084 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -147,11 +147,6 @@
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4

 

-  #

-  # ARM Virtual Architectural Timer -- fetch frequency from KVM

-  #

-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0

-

   # Use MMIO for accessing Serial port registers.

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialUseMmio|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialPciDeviceInfo|{0xFF}

@@ -165,8 +160,6 @@
   #

   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16

 

-  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE

-

 [PcdsPatchableInModule.common]

   #

   # This will be overridden in the code

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 64aa4e96e5..713710c499 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -66,7 +66,7 @@
   QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf

 

   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

-  VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

+  VirtNorFlashPlatformLib|OvmfPkg/Library/FdtNorFlashQemuLib/FdtNorFlashQemuLib.inf

 

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

@@ -92,6 +92,8 @@
   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf

 !endif

 

+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf

+

 [LibraryClasses.AARCH64]

   ArmPlatformLib|ArmVirtPkg/Library/ArmPlatformLibQemu/ArmPlatformLibQemu.inf

 

@@ -102,8 +104,9 @@
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf

 

 !if $(TPM2_ENABLE) == TRUE

+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf

   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf

-  ResetSystemLib|MdeModulePkg/Library/PeiResetSystemLib/PeiResetSystemLib.inf

+  FdtLib|MdePkg/Library/BaseFdtLib/BaseFdtLib.inf

   Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf

 !endif

 

@@ -152,6 +155,9 @@
   gArmTokenSpaceGuid.PcdVFPEnabled|1

 !endif

 

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress|0x00000000

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize|$(FD_SIZE)

+

   gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x4007c000

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

@@ -186,11 +192,6 @@
 !endif

 

   #

-  # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM

-  #

-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0

-

-  #

   # Network Pcds

   #

 !include NetworkPkg/NetworkPcds.dsc.inc

@@ -231,6 +232,10 @@
   # System Memory Size -- 128 MB initially, actual size will be fetched from DT

   gArmTokenSpaceGuid.PcdSystemMemorySize|0x8000000

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize   | 0x40000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize   | 0x40000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize | 0x40000

+

 [PcdsFixedAtBuild.AARCH64]

   # Clearing BIT0 in this PCD prevents installing a 32-bit SMBIOS entry point,

   # if the entry point version is >= 3.0. AARCH64 OSes cannot assume the

@@ -243,6 +248,13 @@
 [PcdsDynamicDefault.common]

   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase     | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64   | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64   | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase     | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase   | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64 | 0

+

   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI

   #  enumeration to complete before installing ACPI tables.

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE

@@ -293,10 +305,6 @@
   gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01

   gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01

 

-  # whether to use HVC or SMC to issue monitor calls - this typically depends

-  # on the exception level at which the UEFI system firmware executes

-  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE

-

   #

   # TPM2 support

   #

@@ -322,7 +330,11 @@
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5

 

 [LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]

+!if $(TPM2_ENABLE) == TRUE

   PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf

+!else

+  PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

+!endif

 

 ################################################################################

 #

@@ -333,21 +345,18 @@
   #

   # PEI Phase modules

   #

-  ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

+  ArmPlatformPkg/Sec/Sec.inf

   MdeModulePkg/Core/Pei/PeiMain.inf

   ArmPlatformPkg/PlatformPei/PlatformPeim.inf

   ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf

   ArmPkg/Drivers/CpuPei/CpuPei.inf

 

+!if $(TPM2_ENABLE) == TRUE

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf {

     <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   }

-!if $(TPM2_ENABLE) == TRUE

-  MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf {

-    <LibraryClasses>

-      ResetSystemLib|ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf

-  }

+  MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf

   OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

   SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {

     <LibraryClasses>

@@ -404,7 +413,10 @@
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

 !endif

   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf {

+    <LibraryClasses>

+      NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf

+  }

   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

   MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index 6073a31970..ac2040acff 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -104,15 +104,15 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE

 READ_LOCK_STATUS   = TRUE

 

-  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf

+  INF ArmPlatformPkg/Sec/Sec.inf

   INF MdeModulePkg/Core/Pei/PeiMain.inf

   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf

   INF ArmVirtPkg/MemoryInitPei/MemoryInitPeim.inf

   INF ArmPkg/Drivers/CpuPei/CpuPei.inf

   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf

 

-  INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

 !if $(TPM2_ENABLE) == TRUE

+  INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf

   INF MdeModulePkg/Universal/ResetSystemPei/ResetSystemPei.inf

   INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf

   INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 2cf96accbd..4e8ed6c968 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -65,7 +65,7 @@
   ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.inf

 

   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf

-  VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf

+  VirtNorFlashPlatformLib|OvmfPkg/Library/FdtNorFlashQemuLib/FdtNorFlashQemuLib.inf

 

   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf

   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf

@@ -82,6 +82,8 @@
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf

   TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf

 

+  ArmMonitorLib|ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf

+

 [LibraryClasses.common.DXE_DRIVER]

   AcpiPlatformLib|OvmfPkg/Library/AcpiPlatformLib/DxeAcpiPlatformLib.inf

   ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf

@@ -120,6 +122,8 @@
   gArmTokenSpaceGuid.PcdVFPEnabled|1

 !endif

 

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress|0x00000000

+  gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize|$(FD_SIZE)

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800

@@ -153,11 +157,6 @@
 !endif

 

   #

-  # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM

-  #

-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0

-

-  #

   # Network Pcds

   #

 !include NetworkPkg/NetworkPcds.dsc.inc

@@ -181,6 +180,10 @@
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|3

   gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x20000

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize   | 0x40000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize   | 0x40000

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize | 0x40000

+

 [PcdsPatchableInModule.common]

   # we need to provide a resolution for this PCD that supports PcdSet64()

   # being called from ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c,

@@ -203,11 +206,16 @@
   gArmTokenSpaceGuid.PcdFdBaseAddress|0x0

   gArmTokenSpaceGuid.PcdFvBaseAddress|0x0

 

-  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE

-

 [PcdsDynamicDefault.common]

   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3

 

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase     | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64   | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64   | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase     | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase   | 0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64 | 0

+

   ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI

   #  enumeration to complete before installing ACPI tables.

   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE

@@ -313,7 +321,10 @@
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

 !endif

   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

-  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

+  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf {

+    <LibraryClasses>

+      NULL|EmbeddedPkg/Library/NvVarStoreFormattedLib/NvVarStoreFormattedLib.inf

+  }

   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

   MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 1505709a29..6c1190dce3 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -86,11 +86,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000

 

-  #

-  # ARM Virtual Architectural Timer

-  #

-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0

-

   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE

   gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }

 

@@ -120,8 +115,6 @@
   gArmTokenSpaceGuid.PcdFdBaseAddress|0x0

   gArmTokenSpaceGuid.PcdFvBaseAddress|0x0

 

-  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE

-

 [PcdsDynamicDefault.common]

 

   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0

diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c
index 68b9d2bf05..96fbea3335 100644
--- a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c
+++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.c
@@ -662,7 +662,9 @@ GetStandardNameSpaceObject (
       //

       Status = DynamicPlatRepoGetObject (

                  PlatformRepo->DynamicPlatformRepo,

-                 CREATE_CM_ARM_OBJECT_ID (EArmObjPciConfigSpaceInfo),

+                 CREATE_CM_ARCH_COMMON_OBJECT_ID (

+                   EArchCommonObjPciConfigSpaceInfo

+                   ),

                  CM_NULL_TOKEN,

                  &CmObjDesc

                  );

@@ -723,7 +725,7 @@ GetStandardNameSpaceObject (
 }

 

 /**

-  Return an ARM namespace object.

+  Return an ArchCommon namespace object.

 

   @param [in]      This        Pointer to the Configuration Manager Protocol.

   @param [in]      CmObjectId  The Configuration Manager Object ID.

@@ -738,7 +740,7 @@ GetStandardNameSpaceObject (
 **/

 EFI_STATUS

 EFIAPI

-GetArmNameSpaceObject (

+GetArchCommonNameSpaceObject (

   IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  This,

   IN  CONST CM_OBJECT_ID                                  CmObjectId,

   IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,

@@ -761,7 +763,7 @@ GetArmNameSpaceObject (
   // First check among the static objects.

   //

   switch (GET_CM_OBJECT_ID (CmObjectId)) {

-    case EArmObjPowerManagementProfileInfo:

+    case EArchCommonObjPowerManagementProfileInfo:

       Status = HandleCmObject (

                  CmObjectId,

                  &PlatformRepo->PmProfileInfo,

@@ -771,6 +773,73 @@ GetArmNameSpaceObject (
                  );

       break;

 

+    default:

+      //

+      // No match found among the static objects.

+      // Check the dynamic objects.

+      //

+      Status = DynamicPlatRepoGetObject (

+                 PlatformRepo->DynamicPlatformRepo,

+                 CmObjectId,

+                 Token,

+                 CmObject

+                 );

+      break;

+  } // switch

+

+  if (Status == EFI_NOT_FOUND) {

+    DEBUG ((

+      DEBUG_INFO,

+      "INFO: CmObjectId " FMT_CM_OBJECT_ID ". Status = %r\n",

+      CmObjectId,

+      Status

+      ));

+  } else {

+    ASSERT_EFI_ERROR (Status);

+  }

+

+  return Status;

+}

+

+/**

+  Return an ARM namespace object.

+

+  @param [in]      This        Pointer to the Configuration Manager Protocol.

+  @param [in]      CmObjectId  The Configuration Manager Object ID.

+  @param [in]      Token       An optional token identifying the object. If

+                               unused this must be CM_NULL_TOKEN.

+  @param [in, out] CmObject    Pointer to the Configuration Manager Object

+                               descriptor describing the requested Object.

+

+  @retval EFI_SUCCESS           Success.

+  @retval EFI_INVALID_PARAMETER A parameter is invalid.

+  @retval EFI_NOT_FOUND         The required object information is not found.

+**/

+EFI_STATUS

+EFIAPI

+GetArmNameSpaceObject (

+  IN  CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL  *CONST  This,

+  IN  CONST CM_OBJECT_ID                                  CmObjectId,

+  IN  CONST CM_OBJECT_TOKEN                               Token OPTIONAL,

+  IN  OUT   CM_OBJ_DESCRIPTOR                     *CONST  CmObject

+  )

+{

+  EFI_STATUS                      Status;

+  EDKII_PLATFORM_REPOSITORY_INFO  *PlatformRepo;

+

+  if ((This == NULL) || (CmObject == NULL)) {

+    ASSERT (This != NULL);

+    ASSERT (CmObject != NULL);

+    return EFI_INVALID_PARAMETER;

+  }

+

+  Status       = EFI_NOT_FOUND;

+  PlatformRepo = This->PlatRepoInfo;

+

+  //

+  // First check among the static objects.

+  //

+  switch (GET_CM_OBJECT_ID (CmObjectId)) {

     case EArmObjItsGroup:

       Status = HandleCmObject (

                  CmObjectId,

@@ -929,6 +998,9 @@ ArmKvmtoolPlatformGetObject (
     case EObjNameSpaceStandard:

       Status = GetStandardNameSpaceObject (This, CmObjectId, Token, CmObject);

       break;

+    case EObjNameSpaceArchCommon:

+      Status = GetArchCommonNameSpaceObject (This, CmObjectId, Token, CmObject);

+      break;

     case EObjNameSpaceArm:

       Status = GetArmNameSpaceObject (This, CmObjectId, Token, CmObject);

       break;

diff --git a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h
index 3373948bc4..4fb12db73b 100644
--- a/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h
+++ b/ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManager.h
@@ -73,53 +73,53 @@ typedef struct PlatformRepositoryInfo {
   ///

   /// Configuration Manager Information.

   ///

-  CM_STD_OBJ_CONFIGURATION_MANAGER_INFO    CmInfo;

+  CM_STD_OBJ_CONFIGURATION_MANAGER_INFO           CmInfo;

 

   ///

   /// List of ACPI tables

   ///

-  CM_STD_OBJ_ACPI_TABLE_INFO               CmAcpiTableList[PLAT_ACPI_TABLE_COUNT];

+  CM_STD_OBJ_ACPI_TABLE_INFO                      CmAcpiTableList[PLAT_ACPI_TABLE_COUNT];

 

   ///

   /// Power management profile information

   ///

-  CM_ARM_POWER_MANAGEMENT_PROFILE_INFO     PmProfileInfo;

+  CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO    PmProfileInfo;

 

   ///

   /// ITS Group node

   ///

-  CM_ARM_ITS_GROUP_NODE                    ItsGroupInfo;

+  CM_ARM_ITS_GROUP_NODE                           ItsGroupInfo;

 

   ///

   /// ITS Identifier array

   ///

-  CM_ARM_ITS_IDENTIFIER                    ItsIdentifierArray[1];

+  CM_ARM_ITS_IDENTIFIER                           ItsIdentifierArray[1];

 

   ///

   /// PCI Root complex node

   ///

-  CM_ARM_ROOT_COMPLEX_NODE                 RootComplexInfo;

+  CM_ARM_ROOT_COMPLEX_NODE                        RootComplexInfo;

 

   ///

   /// Array of DeviceID mapping

   ///

-  CM_ARM_ID_MAPPING                        DeviceIdMapping[1];

+  CM_ARM_ID_MAPPING                               DeviceIdMapping[1];

 

   ///

   /// Dynamic platform repository.

   /// CmObj created by parsing the Kvmtool device tree are stored here.

   ///

-  DYNAMIC_PLATFORM_REPOSITORY_INFO         *DynamicPlatformRepo;

+  DYNAMIC_PLATFORM_REPOSITORY_INFO                *DynamicPlatformRepo;

 

   ///

   /// Base address of the FDT.

   ///

-  VOID                                     *FdtBase;

+  VOID                                            *FdtBase;

 

   ///

   /// A handle to the FDT HwInfoParser.

   ///

-  HW_INFO_PARSER_HANDLE                    FdtParserHandle;

+  HW_INFO_PARSER_HANDLE                           FdtParserHandle;

 } EDKII_PLATFORM_REPOSITORY_INFO;

 

 #endif // CONFIGURATION_MANAGER_H_

diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
deleted file mode 100644
index 1f27b7648d..0000000000
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/** @file

-  Support ResetSystem Runtime call using PSCI calls

-

-  Note: A similar library is implemented in

-  ArmPkg/Library/ArmPsciResetSystemLib. Similar issues might

-  exist in this implementation too.

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>

-  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#include <PiDxe.h>

-

-#include <Library/BaseLib.h>

-#include <Library/DebugLib.h>

-#include <Library/ResetSystemLib.h>

-#include <Library/ArmSmcLib.h>

-#include <Library/ArmHvcLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-

-#include <IndustryStandard/ArmStdSmc.h>

-

-#include <Protocol/FdtClient.h>

-

-STATIC UINT32  mArmPsciMethod;

-

-RETURN_STATUS

-EFIAPI

-ArmPsciResetSystemLibConstructor (

-  VOID

-  )

-{

-  EFI_STATUS           Status;

-  FDT_CLIENT_PROTOCOL  *FdtClient;

-  CONST VOID           *Prop;

-

-  Status = gBS->LocateProtocol (

-                  &gFdtClientProtocolGuid,

-                  NULL,

-                  (VOID **)&FdtClient

-                  );

-  ASSERT_EFI_ERROR (Status);

-

-  Status = FdtClient->FindCompatibleNodeProperty (

-                        FdtClient,

-                        "arm,psci-0.2",

-                        "method",

-                        &Prop,

-                        NULL

-                        );

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  if (AsciiStrnCmp (Prop, "hvc", 3) == 0) {

-    mArmPsciMethod = 1;

-  } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) {

-    mArmPsciMethod = 2;

-  } else {

-    DEBUG ((

-      DEBUG_ERROR,

-      "%a: Unknown PSCI method \"%a\"\n",

-      __func__,

-      Prop

-      ));

-    return EFI_NOT_FOUND;

-  }

-

-  return EFI_SUCCESS;

-}

-

-/**

-  This function causes a system-wide reset (cold reset), in which

-  all circuitry within the system returns to its initial state. This type of reset

-  is asynchronous to system operation and operates without regard to

-  cycle boundaries.

-

-  If this function returns, it means that the system does not support cold reset.

-**/

-VOID

-EFIAPI

-ResetCold (

-  VOID

-  )

-{

-  ARM_SMC_ARGS  ArmSmcArgs;

-  ARM_HVC_ARGS  ArmHvcArgs;

-

-  // Send a PSCI 0.2 SYSTEM_RESET command

-  ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;

-  ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_RESET;

-

-  switch (mArmPsciMethod) {

-    case 1:

-      ArmCallHvc (&ArmHvcArgs);

-      break;

-

-    case 2:

-      ArmCallSmc (&ArmSmcArgs);

-      break;

-

-    default:

-      DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__));

-  }

-}

-

-/**

-  This function causes a system-wide initialization (warm reset), in which all processors

-  are set to their initial state. Pending cycles are not corrupted.

-

-  If this function returns, it means that the system does not support warm reset.

-**/

-VOID

-EFIAPI

-ResetWarm (

-  VOID

-  )

-{

-  // Map a warm reset into a cold reset

-  ResetCold ();

-}

-

-/**

-  This function causes the system to enter a power state equivalent

-  to the ACPI G2/S5 or G3 states.

-

-  If this function returns, it means that the system does not support shutdown reset.

-**/

-VOID

-EFIAPI

-ResetShutdown (

-  VOID

-  )

-{

-  ARM_SMC_ARGS  ArmSmcArgs;

-  ARM_HVC_ARGS  ArmHvcArgs;

-

-  // Send a PSCI 0.2 SYSTEM_OFF command

-  ArmSmcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;

-  ArmHvcArgs.Arg0 = ARM_SMC_ID_PSCI_SYSTEM_OFF;

-

-  switch (mArmPsciMethod) {

-    case 1:

-      ArmCallHvc (&ArmHvcArgs);

-      break;

-

-    case 2:

-      ArmCallSmc (&ArmSmcArgs);

-      break;

-

-    default:

-      DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__));

-  }

-}

-

-/**

-  This function causes a systemwide reset. The exact type of the reset is

-  defined by the EFI_GUID that follows the Null-terminated Unicode string passed

-  into ResetData. If the platform does not recognize the EFI_GUID in ResetData

-  the platform must pick a supported reset type to perform.The platform may

-  optionally log the parameters from any non-normal reset that occurs.

-

-  @param[in]  DataSize   The size, in bytes, of ResetData.

-  @param[in]  ResetData  The data buffer starts with a Null-terminated string,

-                         followed by the EFI_GUID.

-**/

-VOID

-EFIAPI

-ResetPlatformSpecific (

-  IN UINTN  DataSize,

-  IN VOID   *ResetData

-  )

-{

-  // Map the platform specific reset as reboot

-  ResetCold ();

-}

-

-/**

-  The ResetSystem function resets the entire platform.

-

-  @param[in] ResetType      The type of reset to perform.

-  @param[in] ResetStatus    The status code for the reset.

-  @param[in] DataSize       The size, in bytes, of ResetData.

-  @param[in] ResetData      For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown

-                            the data buffer starts with a Null-terminated string, optionally

-                            followed by additional binary data. The string is a description

-                            that the caller may use to further indicate the reason for the

-                            system reset.

-**/

-VOID

-EFIAPI

-ResetSystem (

-  IN EFI_RESET_TYPE  ResetType,

-  IN EFI_STATUS      ResetStatus,

-  IN UINTN           DataSize,

-  IN VOID            *ResetData OPTIONAL

-  )

-{

-  switch (ResetType) {

-    case EfiResetWarm:

-      ResetWarm ();

-      break;

-

-    case EfiResetCold:

-      ResetCold ();

-      break;

-

-    case EfiResetShutdown:

-      ResetShutdown ();

-      return;

-

-    case EfiResetPlatformSpecific:

-      ResetPlatformSpecific (DataSize, ResetData);

-      return;

-

-    default:

-      return;

-  }

-}

diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
deleted file mode 100644
index 4fde5e443f..0000000000
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
+++ /dev/null
@@ -1,42 +0,0 @@
-#/** @file

-# Reset System lib using PSCI hypervisor or secure monitor calls

-#

-# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>

-# Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

-#

-#  SPDX-License-Identifier: BSD-2-Clause-Patent

-#

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = ArmVirtPsciResetSystemLib

-  FILE_GUID                      = c81d76ed-66fa-44a3-ac4a-f163120187a9

-  MODULE_TYPE                    = BASE

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = ResetSystemLib|DXE_DRIVER DXE_RUNTIME_DRIVER

-  CONSTRUCTOR                    = ArmPsciResetSystemLibConstructor

-

-[Sources]

-  ArmVirtPsciResetSystemLib.c

-

-[Packages]

-  ArmPkg/ArmPkg.dec

-  ArmVirtPkg/ArmVirtPkg.dec

-  EmbeddedPkg/EmbeddedPkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-  MdePkg/MdePkg.dec

-

-[LibraryClasses]

-  ArmSmcLib

-  ArmHvcLib

-  BaseLib

-  DebugLib

-  UefiBootServicesTableLib

-

-[Protocols]

-  gFdtClientProtocolGuid                                ## CONSUMES

-

-[Depex]

-  gFdtClientProtocolGuid

diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c
deleted file mode 100644
index dffc1fb979..0000000000
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/** @file

-  Reset System lib using PSCI hypervisor or secure monitor calls

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>

-  Copyright (c) 2014-2020, Linaro Ltd. All rights reserved.<BR>

-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>

-

-  SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-

-#include <PiPei.h>

-

-#include <libfdt.h>

-#include <Library/ArmHvcLib.h>

-#include <Library/ArmSmcLib.h>

-#include <Library/BaseLib.h>

-#include <Library/DebugLib.h>

-#include <Library/HobLib.h>

-#include <Library/ResetSystemLib.h>

-

-#include <IndustryStandard/ArmStdSmc.h>

-

-typedef enum {

-  PsciMethodUnknown,

-  PsciMethodSmc,

-  PsciMethodHvc,

-} PSCI_METHOD;

-

-STATIC

-PSCI_METHOD

-DiscoverPsciMethod (

-  VOID

-  )

-{

-  VOID         *DeviceTreeBase;

-  INT32        Node, Prev;

-  INT32        Len;

-  CONST CHAR8  *Compatible;

-  CONST CHAR8  *CompatibleItem;

-  CONST VOID   *Prop;

-

-  DeviceTreeBase = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress);

-  ASSERT (fdt_check_header (DeviceTreeBase) == 0);

-

-  //

-  // Enumerate all FDT nodes looking for the PSCI node and capture the method

-  //

-  for (Prev = 0; ; Prev = Node) {

-    Node = fdt_next_node (DeviceTreeBase, Prev, NULL);

-    if (Node < 0) {

-      break;

-    }

-

-    Compatible = fdt_getprop (DeviceTreeBase, Node, "compatible", &Len);

-    if (Compatible == NULL) {

-      continue;

-    }

-

-    //

-    // Iterate over the NULL-separated items in the compatible string

-    //

-    for (CompatibleItem = Compatible; CompatibleItem < Compatible + Len;

-         CompatibleItem += 1 + AsciiStrLen (CompatibleItem))

-    {

-      if (AsciiStrCmp (CompatibleItem, "arm,psci-0.2") != 0) {

-        continue;

-      }

-

-      Prop = fdt_getprop (DeviceTreeBase, Node, "method", NULL);

-      if (!Prop) {

-        DEBUG ((

-          DEBUG_ERROR,

-          "%a: Missing PSCI method property\n",

-          __func__

-          ));

-        return PsciMethodUnknown;

-      }

-

-      if (AsciiStrnCmp (Prop, "hvc", 3) == 0) {

-        return PsciMethodHvc;

-      } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) {

-        return PsciMethodSmc;

-      } else {

-        DEBUG ((

-          DEBUG_ERROR,

-          "%a: Unknown PSCI method \"%a\"\n",

-          __func__,

-          Prop

-          ));

-        return PsciMethodUnknown;

-      }

-    }

-  }

-

-  return PsciMethodUnknown;

-}

-

-STATIC

-VOID

-PerformPsciAction (

-  IN  UINTN  Arg0

-  )

-{

-  ARM_SMC_ARGS  ArmSmcArgs;

-  ARM_HVC_ARGS  ArmHvcArgs;

-

-  ArmSmcArgs.Arg0 = Arg0;

-  ArmHvcArgs.Arg0 = Arg0;

-

-  switch (DiscoverPsciMethod ()) {

-    case PsciMethodHvc:

-      ArmCallHvc (&ArmHvcArgs);

-      break;

-

-    case PsciMethodSmc:

-      ArmCallSmc (&ArmSmcArgs);

-      break;

-

-    default:

-      DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__));

-      ASSERT (FALSE);

-  }

-}

-

-/**

-  This function causes a system-wide reset (cold reset), in which

-  all circuitry within the system returns to its initial state. This type of reset

-  is asynchronous to system operation and operates without regard to

-  cycle boundaries.

-

-  If this function returns, it means that the system does not support cold reset.

-**/

-VOID

-EFIAPI

-ResetCold (

-  VOID

-  )

-{

-  // Send a PSCI 0.2 SYSTEM_RESET command

-  PerformPsciAction (ARM_SMC_ID_PSCI_SYSTEM_RESET);

-}

-

-/**

-  This function causes a system-wide initialization (warm reset), in which all processors

-  are set to their initial state. Pending cycles are not corrupted.

-

-  If this function returns, it means that the system does not support warm reset.

-**/

-VOID

-EFIAPI

-ResetWarm (

-  VOID

-  )

-{

-  // Map a warm reset into a cold reset

-  ResetCold ();

-}

-

-/**

-  This function causes the system to enter a power state equivalent

-  to the ACPI G2/S5 or G3 states.

-

-  If this function returns, it means that the system does not support shutdown reset.

-**/

-VOID

-EFIAPI

-ResetShutdown (

-  VOID

-  )

-{

-  // Send a PSCI 0.2 SYSTEM_OFF command

-  PerformPsciAction (ARM_SMC_ID_PSCI_SYSTEM_OFF);

-}

-

-/**

-  This function causes a systemwide reset. The exact type of the reset is

-  defined by the EFI_GUID that follows the Null-terminated Unicode string passed

-  into ResetData. If the platform does not recognize the EFI_GUID in ResetData

-  the platform must pick a supported reset type to perform.The platform may

-  optionally log the parameters from any non-normal reset that occurs.

-

-  @param[in]  DataSize   The size, in bytes, of ResetData.

-  @param[in]  ResetData  The data buffer starts with a Null-terminated string,

-                         followed by the EFI_GUID.

-**/

-VOID

-EFIAPI

-ResetPlatformSpecific (

-  IN UINTN  DataSize,

-  IN VOID   *ResetData

-  )

-{

-  // Map the platform specific reset as reboot

-  ResetCold ();

-}

-

-/**

-  The ResetSystem function resets the entire platform.

-

-  @param[in] ResetType      The type of reset to perform.

-  @param[in] ResetStatus    The status code for the reset.

-  @param[in] DataSize       The size, in bytes, of ResetData.

-  @param[in] ResetData      For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown

-                            the data buffer starts with a Null-terminated string, optionally

-                            followed by additional binary data. The string is a description

-                            that the caller may use to further indicate the reason for the

-                            system reset.

-**/

-VOID

-EFIAPI

-ResetSystem (

-  IN EFI_RESET_TYPE  ResetType,

-  IN EFI_STATUS      ResetStatus,

-  IN UINTN           DataSize,

-  IN VOID            *ResetData OPTIONAL

-  )

-{

-  switch (ResetType) {

-    case EfiResetWarm:

-      ResetWarm ();

-      break;

-

-    case EfiResetCold:

-      ResetCold ();

-      break;

-

-    case EfiResetShutdown:

-      ResetShutdown ();

-      return;

-

-    case EfiResetPlatformSpecific:

-      ResetPlatformSpecific (DataSize, ResetData);

-      return;

-

-    default:

-      return;

-  }

-}

diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf
deleted file mode 100644
index 79217d296d..0000000000
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.inf
+++ /dev/null
@@ -1,40 +0,0 @@
-#/** @file

-# Reset System lib using PSCI hypervisor or secure monitor calls

-#

-# Copyright (c) 2008, Apple Inc. All rights reserved.<BR>

-# Copyright (c) 2014-2020, Linaro Ltd. All rights reserved.<BR>

-#

-#  SPDX-License-Identifier: BSD-2-Clause-Patent

-#

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 1.27

-  BASE_NAME                      = ArmVirtPsciResetSystemPeiLib

-  FILE_GUID                      = 551cfb98-c185-41a3-86bf-8cdb7e2a530c

-  MODULE_TYPE                    = BASE

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = ResetSystemLib|PEIM

-

-[Sources]

-  ArmVirtPsciResetSystemPeiLib.c

-

-[Packages]

-  ArmPkg/ArmPkg.dec

-  ArmVirtPkg/ArmVirtPkg.dec

-  EmbeddedPkg/EmbeddedPkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-  MdePkg/MdePkg.dec

-  OvmfPkg/OvmfPkg.dec

-

-[LibraryClasses]

-  ArmSmcLib

-  ArmHvcLib

-  BaseLib

-  DebugLib

-  FdtLib

-  HobLib

-

-[Pcd]

-  gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress

diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.c b/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.c
new file mode 100644
index 0000000000..1c8b18d5e5
--- /dev/null
+++ b/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.c
@@ -0,0 +1,95 @@
+/** @file

+  Arm Monitor Library that chooses the conduit based on the PSCI node in the

+  device tree provided by QEMU

+

+  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>

+  Copyright (c) 2024, Google LLC. All rights reserved.<BR>

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+

+**/

+

+#include <PiDxe.h>

+

+#include <Library/BaseLib.h>

+#include <Library/DebugLib.h>

+#include <Library/ArmHvcLib.h>

+#include <Library/ArmMonitorLib.h>

+#include <Library/ArmSmcLib.h>

+#include <Library/UefiBootServicesTableLib.h>

+

+#include <Protocol/FdtClient.h>

+

+STATIC UINT32  mArmSmcccMethod;

+

+/** Library constructor.

+

+  Assign the global variable mArmSmcccMethod based on the PSCI node in the

+  device tree.

+**/

+RETURN_STATUS

+EFIAPI

+ArmVirtQemuMonitorLibConstructor (

+  VOID

+  )

+{

+  EFI_STATUS           Status;

+  FDT_CLIENT_PROTOCOL  *FdtClient;

+  CONST VOID           *Prop;

+

+  Status = gBS->LocateProtocol (

+                  &gFdtClientProtocolGuid,

+                  NULL,

+                  (VOID **)&FdtClient

+                  );

+  ASSERT_EFI_ERROR (Status);

+

+  Status = FdtClient->FindCompatibleNodeProperty (

+                        FdtClient,

+                        "arm,psci-0.2",

+                        "method",

+                        &Prop,

+                        NULL

+                        );

+  if (EFI_ERROR (Status)) {

+    return Status;

+  }

+

+  if (AsciiStrnCmp (Prop, "hvc", 3) == 0) {

+    mArmSmcccMethod = 1;

+  } else if (AsciiStrnCmp (Prop, "smc", 3) == 0) {

+    mArmSmcccMethod = 2;

+  } else {

+    DEBUG ((

+      DEBUG_ERROR,

+      "%a: Unknown SMCCC method \"%a\"\n",

+      __func__,

+      Prop

+      ));

+    return EFI_NOT_FOUND;

+  }

+

+  return EFI_SUCCESS;

+}

+

+/** Monitor call.

+

+  An HyperVisor Call (HVC) or System Monitor Call (SMC) will be issued

+  depending on the default conduit.

+

+  @param [in,out]  Args    Arguments for the HVC/SMC.

+**/

+VOID

+EFIAPI

+ArmMonitorCall (

+  IN OUT ARM_MONITOR_ARGS  *Args

+  )

+{

+  if (mArmSmcccMethod == 1) {

+    ArmCallHvc ((ARM_HVC_ARGS *)Args);

+  } else if (mArmSmcccMethod == 2) {

+    ArmCallSmc ((ARM_SMC_ARGS *)Args);

+  } else {

+    ASSERT ((mArmSmcccMethod == 1) || (mArmSmcccMethod == 2));

+  }

+}

diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf b/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
new file mode 100644
index 0000000000..e43ba215c2
--- /dev/null
+++ b/ArmVirtPkg/Library/ArmVirtQemuMonitorLib/ArmVirtQemuMonitorLib.inf
@@ -0,0 +1,39 @@
+## @file

+#  Arm Monitor Library that chooses the conduit based on the PSCI node in the

+#  device tree provided by QEMU

+#

+#  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>

+#  Copyright (c) 2024, Google LLC. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+[Defines]

+  INF_VERSION                    = 1.29

+  BASE_NAME                      = ArmVirtQemuMonitorLib

+  FILE_GUID                      = 09f50ee5-2aa2-42b9-a2a0-090faeefed2b

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = ArmMonitorLib|DXE_DRIVER DXE_RUNTIME_DRIVER

+  CONSTRUCTOR                    = ArmVirtQemuMonitorLibConstructor

+

+[Sources]

+  ArmVirtQemuMonitorLib.c

+

+[Packages]

+  ArmPkg/ArmPkg.dec

+  EmbeddedPkg/EmbeddedPkg.dec

+  MdePkg/MdePkg.dec

+

+[LibraryClasses]

+  ArmHvcLib

+  ArmSmcLib

+  BaseLib

+  DebugLib

+  UefiBootServicesTableLib

+

+[Protocols]

+  gFdtClientProtocolGuid                                ## CONSUMES

+

+[Depex]

+  gFdtClientProtocolGuid

diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c b/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c
new file mode 100644
index 0000000000..aa8d5d6082
--- /dev/null
+++ b/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.c
@@ -0,0 +1,128 @@
+/** @file

+  Arm Monitor Library that chooses the conduit based on the PSCI node in the

+  device tree provided by QEMU.

+

+  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>

+  Copyright (c) 2024, Google LLC. All rights reserved.<BR>

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+

+**/

+

+#include <Base.h>

+

+#include <Library/ArmHvcLib.h>

+#include <Library/ArmMonitorLib.h>

+#include <Library/ArmSmcLib.h>

+#include <Library/BaseLib.h>

+#include <Library/DebugLib.h>

+#include <Library/FdtLib.h>

+

+typedef enum {

+  SmcccConduitUnknown,

+  SmcccConduitSmc,

+  SmcccConduitHvc,

+} SMCCC_CONDUIT;

+

+/**

+  Discover the SMCCC conduit by parsing the PSCI device tree node.

+

+  @return the discovered SMCCC conduit

+**/

+STATIC

+SMCCC_CONDUIT

+DiscoverSmcccConduit (

+  VOID

+  )

+{

+  VOID                *DeviceTreeBase;

+  INT32               Node, Prev;

+  INT32               Len;

+  CONST FDT_PROPERTY  *Compatible;

+  CONST CHAR8         *CompatibleItem;

+  CONST FDT_PROPERTY  *Prop;

+

+  DeviceTreeBase = (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeInitialBaseAddress);

+  ASSERT (FdtCheckHeader (DeviceTreeBase) == 0);

+

+  //

+  // Enumerate all FDT nodes looking for the PSCI node and capture the conduit

+  //

+  for (Prev = 0; ; Prev = Node) {

+    Node = FdtNextNode (DeviceTreeBase, Prev, NULL);

+    if (Node < 0) {

+      break;

+    }

+

+    Compatible = FdtGetProperty (DeviceTreeBase, Node, "compatible", &Len);

+    if (Compatible == NULL) {

+      continue;

+    }

+

+    //

+    // Iterate over the NULL-separated items in the compatible string

+    //

+    for (CompatibleItem = Compatible->Data; CompatibleItem < Compatible->Data + Len;

+         CompatibleItem += 1 + AsciiStrLen (CompatibleItem))

+    {

+      if (AsciiStrCmp (CompatibleItem, "arm,psci-0.2") != 0) {

+        continue;

+      }

+

+      Prop = FdtGetProperty (DeviceTreeBase, Node, "method", NULL);

+      if (Prop == NULL) {

+        DEBUG ((

+          DEBUG_ERROR,

+          "%a: Missing PSCI method property\n",

+          __func__

+          ));

+

+        return SmcccConduitUnknown;

+      }

+

+      if (AsciiStrnCmp (Prop->Data, "hvc", 3) == 0) {

+        return SmcccConduitHvc;

+      } else if (AsciiStrnCmp (Prop->Data, "smc", 3) == 0) {

+        return SmcccConduitSmc;

+      } else {

+        DEBUG ((

+          DEBUG_ERROR,

+          "%a: Unknown PSCI method \"%a\"\n",

+          __func__,

+          Prop

+          ));

+

+        return SmcccConduitUnknown;

+      }

+    }

+  }

+

+  return SmcccConduitUnknown;

+}

+

+/** Monitor call.

+

+  An HyperVisor Call (HVC) or System Monitor Call (SMC) will be issued

+  depending on the default conduit.

+

+  @param [in,out]  Args    Arguments for the HVC/SMC.

+**/

+VOID

+EFIAPI

+ArmMonitorCall (

+  IN OUT ARM_MONITOR_ARGS  *Args

+  )

+{

+  switch (DiscoverSmcccConduit ()) {

+    case SmcccConduitHvc:

+      ArmCallHvc ((ARM_HVC_ARGS *)Args);

+      break;

+

+    case SmcccConduitSmc:

+      ArmCallSmc ((ARM_SMC_ARGS *)Args);

+      break;

+

+    default:

+      ASSERT (FALSE);

+  }

+}

diff --git a/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf b/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf
new file mode 100644
index 0000000000..cd850f342d
--- /dev/null
+++ b/ArmVirtPkg/Library/ArmVirtQemuMonitorPeiLib/ArmVirtQemuMonitorPeiLib.inf
@@ -0,0 +1,35 @@
+## @file

+#  Arm Monitor Library that chooses the conduit based on the PSCI node in the

+#  device tree provided by QEMU.

+#

+#  Copyright (c) 2022, Arm Limited. All rights reserved.<BR>

+#  Copyright (c) 2024, Google LLC. All rights reserved.<BR>

+#

+#  SPDX-License-Identifier: BSD-2-Clause-Patent

+##

+

+[Defines]

+  INF_VERSION                    = 1.29

+  BASE_NAME                      = ArmVirtQemuMonitorPeiLib

+  FILE_GUID                      = c610e0dc-dd7a-47c8-8fea-26c4710709ff

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = ArmMonitorLib|PEIM

+

+[Sources]

+  ArmVirtQemuMonitorPeiLib.c

+

+[Packages]

+  ArmPkg/ArmPkg.dec

+  MdePkg/MdePkg.dec

+  OvmfPkg/OvmfPkg.dec

+

+[LibraryClasses]

+  ArmHvcLib

+  ArmSmcLib

+  BaseLib

+  DebugLib

+  FdtLib

+

+[Pcd]

+  gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress

diff --git a/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLib.c b/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLib.c
index 0da84ba8d2..83d52e98f5 100644
--- a/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLib.c
+++ b/ArmVirtPkg/Library/DebugLibFdtPL011Uart/DebugLib.c
@@ -182,8 +182,8 @@ DebugBPrint (
 

   Print a message of the form "ASSERT <FileName>(<LineNumber>): <Description>\n"

   to the debug output device.  If DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED bit of

-  PcdDebugProperyMask is set then CpuBreakpoint() is called. Otherwise, if

-  DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugProperyMask is set then

+  PcdDebugPropertyMask is set then CpuBreakpoint() is called. Otherwise, if

+  DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED bit of PcdDebugPropertyMask is set then

   CpuDeadLoop() is called.  If neither of these bits are set, then this function

   returns immediately after the message is printed to the debug output device.

   DebugAssert() must actively prevent recursion.  If DebugAssert() is called while

@@ -264,10 +264,10 @@ DebugClearMemory (
   Returns TRUE if ASSERT() macros are enabled.

 

   This function returns TRUE if the DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of

-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.

+  PcdDebugPropertyMask is set.  Otherwise FALSE is returned.

 

-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is set.

-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugProperyMask is clear.

+  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugPropertyMask is set.

+  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED bit of PcdDebugPropertyMask is clear.

 

 **/

 BOOLEAN

@@ -283,10 +283,10 @@ DebugAssertEnabled (
   Returns TRUE if DEBUG() macros are enabled.

 

   This function returns TRUE if the DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of

-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.

+  PcdDebugPropertyMask is set.  Otherwise FALSE is returned.

 

-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is set.

-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugProperyMask is clear.

+  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugPropertyMask is set.

+  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_PRINT_ENABLED bit of PcdDebugPropertyMask is clear.

 

 **/

 BOOLEAN

@@ -302,10 +302,10 @@ DebugPrintEnabled (
   Returns TRUE if DEBUG_CODE() macros are enabled.

 

   This function returns TRUE if the DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of

-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.

+  PcdDebugPropertyMask is set.  Otherwise FALSE is returned.

 

-  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is set.

-  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugProperyMask is clear.

+  @retval  TRUE    The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugPropertyMask is set.

+  @retval  FALSE   The DEBUG_PROPERTY_DEBUG_CODE_ENABLED bit of PcdDebugPropertyMask is clear.

 

 **/

 BOOLEAN

@@ -321,10 +321,10 @@ DebugCodeEnabled (
   Returns TRUE if DEBUG_CLEAR_MEMORY() macro is enabled.

 

   This function returns TRUE if the DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of

-  PcdDebugProperyMask is set.  Otherwise FALSE is returned.

+  PcdDebugPropertyMask is set.  Otherwise FALSE is returned.

 

-  @retval  TRUE    The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is set.

-  @retval  FALSE   The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugProperyMask is clear.

+  @retval  TRUE    The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugPropertyMask is set.

+  @retval  FALSE   The DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED bit of PcdDebugPropertyMask is clear.

 

 **/

 BOOLEAN

diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c
index e8d3576a71..2afb56ccf8 100644
--- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c
+++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c
@@ -44,7 +44,7 @@ KvmtoolRtcMapMemory (
                   EfiGcdMemoryTypeMemoryMappedIo,

                   RtcPageBase,

                   EFI_PAGE_SIZE,

-                  EFI_MEMORY_UC | EFI_MEMORY_RUNTIME

+                  EFI_MEMORY_UC | EFI_MEMORY_RUNTIME | EFI_MEMORY_XP

                   );

   if (EFI_ERROR (Status)) {

     DEBUG ((

@@ -80,7 +80,7 @@ KvmtoolRtcMapMemory (
   Status = gDS->SetMemorySpaceAttributes (

                   RtcPageBase,

                   EFI_PAGE_SIZE,

-                  EFI_MEMORY_UC | EFI_MEMORY_RUNTIME

+                  EFI_MEMORY_UC | EFI_MEMORY_RUNTIME | EFI_MEMORY_XP

                   );

   if (EFI_ERROR (Status)) {

     DEBUG ((

diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c
deleted file mode 100644
index d0fa7e5046..0000000000
--- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/** @file

-

- Copyright (c) 2014-2018, Linaro Ltd. All rights reserved.<BR>

-

- SPDX-License-Identifier: BSD-2-Clause-Patent

-

- **/

-

-#include <Library/BaseLib.h>

-#include <Library/DebugLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/VirtNorFlashPlatformLib.h>

-

-#include <Protocol/FdtClient.h>

-

-#define QEMU_NOR_BLOCK_SIZE  SIZE_256KB

-

-#define MAX_FLASH_BANKS  4

-

-EFI_STATUS

-VirtNorFlashPlatformInitialization (

-  VOID

-  )

-{

-  return EFI_SUCCESS;

-}

-

-STATIC VIRT_NOR_FLASH_DESCRIPTION  mNorFlashDevices[MAX_FLASH_BANKS];

-

-EFI_STATUS

-VirtNorFlashPlatformGetDevices (

-  OUT VIRT_NOR_FLASH_DESCRIPTION  **NorFlashDescriptions,

-  OUT UINT32                      *Count

-  )

-{

-  FDT_CLIENT_PROTOCOL  *FdtClient;

-  INT32                Node;

-  EFI_STATUS           Status;

-  EFI_STATUS           FindNodeStatus;

-  CONST UINT32         *Reg;

-  UINT32               PropSize;

-  UINT32               Num;

-  UINT64               Base;

-  UINT64               Size;

-

-  Status = gBS->LocateProtocol (

-                  &gFdtClientProtocolGuid,

-                  NULL,

-                  (VOID **)&FdtClient

-                  );

-  ASSERT_EFI_ERROR (Status);

-

-  Num = 0;

-  for (FindNodeStatus = FdtClient->FindCompatibleNode (

-                                     FdtClient,

-                                     "cfi-flash",

-                                     &Node

-                                     );

-       !EFI_ERROR (FindNodeStatus) && Num < MAX_FLASH_BANKS;

-       FindNodeStatus = FdtClient->FindNextCompatibleNode (

-                                     FdtClient,

-                                     "cfi-flash",

-                                     Node,

-                                     &Node

-                                     ))

-  {

-    Status = FdtClient->GetNodeProperty (

-                          FdtClient,

-                          Node,

-                          "reg",

-                          (CONST VOID **)&Reg,

-                          &PropSize

-                          );

-    if (EFI_ERROR (Status)) {

-      DEBUG ((

-        DEBUG_ERROR,

-        "%a: GetNodeProperty () failed (Status == %r)\n",

-        __func__,

-        Status

-        ));

-      continue;

-    }

-

-    ASSERT ((PropSize % (4 * sizeof (UINT32))) == 0);

-

-    while (PropSize >= (4 * sizeof (UINT32)) && Num < MAX_FLASH_BANKS) {

-      Base = SwapBytes64 (ReadUnaligned64 ((VOID *)&Reg[0]));

-      Size = SwapBytes64 (ReadUnaligned64 ((VOID *)&Reg[2]));

-      Reg += 4;

-

-      PropSize -= 4 * sizeof (UINT32);

-

-      //

-      // Disregard any flash devices that overlap with the primary FV.

-      // The firmware is not updatable from inside the guest anyway.

-      //

-      if ((PcdGet64 (PcdFvBaseAddress) + PcdGet32 (PcdFvSize) > Base) &&

-          ((Base + Size) > PcdGet64 (PcdFvBaseAddress)))

-      {

-        continue;

-      }

-

-      mNorFlashDevices[Num].DeviceBaseAddress = (UINTN)Base;

-      mNorFlashDevices[Num].RegionBaseAddress = (UINTN)Base;

-      mNorFlashDevices[Num].Size              = (UINTN)Size;

-      mNorFlashDevices[Num].BlockSize         = QEMU_NOR_BLOCK_SIZE;

-      Num++;

-    }

-

-    //

-    // UEFI takes ownership of the NOR flash, and exposes its functionality

-    // through the UEFI Runtime Services GetVariable, SetVariable, etc. This

-    // means we need to disable it in the device tree to prevent the OS from

-    // attaching its device driver as well.

-    // Note that this also hides other flash banks, but the only other flash

-    // bank we expect to encounter is the one that carries the UEFI executable

-    // code, which is not intended to be guest updatable, and is usually backed

-    // in a readonly manner by QEMU anyway.

-    //

-    Status = FdtClient->SetNodeProperty (

-                          FdtClient,

-                          Node,

-                          "status",

-                          "disabled",

-                          sizeof ("disabled")

-                          );

-    if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_WARN, "Failed to set NOR flash status to 'disabled'\n"));

-    }

-  }

-

-  *NorFlashDescriptions = mNorFlashDevices;

-  *Count                = Num;

-

-  return EFI_SUCCESS;

-}

diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
deleted file mode 100644
index a6b5865be9..0000000000
--- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
+++ /dev/null
@@ -1,42 +0,0 @@
-#/** @file

-#

-#  Component description file for NorFlashQemuLib module

-#

-#  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>

-#

-#  SPDX-License-Identifier: BSD-2-Clause-Patent

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = NorFlashQemuLib

-  FILE_GUID                      = 339B7829-4C5F-4EFC-B2DD-5050E530DECE

-  MODULE_TYPE                    = DXE_DRIVER

-  VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = VirtNorFlashPlatformLib

-

-[Sources.common]

-  NorFlashQemuLib.c

-

-[Packages]

-  MdePkg/MdePkg.dec

-  ArmPkg/ArmPkg.dec

-  ArmVirtPkg/ArmVirtPkg.dec

-  EmbeddedPkg/EmbeddedPkg.dec

-  OvmfPkg/OvmfPkg.dec

-

-[LibraryClasses]

-  BaseLib

-  DebugLib

-  UefiBootServicesTableLib

-

-[Protocols]

-  gFdtClientProtocolGuid          ## CONSUMES

-

-[Depex]

-  gFdtClientProtocolGuid

-

-[Pcd]

-  gArmTokenSpaceGuid.PcdFvBaseAddress

-  gArmTokenSpaceGuid.PcdFvSize

diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
index b8e9208301..7ab4aa2d6b 100644
--- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
+++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c
@@ -18,8 +18,6 @@
 #include <Library/FdtSerialPortAddressLib.h>

 #include <libfdt.h>

 

-#include <Chipset/AArch64.h>

-

 #include <Guid/EarlyPL011BaseAddress.h>

 #include <Guid/FdtHob.h>

 

@@ -226,17 +224,5 @@ PlatformPeim (
 

   BuildFvHob (PcdGet64 (PcdFvBaseAddress), PcdGet32 (PcdFvSize));

 

- #ifdef MDE_CPU_AARCH64

-  //

-  // Set the SMCCC conduit to SMC if executing at EL2, which is typically the

-  // exception level that services HVCs rather than the one that invokes them.

-  //

-  if (ArmReadCurrentEL () == AARCH64_EL2) {

-    Status = PcdSetBoolS (PcdMonitorConduitHvc, FALSE);

-    ASSERT_EFI_ERROR (Status);

-  }

-

- #endif

-

   return EFI_SUCCESS;

 }

diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
index a38b89c103..e9a34b6e2e 100644
--- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
+++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.inf
@@ -45,7 +45,6 @@
 

 [Pcd]

   gArmTokenSpaceGuid.PcdFvBaseAddress

-  gArmTokenSpaceGuid.PcdMonitorConduitHvc

   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress             ## SOMETIMES_PRODUCES

   gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress

 

diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c
index 62fa62e5f0..d435d72598 100644
--- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c
+++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c
@@ -27,7 +27,7 @@
 #define MACH_VIRT_PERIPH_SIZE  SIZE_128MB

 

 /**

-  Default library constructur that obtains the memory size from a PCD.

+  Default library constructor that obtains the memory size from a PCD.

 

   @return  Always returns RETURN_SUCCESS

 

diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
index 76c3c5d3c8..da957cfaff 100644
--- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
+++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
@@ -38,11 +38,13 @@
 [Guids]

   gArmVirtSystemMemorySizeGuid

 

+[Pcd]

+  gArmTokenSpaceGuid.PcdSystemMemorySize

+

 [FixedPcd]

   gArmTokenSpaceGuid.PcdFdBaseAddress

   gArmTokenSpaceGuid.PcdFvBaseAddress

   gArmTokenSpaceGuid.PcdSystemMemoryBase

-  gArmTokenSpaceGuid.PcdSystemMemorySize

   gArmTokenSpaceGuid.PcdFdSize

   gArmTokenSpaceGuid.PcdFvSize

   gUefiOvmfPkgTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress

diff --git a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
index 9cab88ca08..a7f53132c7 100644
--- a/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
+++ b/ArmVirtPkg/PrePi/AArch64/ArchPrePi.c
@@ -8,18 +8,13 @@
 

 #include "PrePi.h"

 

-#include <Chipset/AArch64.h>

+#include <AArch64/AArch64.h>

 

 VOID

 ArchInitialize (

   VOID

   )

 {

-  // Enable Floating Point

-  if (FixedPcdGet32 (PcdVFPEnabled)) {

-    ArmEnableVFP ();

-  }

-

   if (ArmReadCurrentEL () == AARCH64_EL2) {

     // Trap General Exceptions. All exceptions that would be routed to EL1 are routed to EL2

     ArmWriteHcr (ARM_HCR_TGE);

diff --git a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
index 01623b6b35..fc06c28daa 100644
--- a/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
+++ b/ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
@@ -9,6 +9,23 @@
 #include <AsmMacroIoLibV8.h>

 

 ASM_FUNC(_ModuleEntryPoint)

+  //

+  // If we are booting from RAM using the Linux kernel boot protocol, x0 will

+  // point to the DTB image in memory. Otherwise, use the default value defined

+  // by the platform.

+  //

+  cbnz  x0, 0f

+  ldr   x0, PcdGet64 (PcdDeviceTreeInitialBaseAddress)

+

+0:mov   x28, x0             // preserve DTB pointer

+  mov   x27, x1             // preserve base of image pointer

+

+#if (FixedPcdGet32 (PcdVFPEnabled))

+  // Enable Floating Point. This needs to be done before entering C code, which

+  // may use FP/SIMD registers.

+  bl    ArmEnableVFP

+#endif

+

   bl    ASM_PFX(DiscoverDramFromDt)

 

   // Get ID of this CPU in Multicore system

@@ -95,28 +112,18 @@ _NeverReturn:
 

 // VOID

 // DiscoverDramFromDt (

-//   VOID   *DeviceTreeBaseAddress,   // passed by loader in x0

-//   VOID   *ImageBase                // passed by FDF trampoline in x1

+//   VOID   *DeviceTreeBaseAddress,   // passed by loader in x0, preserved in x28

+//   VOID   *ImageBase                // passed by FDF trampoline in x1, preserved in x27

 //   );

 ASM_PFX(DiscoverDramFromDt):

-  //

-  // If we are booting from RAM using the Linux kernel boot protocol, x0 will

-  // point to the DTB image in memory. Otherwise, use the default value defined

-  // by the platform.

-  //

-  cbnz  x0, 0f

-  ldr   x0, PcdGet64 (PcdDeviceTreeInitialBaseAddress)

-

-0:mov   x29, x30            // preserve LR

-  mov   x28, x0             // preserve DTB pointer

-  mov   x27, x1             // preserve base of image pointer

+  mov   x29, x30            // preserve LR

 

   //

-  // The base of the runtime image has been preserved in x1. Check whether

+  // The base of the runtime image has been preserved in x27. Check whether

   // the expected magic number can be found in the header.

   //

   ldr   w8, .LArm64LinuxMagic

-  ldr   w9, [x1, #0x38]

+  ldr   w9, [x27, #0x38]

   cmp   w8, w9

   bne   .Lout

 

@@ -132,8 +139,8 @@ ASM_PFX(DiscoverDramFromDt):
   ldr   x6, [x8]

   ldr   x7, [x9]

   sub   x7, x7, x6

-  add   x7, x7, x1

-  str   x1, [x8]

+  add   x7, x7, x27

+  str   x27, [x8]

   str   x7, [x9]

 

   //

diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
index 578ee37e74..6ac210760f 100755
--- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
+++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf
@@ -56,15 +56,11 @@
   MemoryInitPeiLib

   CacheMaintenanceLib

 

-[Ppis]

-  gArmMpCoreInfoPpiGuid

-

 [Guids]

   gArmMpCoreInfoGuid

 

 [FeaturePcd]

   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob

-  gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores

 

 [FixedPcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString

@@ -75,7 +71,6 @@
   gArmTokenSpaceGuid.PcdFvSize

 

   gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize

-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize

 

   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize

 

diff --git a/ArmVirtPkg/PrePi/PrePi.c b/ArmVirtPkg/PrePi/PrePi.c
index f27e0ad3d2..9dbb5af942 100755
--- a/ArmVirtPkg/PrePi/PrePi.c
+++ b/ArmVirtPkg/PrePi/PrePi.c
@@ -109,8 +109,6 @@ CEntryPoint (
   UINT64  StartTimeStamp;

 

   if (PerformanceMeasurementEnabled ()) {

-    // Initialize the Timer Library to setup the Timer HW controller

-    TimerConstructor ();

     // We cannot call yet the PerformanceLib because the HOB List has not been initialized

     StartTimeStamp = GetPerformanceCounter ();

   } else {

diff --git a/ArmVirtPkg/PrePi/PrePi.h b/ArmVirtPkg/PrePi/PrePi.h
index 4bb9791e40..c00899b338 100644
--- a/ArmVirtPkg/PrePi/PrePi.h
+++ b/ArmVirtPkg/PrePi/PrePi.h
@@ -22,12 +22,6 @@
 

 #define SerialPrint(txt)  SerialPortWrite (txt, AsciiStrLen(txt)+1);

 

-RETURN_STATUS

-EFIAPI

-TimerConstructor (

-  VOID

-  );

-

 VOID

 PrePiMain (

   IN  UINTN   UefiMemoryBase,

diff --git a/ArmVirtPkg/VarStore.fdf.inc b/ArmVirtPkg/VarStore.fdf.inc
index b4afaf12b6..1f035a132e 100644
--- a/ArmVirtPkg/VarStore.fdf.inc
+++ b/ArmVirtPkg/VarStore.fdf.inc
@@ -10,7 +10,7 @@
 ##

 

 [FD.QEMU_VARS]

-BaseAddress   = 0x04000000

+BaseAddress   = 0x00000000

 Size          = 0xc0000

 ErasePolarity = 1

 BlockSize     = 0x40000

@@ -18,7 +18,6 @@ NumBlocks     = 3
 

 

 0x00000000|0x00040000

-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

 #NV_VARIABLE_STORE

 DATA = {

   ## This is the EFI_FIRMWARE_VOLUME_HEADER

@@ -57,7 +56,6 @@ DATA = {
 

 

 0x00040000|0x00040000

-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

 #NV_FTW_WORKING

 DATA = {

   # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =

@@ -71,5 +69,4 @@ DATA = {
 }

 

 0x00080000|0x00040000

-gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

 #NV_FTW_SPARE