X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPlatformPkg%2FArmVirtualizationPkg%2FArmVirtualizationQemu.dsc;h=aabe8e5bc05981b826a5ace15949c1d8fcc2e928;hp=dff4e2507058f0dd42e29bb2f5bcf06325a0a4e3;hb=10233c9e6e24e311afeaaa4e9874fa7aa3a38c04;hpb=b49ed62df124960d8acfb2432ecc57542d5b7844

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
index dff4e25070..aabe8e5bc0 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
@@ -79,13 +79,16 @@
 ################################################################################
 
 [PcdsFeatureFlag.common]
-  gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|FALSE
+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|TRUE
   gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|TRUE
 
   ## If TRUE, Graphics Output Protocol will be installed on virtual handle created by ConsplitterDxe.
   #  It could be set FALSE to save size.
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|FALSE
 
+  # Activate KVM workaround for now.
+  gArmVirtualizationTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE
+
 [PcdsFixedAtBuild.common]
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
 
@@ -131,9 +134,9 @@
   gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|3
 
   #
-  # ARM Virtual Architectural Timer
+  # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM
   #
-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|100000000
+  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0
 
   #
   # NV Storage PCDs. Use base of 0x04000000 for NOR1
@@ -156,7 +159,17 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
 !endif
 
+  #
+  # The maximum physical I/O addressability of the processor, set with
+  # BuildCpuHob().
+  #
+  gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16
+
 [PcdsDynamicDefault.common]
+  ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI
+  #  enumeration to complete before installing ACPI tables.
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE
+
   # System Memory Size -- 1 MB initially, actual size will be fetched from DT
   gArmTokenSpaceGuid.PcdSystemMemorySize|0x00100000
 
@@ -177,6 +190,15 @@
   ## PL031 RealTimeClock
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0
 
+  gArmPlatformTokenSpaceGuid.PcdPciBusMin|0x0
+  gArmPlatformTokenSpaceGuid.PcdPciBusMax|0x0
+  gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x0
+  gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x0
+  gArmPlatformTokenSpaceGuid.PcdPciIoTranslation|0x0
+  gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x0
+  gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0
+
   gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0
 
   gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0
@@ -280,3 +302,16 @@
   #
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+
+  #
+  # ACPI Support
+  #
+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
+  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
+
+  #
+  # PCI support
+  #
+  ArmPlatformPkg/ArmVirtualizationPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
+  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf