diff options
| author | Ricardo Neri <ricardo.neri-calderon@linux.intel.com> | 2014-03-27 15:10:43 -0700 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-04-17 13:26:33 +0100 |
| commit | b738c6ea49b4e98e6ca0651da82a610f996a16ae (patch) | |
| tree | 54376d57ee0c3befdde3302df4d9a1c13af88439 | |
| parent | de05764e0b2a3d9559e099a2e134f8cef4500fdd (diff) | |
| download | op-kernel-dev-b738c6ea49b4e98e6ca0651da82a610f996a16ae.zip op-kernel-dev-b738c6ea49b4e98e6ca0651da82a610f996a16ae.tar.gz | |
x86/efi: Save and restore FPU context around efi_calls (i386)
Do a complete FPU context save/restore around the EFI calls. This required
as runtime EFI firmware may potentially use the FPU.
This change covers only the i386 configuration.
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | arch/x86/include/asm/efi.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 0b19187..1eb5f64 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -34,10 +34,23 @@ extern unsigned long asmlinkage efi_call_phys(void *, ...); /* 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) +({ \ + 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...) efi_call_virt(f, args) +#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) |
