Changeset 77796 in vbox for trunk/src/VBox

Timestamp:

Mar 19, 2019 4:52:25 PM (6 years ago)

Author:

vboxsync

Message:

EFI: Tweaked memory map for more than 2G RAM.

File:

• trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/Platform.c (modified) (4 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/PlatformPei/Platform.c

@@ -266 +266 @@
     TopOfLowRam = GetSystemMemorySizeBelow4gb ();
     PciExBarBase = 0;
+#ifndef VBOX
     if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
       //
@@ -299 +300 @@
     ASSERT_RETURN_ERROR (PcdStatus);
 
-#ifdef VBOX
+    AddIoMemoryRangeHob (TopOfLowRam < BASE_2GB ?
+                         BASE_2GB : TopOfLowRam, 0xFC000000);
+#else
     GetVmVariable(EFI_INFO_INDEX_MCFG_BASE, (CHAR8 *)&McfgBase, sizeof(McfgBase));
     GetVmVariable(EFI_INFO_INDEX_MCFG_SIZE, (CHAR8 *)&McfgSize, sizeof(McfgSize));
@@ -309 +312 @@
       AddIoMemoryRangeHob (TopOfLowRam, McfgBase);
     AddIoMemoryRangeHob (McfgBase + McfgSize, 0xFC000000);
+
     PcdSet64S (PcdPciExpressBaseAddress, McfgBase);
-#else
-    AddIoMemoryRangeHob (TopOfLowRam < BASE_2GB ?
-                         BASE_2GB : TopOfLowRam, 0xFC000000);
-#endif
+
+    ASSERT (McfgBase == (UINT32)McfgBase);
+    ASSERT (McfgBase + McfgSize < 0xFC000000);
+
+    PciBase = (UINT32)(McfgBase + McfgSize);
+    PciSize = 0xFC000000 - PciBase;
+    PcdStatus = PcdSet64S (PcdPciMmio32Base, PciBase);
+    ASSERT_RETURN_ERROR (PcdStatus);
+    PcdStatus = PcdSet64S (PcdPciMmio32Size, PciSize);
+    ASSERT_RETURN_ERROR (PcdStatus);
+#endif
+
     AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
     AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);
+#ifndef VBOX
     if (mHostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
       AddIoMemoryBaseSizeHob (ICH9_ROOT_COMPLEX_BASE, SIZE_16KB);
@@ -343 +356 @@
         EfiReservedMemoryType);
     }
+#endif
     AddIoMemoryBaseSizeHob (PcdGet32(PcdCpuLocalApicBaseAddress), SIZE_1MB);