Changeset 58803 in vbox for trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg

Timestamp:

Nov 20, 2015 5:21:41 PM (9 years ago)

Author:

vboxsync

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

104257

Message:

EFI/Firmware: Fix page table location for amd64 after MEMFD had to be relocated because of OS X guests. The page table location must match the gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase PCD defined in OvmfPkgX64.fdf. Remove unused modifications in the old ResetVector code which now moved to OvmfPkg

File:

• trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/ResetVector/Ia32/PageTables64.asm (modified) (5 diffs)

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/ResetVector/Ia32/PageTables64.asm

@@ -45 +45 @@
 
     ;
+%ifdef VBOX
+    ; For OVMF, build some initial page tables at 0x2000000-0x2006000.
+    ; Required because we had to relocate MEMFD where the page table resides 
+    ; from 0x800000 to not interfere with certain OS X bootloaders.
+%else
     ; For OVMF, build some initial page tables at 0x800000-0x806000.
+%endif
     ;
     ; This range should match with PcdOvmfSecPageTablesBase and
@@ -57 +63 @@
     xor     eax, eax
 clearPageTablesMemoryLoop:
+%ifdef VBOX
+    mov     dword[ecx * 4 + 0x2000000 - 4], eax
+%else
     mov     dword[ecx * 4 + 0x800000 - 4], eax
+%endif
     loop    clearPageTablesMemoryLoop
 
@@ -63 +73 @@
     ; Top level Page Directory Pointers (1 * 512GB entry)
     ;
+%ifdef VBOX
+    mov     dword[0x2000000], 0x2001000 + PAGE_PDP_ATTR
+%else
     mov     dword[0x800000], 0x801000 + PAGE_PDP_ATTR
+%endif
 
     ;
     ; Next level Page Directory Pointers (4 * 1GB entries => 4GB)
     ;
+%ifdef VBOX
+    mov     dword[0x2001000], 0x2002000 + PAGE_PDP_ATTR
+    mov     dword[0x2001008], 0x2003000 + PAGE_PDP_ATTR
+    mov     dword[0x2001010], 0x2004000 + PAGE_PDP_ATTR
+    mov     dword[0x2001018], 0x2005000 + PAGE_PDP_ATTR
+%else
     mov     dword[0x801000], 0x802000 + PAGE_PDP_ATTR
     mov     dword[0x801008], 0x803000 + PAGE_PDP_ATTR
     mov     dword[0x801010], 0x804000 + PAGE_PDP_ATTR
     mov     dword[0x801018], 0x805000 + PAGE_PDP_ATTR
+%endif
 
     ;
@@ -82 +103 @@
     shl     eax, 21
     add     eax, PAGE_2M_PDE_ATTR
+%ifdef VBOX
+    mov     [ecx * 8 + 0x2002000 - 8], eax
+%else
     mov     [ecx * 8 + 0x802000 - 8], eax
+%endif
     loop    pageTableEntriesLoop
 
@@ -88 +113 @@
     ; Set CR3 now that the paging structures are available
     ;
+%ifdef VBOX
+    mov     eax, 0x2000000
+%else
     mov     eax, 0x800000
+%endif
     mov     cr3, eax