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

Timestamp:

Jul 26, 2012 6:21:42 PM (12 years ago)

Author:

vboxsync

Message:

EFI/OVMF: protects 64Kb at end of system memory. no explicit HOB required for range 0xe0000, 0xe1000.

Location:

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/PlatformPei

Files:

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

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/PlatformPei/MemDetect.c

@@ -135 +135 @@
     MemorySize = SIZE_64MB;
   }
+  MemorySize -= BASE_64KB; /* Reserves 64KB for ACPI tables. */
 
   //
@@ -147 +148 @@
   AddMemoryBaseSizeHob (MemoryBase, MemorySize);
   AddMemoryRangeHob (BASE_1MB, MemoryBase);
+  MtrrSetMemoryAttribute (BASE_1MB, MemoryBase + MemorySize - BASE_1MB, CacheWriteBack);
   AddMemoryRangeHob (0, BASE_512KB + BASE_128KB);
+  MtrrSetMemoryAttribute (0, BASE_512KB + BASE_128KB, CacheWriteBack);
 
-  MtrrSetMemoryAttribute (BASE_1MB, MemoryBase + MemorySize - BASE_1MB, CacheWriteBack);
-
-  MtrrSetMemoryAttribute (0, BASE_512KB + BASE_128KB, CacheWriteBack);
 
   if (UpperMemorySize != 0) {

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/PlatformPei/Platform.c

@@ -132 +132 @@
     );
 
-  DEBUG (
-      (EFI_D_ERROR, "ROM HOB: at 0x%llx size 0x%llx\n", MemoryBase, MemorySize)
-    );
-
+  DEBUG ((DEBUG_INFO, "ROM HOB: at 0x%llx size 0x%llx\n", MemoryBase, MemorySize));
 }
 
@@ -277 +274 @@
   //
   // Video memory + Legacy BIOS region
+  // This includes ACPI floating pointer region.
   //
   AddIoMemoryRangeHob (0x0A0000, BASE_1MB);
@@ -289 +287 @@
   ASSERT(AcpiTables != 0);
 
-  // Floating pointer page
-  AddRomMemoryBaseSizeHob(RsdPtr,      0x1000);
   // ACPI tables 64 K
   AddRomMemoryBaseSizeHob(AcpiTables, 0x10000);