UefiCpuPkg: Fix SMM code hangs when InitPaging

[mirror_edk2.git] / ArmVirtPkg / ArmVirtKvmTool.dsc

diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 3bd1cc72a1eb856ad5b48e01915e58f1ee216878..d0afe1b49e250c554313c2077b89650d6f6d67cb 100644 (file)
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -1,7 +1,7 @@
 #  @file\r
 #  Workspace file for KVMTool virtual platform.\r
 #\r
-#  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2018 - 2022, ARM Limited. All rights reserved.\r
 #\r
 #  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
@@ -27,8 +27,15 @@
   SKUID_IDENTIFIER               = DEFAULT\r
   FLASH_DEFINITION               = ArmVirtPkg/ArmVirtKvmTool.fdf\r
 \r
+[Defines.AARCH64]\r
+  DEFINE ACPIVIEW_ENABLE         = TRUE\r
+\r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
+!if $(ARCH) == AARCH64\r
+!include DynamicTablesPkg/DynamicTables.dsc.inc\r
+!endif\r
+\r
 !include MdePkg/MdeLibs.dsc.inc\r
 \r
 [LibraryClasses.common]\r
@@ -43,7 +50,7 @@
   ArmVirtMemInfoLib|ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.inf\r
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
-  NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf\r
+  VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf\r
 \r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
 \r
@@ -57,9 +64,9 @@
 \r
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf\r
 \r
-  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
-  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
   PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf\r
 \r
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf\r
@@ -71,6 +78,12 @@
   PlatformHookLib|ArmVirtPkg/Library/Fdt16550SerialPortHookLib/Fdt16550SerialPortHookLib.inf\r
   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf\r
 \r
+  HwInfoParserLib|DynamicTablesPkg/Library/FdtHwInfoParserLib/FdtHwInfoParserLib.inf\r
+  DynamicPlatRepoLib|DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf\r
+\r
+  ArmMonitorLib|ArmPkg/Library/ArmMonitorLib/ArmMonitorLib.inf\r
+  ArmTrngLib|ArmPkg/Library/ArmTrngLib/ArmTrngLib.inf\r
+\r
 [LibraryClasses.common.SEC, LibraryClasses.common.PEI_CORE, LibraryClasses.common.PEIM]\r
   PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf\r
   PlatformHookLib|ArmVirtPkg/Library/Fdt16550SerialPortHookLib/EarlyFdt16550SerialPortHookLib.inf\r
@@ -102,6 +115,8 @@
   # Use MMIO for accessing RTC controller registers.\r
   gPcAtChipsetPkgTokenSpaceGuid.PcdRtcUseMmio|TRUE\r
 \r
+  gArmTokenSpaceGuid.PcdMonitorConduitHvc|TRUE\r
+\r
 [PcdsFixedAtBuild.common]\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000000F\r
 \r
@@ -160,9 +175,10 @@
 \r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x0\r
 \r
-[PcdsDynamicDefault.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
+[PcdsDynamicHii]\r
+  gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|5\r
 \r
+[PcdsDynamicDefault.common]\r
   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0\r
   gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0\r
   gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0\r
@@ -184,7 +200,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0\r
 \r
   #\r
   # Set video resolution for boot options and for text setup.\r
@@ -195,9 +211,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoHorizontalResolution|640\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetupVideoVerticalResolution|480\r
 \r
-  ## Force DTB\r
-  gArmVirtTokenSpaceGuid.PcdForceNoAcpi|TRUE\r
-\r
   # Setup Flash storage variables\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x40000\r
@@ -283,7 +296,11 @@
       NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
   }\r
 \r
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
+  OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf {\r
+    <LibraryClasses>\r
+      # don't use unaligned CopyMem () on the UEFI varstore NOR flash region\r
+      BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf\r
+  }\r
 \r
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
@@ -291,9 +308,9 @@
   # Platform Driver\r
   #\r
   ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf\r
-  ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
-  ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
+  OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf\r
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf\r
+  OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
@@ -338,18 +355,30 @@
   #\r
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {\r
     <LibraryClasses>\r
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
-      NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf\r
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+      NULL|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf\r
   }\r
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {\r
     <LibraryClasses>\r
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
-      NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf\r
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+      NULL|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf\r
   }\r
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
     <LibraryClasses>\r
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
-      NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf\r
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+      NULL|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf\r
   }\r
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
   OvmfPkg/Virtio10Dxe/Virtio10.inf\r
+\r
+  #\r
+  # Rng Support\r
+  #\r
+  SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf\r
+\r
+!if $(ARCH) == AARCH64\r
+  #\r
+  # ACPI Support\r
+  #\r
+  ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf\r
+!endif\r