Changeset 82249 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Nov 27, 2019 6:18:11 PM (5 years ago)

Author:

vboxsync

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

135067

Message:

EFI/Firmware: Relocate the DXE FV volume to the top of the RAM once the memory is initialized to not interfer with older OS X bootloaders which try to allocate memory in that area

Location:

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/PlatformPei

Files:

• Fv.c (modified) (3 diffs)
• MemDetect.c (modified) (2 diffs)

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

@@ -14 +14 @@
 #include <Library/PcdLib.h>
 
+#include <Library/BaseMemoryLib.h>
 
 /**
@@ -28 +29 @@
 {
   BOOLEAN SecureS3Needed;
+#ifdef VBOX
+  EFI_PHYSICAL_ADDRESS PhysOvmfDxeMemFvBaseRelocated = 0;
+  VOID *OvmfDxeMemFvBaseRelocated;
+#endif
 
   DEBUG ((EFI_D_INFO, "Platform PEI Firmware Volume Initialization\n"));
+
+#ifdef VBOX
+  /*
+   * Relocate the DXE firmware to the top of the RAM so it doesn't interfer with older OS X bootloaders
+   * trying to allocate memory in the area where MEMFD is currently residing.
+   */
+  PeiServicesAllocatePages (EfiRuntimeServicesCode,
+                            EFI_SIZE_TO_PAGES(PcdGet32 (PcdOvmfDxeMemFvSize)),
+                            &PhysOvmfDxeMemFvBaseRelocated);
+
+  OvmfDxeMemFvBaseRelocated = (VOID *)(UINTN)PhysOvmfDxeMemFvBaseRelocated;
+  CopyMem (OvmfDxeMemFvBaseRelocated, (VOID *)(UINTN)PcdGet32 (PcdOvmfDxeMemFvBase), PcdGet32 (PcdOvmfDxeMemFvSize));
+
+  //
+  // Let DXE know about the DXE FV
+  //
+  BuildFvHob (PhysOvmfDxeMemFvBaseRelocated, PcdGet32 (PcdOvmfDxeMemFvSize));
+
+  SecureS3Needed = mS3Supported && FeaturePcdGet (PcdSmmSmramRequire);
+
+  //
+  // Create a memory allocation HOB for the DXE FV.
+  //
+  // If "secure" S3 is needed, then SEC will decompress both PEI and DXE
+  // firmware volumes at S3 resume too, hence we need to keep away the OS from
+  // DXEFV as well. Otherwise we only need to keep away DXE itself from the
+  // DXEFV area.
+  //
+  BuildMemoryAllocationHob (
+    PhysOvmfDxeMemFvBaseRelocated,
+    PcdGet32 (PcdOvmfDxeMemFvSize),
+    SecureS3Needed ? EfiACPIMemoryNVS : EfiBootServicesData
+    );
+
+  //
+  // Let PEI know about the DXE FV so it can find the DXE Core
+  //
+  PeiServicesInstallFvInfoPpi (
+    NULL,
+    (VOID *)(UINTN)OvmfDxeMemFvBaseRelocated,
+    PcdGet32 (PcdOvmfDxeMemFvSize),
+    NULL,
+    NULL
+    );
+#else
 
   //
@@ -89 +139 @@
     NULL
     );
+#endif
 
   return EFI_SUCCESS;

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

@@ -882 +882 @@
 
   if (mBootMode != BOOT_ON_S3_RESUME) {
+#ifndef VBOX
+    /*
+     * This is currently no required and interferes with older OS X bootloaders trying to
+     * allocate memory in that area. Needs to be revisited once we need this.
+     */
     if (!FeaturePcdGet (PcdSmmSmramRequire)) {
       //
@@ -903 +908 @@
         );
     }
+#endif
 
     if (FeaturePcdGet (PcdSmmSmramRequire)) {