Changeset 67439 in vbox

Timestamp:

Jun 16, 2017 1:57:42 PM (8 years ago)

Author:

vboxsync

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

116170

Message:

EFI: bugref:6784: properly consider the MCFG area

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (5 diffs)
• DevEFI.h (modified) (1 diff)
• Firmware/OvmfPkg/PlatformPei/Platform.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -228 +228 @@
     /** Uga mode vertical resolution. */
     uint32_t                cyUgaResolution;
+    /** PCI area */
+    uint32_t                u32McfgBase;
+    uint32_t                cbMcfgLength;
 
 
@@ -1104 +1107 @@
         case EFI_INFO_INDEX_UGA_VERTICAL_RESOLUTION:
         case EFI_INFO_INDEX_UGA_HORIZONTAL_RESOLUTION:
+        case EFI_INFO_INDEX_MCFG_BASE:
+        case EFI_INFO_INDEX_MCFG_SIZE:
             return 4;
         case EFI_INFO_INDEX_BOOT_ARGS:
@@ -1191 +1196 @@
         case EFI_INFO_INDEX_STACK_BASE:         return efiInfoNextByteU32(pThis,  VBOX_EFI_TOP_OF_STACK - _128K); /* 2M - 128 K */
         case EFI_INFO_INDEX_STACK_SIZE:         return efiInfoNextByteU32(pThis, _128K);
+        case EFI_INFO_INDEX_MCFG_BASE:          return efiInfoNextByteU32(pThis, pThis->u32McfgBase);
+        case EFI_INFO_INDEX_MCFG_SIZE:          return efiInfoNextByteU32(pThis, pThis->cbMcfgLength);
 
         default:
@@ -2140 +2147 @@
                               "EfiRom\0"
                               "NumCPUs\0"
+                              "McfgBase\0"
+                              "McfgLength\0"
                               "UUID\0"
                               "IOAPIC\0"
@@ -2188 +2197 @@
     rc = CFGMR3QueryU32Def(pCfg, "NumCPUs", &pThis->cCpus, 1);
     AssertLogRelRCReturn(rc, rc);
+
+    rc = CFGMR3QueryU32Def(pCfg, "McfgBase", &pThis->u32McfgBase, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"\" as integer failed"));
+    rc = CFGMR3QueryU32Def(pCfg, "McfgLength", &pThis->cbMcfgLength, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"McfgLength\" as integer failed"));
 
     rc = CFGMR3QueryU8Def(pCfg, "IOAPIC", &pThis->u8IOAPIC, 1);

trunk/src/VBox/Devices/EFI/DevEFI.h

@@ -69 +69 @@
     EFI_INFO_INDEX_UGA_HORIZONTAL_RESOLUTION,
     EFI_INFO_INDEX_UGA_VERTICAL_RESOLUTION,
+    EFI_INFO_INDEX_MCFG_BASE,
+    EFI_INFO_INDEX_MCFG_SIZE,
     EFI_INFO_INDEX_END
 } EfiInfoIndex;

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

@@ -40 +40 @@
 #include "Cmos.h"
 
+#ifdef VBOX
+# define IN_RING0
+# include "../../../../DevEFI.h"
+#endif
+
 EFI_MEMORY_TYPE_INFORMATION mDefaultMemoryTypeInformation[] = {
   { EfiACPIMemoryNVS,       0x004 },
@@ -65 +70 @@
 BOOLEAN mS3Supported = FALSE;
 
+#ifdef VBOX
+static UINT32
+GetVmVariable(UINT32 Variable, CHAR8 *pbBuf, UINT32 cbBuf)
+{
+  UINT32 cbVar, offBuf;
+
+  IoWrite32(EFI_INFO_PORT, Variable);
+  cbVar = IoRead32(EFI_INFO_PORT);
+
+  for (offBuf = 0; offBuf < cbVar && offBuf < cbBuf; offBuf++)
+    pbBuf[offBuf] = IoRead8(EFI_INFO_PORT);
+
+  return cbVar;
+}
+#endif
+
 
 VOID
@@ -269 +290 @@
     // 0xFEE00000    LAPIC                          1 MB
     //
+#ifdef VBOX
+    UINT32 MCfgBase = 0;
+    UINT32 MCfgSize = 0;
+    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);
+#else
     AddIoMemoryRangeHob (TopOfLowRam < BASE_2GB ?
                          BASE_2GB : TopOfLowRam, 0xFC000000);
+#endif
     AddIoMemoryBaseSizeHob (0xFEC00000, SIZE_4KB);
     AddIoMemoryBaseSizeHob (0xFED00000, SIZE_1KB);