Commit-ID: 9788375dc4cdc9c00645028384fb40402eab774f Gitweb: http://git.kernel.org/tip/9788375dc4cdc9c00645028384fb40402eab774f Author: Mark Rutland <mark.rutl...@arm.com> AuthorDate: Mon, 25 Apr 2016 21:07:11 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Thu, 28 Apr 2016 11:34:13 +0200
x86/efi: Enable runtime call flag checking Define ARCH_EFI_IRQ_FLAGS_MASK for x86, which will enable the generic runtime wrapper code to detect when firmware erroneously modifies flags over a runtime services function call. For x86 (both 32-bit and 64-bit), we only need check the interrupt flag. Signed-off-by: Mark Rutland <mark.rutl...@arm.com> Signed-off-by: Matt Fleming <m...@codeblueprint.co.uk> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> Cc: Ben Hutchings <b...@decadent.org.uk> Cc: Borislav Petkov <b...@alien8.de> Cc: Catalin Marinas <catalin.mari...@arm.com> Cc: Christoph Hellwig <h...@lst.de> Cc: Darren Hart <dvh...@infradead.org> Cc: David Herrmann <dh.herrm...@gmail.com> Cc: David Howells <dhowe...@redhat.com> Cc: Greg KH <gre...@linuxfoundation.org> Cc: Hannes Reinecke <h...@suse.de> Cc: Harald Hoyer har...@redhat.com Cc: James Bottomley <james.bottom...@hansenpartnership.com> Cc: Kweh Hock Leong <hock.leong.k...@intel.com> Cc: Leif Lindholm <leif.lindh...@linaro.org> Cc: Peter Jones <pjo...@redhat.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Raphael Hertzog <hert...@debian.org> Cc: Russell King <li...@arm.linux.org.uk> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Will Deacon <will.dea...@arm.com> Cc: linux-...@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-40-git-send-email-m...@codeblueprint.co.uk Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/include/asm/efi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index fb085ce..78d1e74 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,8 +29,9 @@ #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 *, ...);