Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Pull x86 EFI updates from Peter Anvin:
 "A collection of EFI changes.  The perhaps most important one is to
  fully save and restore the FPU state around each invocation of EFI
  runtime, and to not choke on non-ASCII characters in the boot stub"

* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efivars: Add compatibility code for compat tasks
  efivars: Refactor sanity checking code into separate function
  efivars: Stop passing a struct argument to efivar_validate()
  efivars: Check size of user object
  efivars: Use local variables instead of a pointer dereference
  x86/efi: Save and restore FPU context around efi_calls (i386)
  x86/efi: Save and restore FPU context around efi_calls (x86_64)
  x86/efi: Implement a __efi_call_virt macro
  x86, fpu: Extend the use of static_cpu_has_safe
  x86/efi: Delete most of the efi_call* macros
  efi: x86: Handle arbitrary Unicode characters
  efi: Add get_dram_base() helper function
  efi: Add shared printk wrapper for consistent prefixing
  efi: create memory map iteration helper
  efi: efi-stub-helper cleanup

7 files changed, 67 insertions, 179 deletions

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 4703a6c4b8e3..0331d765c2bb 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -1087,8 +1087,7 @@ struct boot_params *make_boot_params(struct efi_config *c)
         hdr->type_of_loader = 0x21;
 
         /* Convert unicode cmdline to ascii */
-        cmdline_ptr = efi_convert_cmdline_to_ascii(sys_table, image,
-                                                   &options_size);
+        cmdline_ptr = efi_convert_cmdline(sys_table, image, &options_size);
         if (!cmdline_ptr)
                 goto fail;
         hdr->cmd_line_ptr = (unsigned long)cmdline_ptr;
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 0d558ee899ae..2884e0c3e8a5 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -452,7 +452,7 @@ efi32_config:
         .global efi64_config
 efi64_config:
         .fill   11,8,0
-        .quad   efi_call6
+        .quad   efi_call
         .byte   1
 #endif /* CONFIG_EFI_STUB */
 
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 0869434eaf72..1eb5f6433ad8 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -1,6 +1,7 @@
 #ifndef _ASM_X86_EFI_H
 #define _ASM_X86_EFI_H
 
+#include <asm/i387.h>
 /*
  * We map the EFI regions needed for runtime services non-contiguously,
  * with preserved alignment on virtual addresses starting from -4G down
@@ -27,91 +28,58 @@
 
 extern unsigned long asmlinkage efi_call_phys(void *, ...);
 
-#define efi_call_phys0(f)               efi_call_phys(f)
-#define efi_call_phys1(f, a1)           efi_call_phys(f, a1)
-#define efi_call_phys2(f, a1, a2)       efi_call_phys(f, a1, a2)
-#define efi_call_phys3(f, a1, a2, a3)   efi_call_phys(f, a1, a2, a3)
-#define efi_call_phys4(f, a1, a2, a3, a4)       \
-        efi_call_phys(f, a1, a2, a3, a4)
-#define efi_call_phys5(f, a1, a2, a3, a4, a5)   \
-        efi_call_phys(f, a1, a2, a3, a4, a5)
-#define efi_call_phys6(f, a1, a2, a3, a4, a5, a6)       \
-        efi_call_phys(f, a1, a2, a3, a4, a5, a6)
 /*
  * 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...) \
-        ((efi_##f##_t __attribute__((regparm(0)))*)efi.systab->runtime->f)(args)
-
-#define efi_call_virt0(f)               efi_call_virt(f)
-#define efi_call_virt1(f, a1)           efi_call_virt(f, a1)
-#define efi_call_virt2(f, a1, a2)       efi_call_virt(f, a1, a2)
-#define efi_call_virt3(f, a1, a2, a3)   efi_call_virt(f, a1, a2, a3)
-#define efi_call_virt4(f, a1, a2, a3, a4)       \
-        efi_call_virt(f, a1, a2, a3, a4)
-#define efi_call_virt5(f, a1, a2, a3, a4, a5)   \
-        efi_call_virt(f, a1, a2, a3, a4, a5)
-#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)       \
-        efi_call_virt(f, a1, a2, a3, a4, a5, a6)
+({                                                                      \
+        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)
 
 #else /* !CONFIG_X86_32 */
 
