Changeset 77749 in vbox

Timestamp:

Mar 18, 2019 11:45:00 AM (6 years ago)

Author:

vboxsync

Message:

EFI: Have to cache MCFG base in BasePciExpressLib because reading a dynamic PCD at runtime does not work due TPL clash. See bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/BasePciExpressLib

Files:

• BasePciExpressLib.inf (modified) (1 diff)
• PciExpressLib.c (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf

@@ -25 +25 @@
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = PciExpressLib
+  CONSTRUCTOR                    = PciExpressLibConstructor
 
 #

trunk/src/VBox/Devices/EFI/FirmwareNew/MdePkg/Library/BasePciExpressLib/PciExpressLib.c

@@ -36 +36 @@
 #define ASSERT_INVALID_PCI_ADDRESS(A) \
   ASSERT (((A) & ~0xfffffff) == 0)
+
+#ifdef VBOX
+
+STATIC UINT64 mPciExpressBaseAddress;
+
+RETURN_STATUS
+EFIAPI
+PciExpressLibConstructor (
+  VOID
+  )
+{
+  //
+  // Accessing PciExpressBaseAddress as a dynamic PCD does not work
+  // because LibPcdGet64() worker tries to raise the TPL to 16 when
+  // it was already set to 31 by caller further up the chain. We need
+  // to read the value (which won't change) and cache it here.
+  //
+  mPciExpressBaseAddress = PcdGet64 (PcdPciExpressBaseAddress);
+  if (!mPciExpressBaseAddress)
+    return RETURN_LOAD_ERROR;
+
+  return RETURN_SUCCESS;
+}
+#endif
+
 
 /**
@@ -83 +108 @@
   )
 {
+#ifdef VBOX
+  return (VOID*)(UINTN) mPciExpressBaseAddress;
+#else
   return (VOID*)(UINTN) PcdGet64 (PcdPciExpressBaseAddress);
+#endif
 }