1 files changed, 99 insertions, 12 deletions

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index c5c1ae0997e7..57e58a5fa210 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -113,7 +113,8 @@ ENTRY(startup_32)
         lgdt    gdt(%ebp)
 
         /* Enable PAE mode */
-        movl    $(X86_CR4_PAE), %eax
+        movl    %cr4, %eax
+        orl     $X86_CR4_PAE, %eax
         movl    %eax, %cr4
 
  /*
@@ -178,6 +179,13 @@ ENTRY(startup_32)
          */
         pushl   $__KERNEL_CS
         leal    startup_64(%ebp), %eax
+#ifdef CONFIG_EFI_MIXED
+        movl    efi32_config(%ebp), %ebx
+        cmp     $0, %ebx
+        jz      1f
+        leal    handover_entry(%ebp), %eax
+1:
+#endif
         pushl   %eax
 
         /* Enter paged protected Mode, activating Long Mode */
@@ -188,6 +196,30 @@ ENTRY(startup_32)
         lret
 ENDPROC(startup_32)
 
+#ifdef CONFIG_EFI_MIXED
+        .org 0x190
+ENTRY(efi32_stub_entry)
+        add     $0x4, %esp              /* Discard return address */
+        popl    %ecx
+        popl    %edx
+        popl    %esi
+
+        leal    (BP_scratch+4)(%esi), %esp
+        call    1f
+1:      pop     %ebp
+        subl    $1b, %ebp
+
+        movl    %ecx, efi32_config(%ebp)
+        movl    %edx, efi32_config+8(%ebp)
+        sgdtl   efi32_boot_gdt(%ebp)
+
+        leal    efi32_config(%ebp), %eax
+        movl    %eax, efi_config(%ebp)
+
+        jmp     startup_32
+ENDPROC(efi32_stub_entry)
+#endif
+
         .code64
         .org 0x200
 ENTRY(startup_64)
@@ -209,26 +241,48 @@ ENTRY(startup_64)
         jmp     preferred_addr
 
 ENTRY(efi_pe_entry)
-        mov     %rcx, %rdi
-        mov     %rdx, %rsi
-        pushq   %rdi
-        pushq   %rsi
+        movq    %rcx, efi64_config(%rip)        /* Handle */
+        movq    %rdx, efi64_config+8(%rip) /* EFI System table pointer */
+
+        leaq    efi64_config(%rip), %rax
+        movq    %rax, efi_config(%rip)
+
+        call    1f
+1:      popq    %rbp
+        subq    $1b, %rbp
+
+        /*
+         * Relocate efi_config->call().
+         */
+        addq    %rbp, efi64_config+88(%rip)
+
+        movq    %rax, %rdi
         call    make_boot_params
         cmpq    $0,%rax
-        je      1f
-        mov     %rax, %rdx
-        popq    %rsi
-        popq    %rdi
+        je      fail
+        mov     %rax, %rsi
+        jmp     2f              /* Skip the relocation */
 
-ENTRY(efi_stub_entry)
+handover_entry:
+        call    1f
+1:      popq    %rbp
+        subq    $1b, %rbp
+
+        /*
+         * Relocate efi_config->call().
+         */
+        movq    efi_config(%rip), %rax
+        addq    %rbp, 88(%rax)
+2:
+        movq    efi_config(%rip), %rdi
         call    efi_main
         movq    %rax,%rsi
         cmpq    $0,%rax
         jne     2f
-1:
+fail:
         /* EFI init failed, so hang. */
         hlt
-        jmp     1b
+        jmp     fail
 2:
         call    3f
 3:
@@ -307,6 +361,20 @@ preferred_addr:
         leaq    relocated(%rbx), %rax
         jmp     *%rax
 
+#ifdef CONFIG_EFI_STUB
+        .org 0x390
+ENTRY(efi64_stub_entry)
+        movq    %rdi, efi64_config(%rip)        /* Handle */
+        movq    %rsi, efi64_config+8(%rip) /* EFI System table pointer */
+
+        leaq    efi64_config(%rip), %rax
+        movq    %rax, efi_config(%rip)
+
+        movq    %rdx, %rsi
+        jmp     handover_entry
+ENDPROC(efi64_stub_entry)
+#endif
+
         .text
 relocated:
 
@@ -372,6 +440,25 @@ gdt:
         .quad   0x0000000000000000      /* TS continued */
 gdt_end:
 
+#ifdef CONFIG_EFI_STUB
+efi_config:
+        .quad   0
+
+#ifdef CONFIG_EFI_MIXED
+        .global efi32_config
+efi32_config:
+        .fill   11,8,0
+        .quad   efi64_thunk
+        .byte   0
+#endif
+
+        .global efi64_config
+efi64_config:
+        .fill   11,8,0
+        .quad   efi_call6
+        .byte   1
+#endif /* CONFIG_EFI_STUB */
+
 /*
  * Stack and heap for uncompression
  */