1 files changed, 22 insertions, 30 deletions

diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 53748c45e488..78d1e7467eae 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -3,6 +3,7 @@
 
 #include <asm/fpu/api.h>
 #include <asm/pgtable.h>
+#include <asm/processor-flags.h>
 #include <asm/tlb.h>
 
 /*
@@ -28,33 +29,22 @@
 
 #define MAX_CMDLINE_ADDRESS     UINT_MAX
 
-#ifdef CONFIG_X86_32
+#define ARCH_EFI_IRQ_FLAGS_MASK X86_EFLAGS_IF
 
+#ifdef CONFIG_X86_32
 
 extern unsigned long asmlinkage efi_call_phys(void *, ...);
 
+#define arch_efi_call_virt_setup()      kernel_fpu_begin()
+#define arch_efi_call_virt_teardown()   kernel_fpu_end()
+
 /*
  * Wrap all the virtual calls in a way that forces the parameters on the stack.
  */
-
-/* Use this macro if your virtual returns a non-void value */
-#define efi_call_virt(f, args...) \
+#define arch_efi_call_virt(f, args...)                                  \
 ({                                                                      \
-        efi_status_t __s;                                               \
-        kernel_fpu_begin();                                             \
-        __s = ((efi_##f##_t __attribute__((regparm(0)))*)               \
-                efi.systab->runtime->f)(args);                          \
-        kernel_fpu_end();                                               \
-        __s;                                                            \
-})
-
-/* Use this macro if your virtual call does not return any value */
-#define __efi_call_virt(f, args...) \
-({                                                                      \
-        kernel_fpu_begin();                                             \
         ((efi_##f##_t __attribute__((regparm(0)))*)                     \
                 efi.systab->runtime->f)(args);                          \
-        kernel_fpu_end();                                               \
 })
 
 #define efi_ioremap(addr, size, type, attr)     ioremap_cache(addr, size)
@@ -78,10 +68,8 @@ struct efi_scratch {
         u64     phys_stack;
 } __packed;
 
-#define efi_call_virt(f, ...)                                           \
+#define arch_efi_call_virt_setup()                                      \
 ({                                                                      \
-        efi_status_t __s;                                               \
-                                                                        \
         efi_sync_low_kernel_mappings();                                 \
         preempt_disable();                                              \
         __kernel_fpu_begin();                                           \
@@ -91,9 +79,13 @@ struct efi_scratch {
                 write_cr3((unsigned long)efi_scratch.efi_pgt);          \
                 __flush_tlb_all();                                      \
         }                                                               \
-                                                                        \
-        __s = efi_call((void *)efi.systab->runtime->f, __VA_ARGS__);    \
-                                                                        \
+})
+
+#define arch_efi_call_virt(f, args...)                                  \
+        efi_call((void *)efi.systab->runtime->f, args)                  \
+
+#define arch_efi_call_virt_teardown()                                   \
+({                                                                      \
         if (efi_scratch.use_pgd) {                                      \
                 write_cr3(efi_scratch.prev_cr3);                        \
                 __flush_tlb_all();                                      \
@@ -101,15 +93,8 @@ struct efi_scratch {
                                                                         \
         __kernel_fpu_end();                                             \
         preempt_enable();                                               \
-        __s;                                                            \
 })
 
-/*
- * All X86_64 virt calls return non-void values. Thus, use non-void call for
- * virt calls that would be void on X86_32.
- */
-#define __efi_call_virt(f, args...) efi_call_virt(f, args)
-
 extern void __iomem *__init efi_ioremap(unsigned long addr, unsigned long size,
                                         u32 type, u64 attribute);
 
@@ -180,6 +165,8 @@ static inline bool efi_runtime_supported(void)
 extern struct console early_efi_console;
 extern void parse_efi_setup(u64 phys_addr, u32 data_len);
 
+extern void efifb_setup_from_dmi(struct screen_info *si, const char *opt);
+
 #ifdef CONFIG_EFI_MIXED
 extern void efi_thunk_runtime_setup(void);
 extern efi_status_t efi_thunk_set_virtual_address_map(
@@ -225,6 +212,11 @@ __pure const struct efi_config *__efi_early(void);
 #define efi_call_early(f, ...)                                          \
         __efi_early()->call(__efi_early()->f, __VA_ARGS__);
 
+#define __efi_call_early(f, ...)                                        \
+        __efi_early()->call((unsigned long)f, __VA_ARGS__);
+
+#define efi_is_64bit()          __efi_early()->is64
+
 extern bool efi_reboot_required(void);
 
 #else