Changeset 24790 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2009 2:21:54 PM (15 years ago)

Author:

vboxsync

Message:

EFI: EFI 64-bit host support.

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (1 diff)
• Firmware2/VBoxPkg/Include/DevEFI.h (modified) (2 diffs)
• Firmware2/VBoxPkg/Include/DevEFI.mac (modified) (1 diff)
• Thunk/EfiThunk.asm (modified) (7 diffs)

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

@@ -785 +785 @@
     pEfiInfo->cbBelow4GB    = pThis->cbBelow4GB;
     pEfiInfo->cbAbove4GB    = pThis->cbAbove4GB;
-    pEfiInfo->fFlags        = 0;
+    pEfiInfo->fFlags        = 0; /* todo 0 bit makes 64-bit fw to boot need some knitting with GUI */
     pEfiInfo->cCpus         = pThis->cCpus;
     pEfiInfo->pfnPeiEP      = (uint32_t)pThis->GCEntryPoint1;

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h

@@ -118 +118 @@
     /** 0x18 - Amount of memory above 4GB (in bytes). */
     uint64_t    cbAbove4GB;
-    /** 0x20 - Flags reserved for future use, must be zero. */
+    /** 0x20 - see flags values below */
     uint32_t    fFlags;
     /** 0x24 - The nubmer of Virtual CPUs. */
@@ -135 +135 @@
 /** The physical address where DEVEFIINFO can be found. */
 #define DEVEFI_INFO_PHYS_ADDR   (0xfffff000)
+#define DEVEFI_INFO_FLAGS_X64   RT_BIT(0)
 
 /** @} */

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac

@@ -55 +55 @@
 
 %define DEVEFI_INFO_PHYS_ADDR   (0xfffff000)
+%define DEVEFI_INFO_FLAGS_X64   RT_BIT(0)
 
 %endif

trunk/src/VBox/Devices/EFI/Thunk/EfiThunk.asm

@@ -30 +30 @@
 %define IDT_VECTORS     128
 ;; keep in sync with actual GDT size
-%define GDT_SELECTORS   7
+%define GDT_SELECTORS   10
 
 
@@ -79 +79 @@
         dw      0xffff, 0, 0x9300, 0x0000       ; 16 bit data segment base=0x0 limit=0xffff     - FIXME: ditto.
         dw      0xffff, 0, 0x9300, 0x00cf       ; 32 bit flat stack segment (0x30)
+        dw      0xffff, 0, 0x9a00, 0x00af       ; 64 bit flat code segment (0x38)
+        dw      0,      0, 0,      0            ; ditto
+        dw      0,      0, 0,      0            ; ditto
 
 ;; For lidt
@@ -93 +96 @@
         db      0x0f                            ; base  23:16
         db      0x00                            ; unused
-
-
+        
 BITS 32
 
@@ -137 +139 @@
 BITS 16
 ;;
-; This is the place where we jump immediately after boot and
+; This i the place where we jump immediately after boot and
 ; switch the CPU into protected mode.
 ;
@@ -207 +209 @@
         ; around all it wants for all we care.
         ;
+        mov     eax,[0xfffff000 + DEVEFIINFO.fFlags]
+        and      eax, DEVEFI_INFO_FLAGS_X64
+        jnz trampoline_64
         mov     ebp, [0xfffff000 + DEVEFIINFO.PhysFwVol]
         mov     esi, [0xfffff000 + DEVEFIINFO.pfnFirmwareEP]
@@ -212 +217 @@
         jmp     [0xfffff000 + DEVEFIINFO.pfnFirmwareEP]
         jmp     HaltForEver
+trampoline_64:
+%macro fill_pkt 1
+%%loop:
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+        add eax, %1
+        loop %%loop
+%endmacro
+
+%define base 0x800000;0xfffff000 
+        mov ecx, 0x800 ; pde size
+        mov ebx, base - (6 << X86_PAGE_4K_SHIFT)
+        xor eax, eax
+        ;; or flags to eax 
+        or eax, (X86_PDE_P|X86_PDE_A|X86_PDE_PS|X86_PDE_PCD|X86_PDE_RW|RT_BIT(6)) 
+        fill_pkt (1 << X86_PAGE_2M_SHIFT)
+
+        ;; pdpt (1st 4 entries describe 4Gb)
+        mov ebx, base - (2 << X86_PAGE_4K_SHIFT)
+        mov eax, base - (6 << X86_PAGE_4K_SHIFT) ;; 
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov eax, base - 5 * (1 << X86_PAGE_4K_SHIFT) ;; 
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov eax, base - 4 * (1 << X86_PAGE_4K_SHIFT) ;; 
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov eax, base - 3 * (1 << X86_PAGE_4K_SHIFT) ;; 
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        mov [ebx],eax
+        xor edx,edx
+        mov [ebx + 4], edx
+        add ebx, 8
+
+        mov ecx, 0x1f7 ; pdte size
+        mov ebx, base - 2 * (1 << X86_PAGE_4K_SHIFT) + 4 * 8
+        mov eax, base - 6 * (1 << X86_PAGE_4K_SHIFT);; 
+        or eax, (X86_PDPE_P|X86_PDPE_RW|X86_PDPE_A|X86_PDPE_PCD)
+        ;; or flags to eax 
+        fill_pkt 3 * (1 << X86_PAGE_4K_SHIFT)
+        
+        mov ecx, 0x200 ; pml4 size
+        mov ebx, base - (1 << X86_PAGE_4K_SHIFT)
+        mov eax, base - 2 * (1 << X86_PAGE_4K_SHIFT) ;; 
+        or eax, (X86_PML4E_P|X86_PML4E_PCD|X86_PML4E_A|X86_PML4E_RW)
+        ;; or flags to eax 
+        fill_pkt 0
+
+        mov eax, base - (1 << X86_PAGE_4K_SHIFT)
+        mov cr3, eax
+
+
+        mov eax,cr4
+        or eax, X86_CR4_PAE|X86_CR4_OSFSXR|X86_CR4_OSXMMEEXCPT
+        mov cr4,eax
+        
+        mov ecx, MSR_K6_EFER
+        rdmsr
+        or  eax, MSR_K6_EFER_LME
+        wrmsr
+
+        mov     eax, cr0
+        or      eax, X86_CR0_PG
+        mov     cr0, eax
+        jmp compat
+compat:
+        jmp 0x38:0xffff0000 + efi_64
+BITS 64
+efi_64:
+        mov     ebp, [0xff009] ;  DEVEFIINFO.PhysFwVol
+        mov     esi, [0xff000]; + DEVEFIINFO.pfnFirmwareEP]
+        mov     edi, [0xff000 + 0x28]; + DEVEFIINFO.pfnPeiEP]
+        jmp     [0xff000]; + DEVEFIINFO.pfnFirmwareEP]
+        jmp     HaltForEver
 
         ;
@@ -221 +315 @@
         BITS 16
         jmp     genesis
-        times (16 - 3) db 0cch
-
+        dw 0xdead
+        dw 0xbeaf
+        times (16 - 7) db 0cch
 end: