Changeset 67456 in vbox for trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg

Timestamp:

Jun 19, 2017 8:40:53 AM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

116189

Message:

DevEFI/DevPciBiops: made McfgBase/McfgLength 64-bit as they already are in DevACPI and DevPciIch9. Also s/MCfgBase/McfgBase/ and s/MCfgSize/McfgSize/ in EFI/Firmware.

File:

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

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

@@ -247 +247 @@
   EFI_PHYSICAL_ADDRESS RsdPtr;
   EFI_PHYSICAL_ADDRESS AcpiTables;
-  UINT32 MCfgBase = 0;
-  UINT32 MCfgSize = 0;
+  UINT64 McfgBase = 0;
+  UINT64 McfgSize = 0;
 #endif
   //
@@ -294 +294 @@
     //
 #ifdef VBOX
-    GetVmVariable(EFI_INFO_INDEX_MCFG_BASE, (CHAR8 *)&MCfgBase, sizeof(MCfgBase));
-    GetVmVariable(EFI_INFO_INDEX_MCFG_SIZE, (CHAR8 *)&MCfgSize, sizeof(MCfgSize));
+    GetVmVariable(EFI_INFO_INDEX_MCFG_BASE, (CHAR8 *)&McfgBase, sizeof(McfgBase));
+    GetVmVariable(EFI_INFO_INDEX_MCFG_SIZE, (CHAR8 *)&McfgSize, sizeof(McfgSize));
     if (TopOfLowRam < BASE_2GB)
       TopOfLowRam = BASE_2GB;
-    if (MCfgBase == 0)
-      MCfgBase = TopOfLowRam;   // backward compatibilit with old DevEFI
-    if (TopOfLowRam < MCfgBase)
-      AddIoMemoryRangeHob (TopOfLowRam, MCfgBase);
-    AddIoMemoryRangeHob (MCfgBase + MCfgSize, 0xFC000000);
+    if (McfgBase == 0)
+      McfgBase = TopOfLowRam;   // backward compatibilit with old DevEFI
+    if (TopOfLowRam < McfgBase)
+      AddIoMemoryRangeHob (TopOfLowRam, McfgBase);
+    AddIoMemoryRangeHob (McfgBase + McfgSize, 0xFC000000);
 #else
     AddIoMemoryRangeHob (TopOfLowRam < BASE_2GB ?