-extern u64 efi_call0(void *fp);
-extern u64 efi_call1(void *fp, u64 arg1);
-extern u64 efi_call2(void *fp, u64 arg1, u64 arg2);
-extern u64 efi_call3(void *fp, u64 arg1, u64 arg2, u64 arg3);
-extern u64 efi_call4(void *fp, u64 arg1, u64 arg2, u64 arg3, u64 arg4);
-extern u64 efi_call5(void *fp, u64 arg1, u64 arg2, u64 arg3,
-                     u64 arg4, u64 arg5);
-extern u64 efi_call6(void *fp, u64 arg1, u64 arg2, u64 arg3,
-                     u64 arg4, u64 arg5, u64 arg6);
-
-#define efi_call_phys0(f)                       \
-        efi_call0((f))
-#define efi_call_phys1(f, a1)                   \
-        efi_call1((f), (u64)(a1))
-#define efi_call_phys2(f, a1, a2)                       \
-        efi_call2((f), (u64)(a1), (u64)(a2))
-#define efi_call_phys3(f, a1, a2, a3)                           \
-        efi_call3((f), (u64)(a1), (u64)(a2), (u64)(a3))
-#define efi_call_phys4(f, a1, a2, a3, a4)                               \
-        efi_call4((f), (u64)(a1), (u64)(a2), (u64)(a3),         \
-                  (u64)(a4))
-#define efi_call_phys5(f, a1, a2, a3, a4, a5)                           \
-        efi_call5((f), (u64)(a1), (u64)(a2), (u64)(a3),         \
-                  (u64)(a4), (u64)(a5))
-#define efi_call_phys6(f, a1, a2, a3, a4, a5, a6)                       \
-        efi_call6((f), (u64)(a1), (u64)(a2), (u64)(a3),         \
-                  (u64)(a4), (u64)(a5), (u64)(a6))
-
-#define _efi_call_virtX(x, f, ...)                                      \
+#define EFI_LOADER_SIGNATURE    "EL64"
+
+extern u64 asmlinkage efi_call(void *fp, ...);
+
+#define efi_call_phys(f, args...)               efi_call((f), args)
+
+#define efi_call_virt(f, ...)                                           \
 ({                                                                      \
         efi_status_t __s;                                               \
                                                                         \
         efi_sync_low_kernel_mappings();                                 \
         preempt_disable();                                              \
-        __s = efi_call##x((void *)efi.systab->runtime->f, __VA_ARGS__); \
+        __kernel_fpu_begin();                                           \
+        __s = efi_call((void *)efi.systab->runtime->f, __VA_ARGS__);    \
+        __kernel_fpu_end();                                             \
         preempt_enable();                                               \
         __s;                                                            \
 })
 
-#define efi_call_virt0(f)                               \
-        _efi_call_virtX(0, f)
-#define efi_call_virt1(f, a1)                           \
-        _efi_call_virtX(1, f, (u64)(a1))
-#define efi_call_virt2(f, a1, a2)                       \
-        _efi_call_virtX(2, f, (u64)(a1), (u64)(a2))
-#define efi_call_virt3(f, a1, a2, a3)                   \
-        _efi_call_virtX(3, f, (u64)(a1), (u64)(a2), (u64)(a3))
-#define efi_call_virt4(f, a1, a2, a3, a4)               \
-        _efi_call_virtX(4, f, (u64)(a1), (u64)(a2), (u64)(a3), (u64)(a4))
-#define efi_call_virt5(f, a1, a2, a3, a4, a5)           \
-        _efi_call_virtX(5, f, (u64)(a1), (u64)(a2), (u64)(a3), (u64)(a4), (u64)(a5))
-#define efi_call_virt6(f, a1, a2, a3, a4, a5, a6)       \
-        _efi_call_virtX(6, f, (u64)(a1), (u64)(a2), (u64)(a3), (u64)(a4), (u64)(a5), (u64)(a6))
+/*
+ * 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 *efi_ioremap(unsigned long addr, unsigned long size,
                                  u32 type, u64 attribute);
diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index cea1c76d49bf..115e3689cd53 100644
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -87,22 +87,22 @@ static inline int is_x32_frame(void)
 
 static __always_inline __pure bool use_eager_fpu(void)
 {
-        return static_cpu_has(X86_FEATURE_EAGER_FPU);
+        return static_cpu_has_safe(X86_FEATURE_EAGER_FPU);
 }
 
 static __always_inline __pure bool use_xsaveopt(void)
 {
-        return static_cpu_has(X86_FEATURE_XSAVEOPT);
+        return static_cpu_has_safe(X86_FEATURE_XSAVEOPT);
 }
 
 static __always_inline __pure bool use_xsave(void)
 {
-        return static_cpu_has(X86_FEATURE_XSAVE);
+        return static_cpu_has_safe(X86_FEATURE_XSAVE);
 }
 
 static __always_inline __pure bool use_fxsr(void)
 {
-        return static_cpu_has(X86_FEATURE_FXSR);
+        return static_cpu_has_safe(X86_FEATURE_FXSR);
 }
 
 static inline void fx_finit(struct i387_fxsave_struct *fx)
@@ -293,7 +293,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
         /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
            is pending.  Clear the x87 state here by setting it to fixed
            values. "m" is a random variable that should be in L1 */
