Changeset 99452 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 19, 2023 8:08:30 AM (20 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Need to initialize the PcdPciExpressBaseAddress PCD earlier or the UC base address becomes wrong, bugref:4643

File:

• trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/PlatformInitLib/MemDetect.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/Library/PlatformInitLib/MemDetect.c

@@ -44 +44 @@
 #include <Library/PlatformInitLib.h>
 
+#ifdef VBOX
+# include "VBoxPkg.h"
+# include "DevEFI.h"
+# include "iprt/asm.h"
+
+static UINT32
+GetVmVariable(UINT32 Variable, CHAR8 *pbBuf, UINT32 cbBuf)
+{
+  UINT32 cbVar, offBuf;
+
+  ASMOutU32(EFI_INFO_PORT, Variable);
+  cbVar = ASMInU32(EFI_INFO_PORT);
+
+  for (offBuf = 0; offBuf < cbVar && offBuf < cbBuf; offBuf++)
+    pbBuf[offBuf] = ASMInU8(EFI_INFO_PORT);
+
+  return cbVar;
+}
+#endif
+
 #define MEGABYTE_SHIFT  20
 
@@ -52 +72 @@
   )
 {
+#ifdef VBOX
+  UINT64 McfgBase = 0;
+#endif
+
   if (PlatformInfoHob->HostBridgeDevId == 0xffff /* microvm */) {
     return;
@@ -64 +88 @@
   PlatformGetSystemMemorySizeBelow4gb (PlatformInfoHob);
 
+#ifdef VBOX
+  /*
+   * Need to initialize the dynamic PcdPciExpressBaseAddress here after the low memory
+   * gets known or the UC base address will become wrong.
+   * The HOBs are not created however but this is done in PlatformMemMapInitialization()
+   * which is called later.
+   */
+  GetVmVariable(EFI_INFO_INDEX_MCFG_BASE, (CHAR8 *)&McfgBase, sizeof(McfgBase));
+  if (PlatformInfoHob->LowMemory < BASE_2GB)
+    PlatformInfoHob->LowMemory = BASE_2GB;
+  if (McfgBase == 0)
+    McfgBase = PlatformInfoHob->LowMemory;   // backward compatibilit with old DevEFI
+
+  PcdSet64S (PcdPciExpressBaseAddress, McfgBase);
+#endif
+
   if (PlatformInfoHob->HostBridgeDevId == INTEL_Q35_MCH_DEVICE_ID) {
     ASSERT (PcdGet64 (PcdPciExpressBaseAddress) <= MAX_UINT32);
-    //ASSERT (PcdGet64 (PcdPciExpressBaseAddress) >= PlatformInfoHob->LowMemory);
+    ASSERT (PcdGet64 (PcdPciExpressBaseAddress) >= PlatformInfoHob->LowMemory);
 
     if (PlatformInfoHob->LowMemory <= BASE_2GB) {