-        if (unlikely(static_cpu_has(X86_FEATURE_FXSAVE_LEAK))) {
+        if (unlikely(static_cpu_has_safe(X86_FEATURE_FXSAVE_LEAK))) {
                 asm volatile(
                         "fnclex\n\t"
                         "emms\n\t"
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 3781dd39e8bd..835b24820eaa 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -110,7 +110,7 @@ static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt2(get_time, tm, tc);
+        status = efi_call_virt(get_time, tm, tc);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -121,7 +121,7 @@ static efi_status_t virt_efi_set_time(efi_time_t *tm)
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt1(set_time, tm);
+        status = efi_call_virt(set_time, tm);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -134,8 +134,7 @@ static efi_status_t virt_efi_get_wakeup_time(efi_bool_t *enabled,
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt3(get_wakeup_time,
-                                enabled, pending, tm);
+        status = efi_call_virt(get_wakeup_time, enabled, pending, tm);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -146,8 +145,7 @@ static efi_status_t virt_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
         efi_status_t status;
 
         spin_lock_irqsave(&rtc_lock, flags);
-        status = efi_call_virt2(set_wakeup_time,
-                                enabled, tm);
+        status = efi_call_virt(set_wakeup_time, enabled, tm);
         spin_unlock_irqrestore(&rtc_lock, flags);
         return status;
 }
@@ -158,17 +156,17 @@ static efi_status_t virt_efi_get_variable(efi_char16_t *name,
                                           unsigned long *data_size,
                                           void *data)
 {
-        return efi_call_virt5(get_variable,
-                              name, vendor, attr,
-                              data_size, data);
+        return efi_call_virt(get_variable,
+                             name, vendor, attr,
+                             data_size, data);
 }
 
 static efi_status_t virt_efi_get_next_variable(unsigned long *name_size,
                                                efi_char16_t *name,
                                                efi_guid_t *vendor)
 {
-        return efi_call_virt3(get_next_variable,
-                              name_size, name, vendor);
+        return efi_call_virt(get_next_variable,
+                             name_size, name, vendor);
 }
 
 static efi_status_t virt_efi_set_variable(efi_char16_t *name,
@@ -177,9 +175,9 @@ static efi_status_t virt_efi_set_variable(efi_char16_t *name,
                                           unsigned long data_size,
                                           void *data)
 {
-        return efi_call_virt5(set_variable,
-                              name, vendor, attr,
-                              data_size, data);
+        return efi_call_virt(set_variable,
+                             name, vendor, attr,
+                             data_size, data);
 }
 
 static efi_status_t virt_efi_query_variable_info(u32 attr,
@@ -190,13 +188,13 @@ static efi_status_t virt_efi_query_variable_info(u32 attr,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        return efi_call_virt4(query_variable_info, attr, storage_space,
-                              remaining_space, max_variable_size);
+        return efi_call_virt(query_variable_info, attr, storage_space,
+                             remaining_space, max_variable_size);
 }
 
 static efi_status_t virt_efi_get_next_high_mono_count(u32 *count)
 {
-        return efi_call_virt1(get_next_high_mono_count, count);
+        return efi_call_virt(get_next_high_mono_count, count);
 }
 
 static void virt_efi_reset_system(int reset_type,
@@ -204,8 +202,8 @@ static void virt_efi_reset_system(int reset_type,
                                   unsigned long data_size,
                                   efi_char16_t *data)
 {
-        efi_call_virt4(reset_system, reset_type, status,
-                       data_size, data);
+        __efi_call_virt(reset_system, reset_type, status,
+                        data_size, data);
 }
 
 static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules,
@@ -215,7 +213,7 @@ static efi_status_t virt_efi_update_capsule(efi_capsule_header_t **capsules,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        return efi_call_virt3(update_capsule, capsules, count, sg_list);
+        return efi_call_virt(update_capsule, capsules, count, sg_list);
 }
 
 static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
@@ -226,8 +224,8 @@ static efi_status_t virt_efi_query_capsule_caps(efi_capsule_header_t **capsules,
         if (efi.runtime_version < EFI_2_00_SYSTEM_TABLE_REVISION)
                 return EFI_UNSUPPORTED;
 
-        return efi_call_virt4(query_capsule_caps, capsules, count, max_size,
-                              reset_type);
+        return efi_call_virt(query_capsule_caps, capsules, count, max_size,
+                             reset_type);
 }
 
 static efi_status_t __init phys_efi_set_virtual_address_map(
@@ -239,9 +237,9 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
         efi_status_t status;
 
         efi_call_phys_prelog();
-        status = efi_call_phys4(efi_phys.set_virtual_address_map,
-                                memory_map_size, descriptor_size,
-                                descriptor_version, virtual_map);
+        status = efi_call_phys(efi_phys.set_virtual_address_map,
+                               memory_map_size, descriptor_size,
+                               descriptor_version, virtual_map);
         efi_call_phys_epilog();
         return status;
 }
diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
index e0984ef0374b..5fcda7272550 100644
--- a/arch/x86/platform/efi/efi_stub_64.S
+++ b/arch/x86/platform/efi/efi_stub_64.S
@@ -73,84 +73,7 @@
         2:
         .endm
 
-ENTRY(efi_call0)
-        SAVE_XMM
-        subq $32, %rsp
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call0)
-
-ENTRY(efi_call1)
-        SAVE_XMM
-        subq $32, %rsp
-        mov  %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call1)
-
-ENTRY(efi_call2)
-        SAVE_XMM
-        subq $32, %rsp
-        mov  %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call2)
-
-ENTRY(efi_call3)
-        SAVE_XMM
-        subq $32, %rsp
-        mov  %rcx, %r8
-        mov  %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call3)
-
-ENTRY(efi_call4)
-        SAVE_XMM
-        subq $32, %rsp
-        mov %r8, %r9
-        mov %rcx, %r8
-        mov %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $32, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call4)
-
-ENTRY(efi_call5)
-        SAVE_XMM
-        subq $48, %rsp
-        mov %r9, 32(%rsp)
-        mov %r8, %r9
-        mov %rcx, %r8
-        mov %rsi, %rcx
-        SWITCH_PGT
-        call *%rdi
-        RESTORE_PGT
-        addq $48, %rsp
-        RESTORE_XMM
-        ret
-ENDPROC(efi_call5)
-
-ENTRY(efi_call6)
+ENTRY(efi_call)
         SAVE_XMM
         mov (%rsp), %rax
         mov 8(%rax), %rax
@@ -166,7 +89,7 @@ ENTRY(efi_call6)
         addq $48, %rsp
         RESTORE_XMM
         ret
-ENDPROC(efi_call6)
+ENDPROC(efi_call)
 
 #ifdef CONFIG_EFI_MIXED
 
diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 766612137a62..1584cbed0dce 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -39,7 +39,7 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)
                  */
                 return BIOS_STATUS_UNIMPLEMENTED;
 
-        ret = efi_call6((void *)__va(tab->function), (u64)which,
+        ret = efi_call((void *)__va(tab->function), (u64)which,
                         a1, a2, a3, a4, a5);
         return ret;
 }