Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753290AbcD1KsU (ORCPT ); Thu, 28 Apr 2016 06:48:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48686 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753090AbcD1KsQ (ORCPT ); Thu, 28 Apr 2016 06:48:16 -0400 Date: Thu, 28 Apr 2016 03:45:44 -0700 From: tip-bot for Mark Rutland Message-ID: Cc: mark.rutland@arm.com, dhowells@redhat.com, hpa@zytor.com, ard.biesheuvel@linaro.org, will.deacon@arm.com, hertzog@debian.org, mingo@kernel.org, ben@decadent.org.uk, dvhart@infradead.org, leif.lindholm@linaro.org, pjones@redhat.com, hock.leong.kweh@intel.com, matt@codeblueprint.co.uk, catalin.marinas@arm.com, James.Bottomley@HansenPartnership.com, peterz@infradead.org, bp@alien8.de, hch@lst.de, dh.herrmann@gmail.com, tglx@linutronix.de, gregkh@linuxfoundation.org, linux@arm.linux.org.uk, hare@suse.de, linux-kernel@vger.kernel.org Reply-To: ard.biesheuvel@linaro.org, will.deacon@arm.com, hertzog@debian.org, mingo@kernel.org, ben@decadent.org.uk, dhowells@redhat.com, mark.rutland@arm.com, hpa@zytor.com, hock.leong.kweh@intel.com, matt@codeblueprint.co.uk, dvhart@infradead.org, leif.lindholm@linaro.org, pjones@redhat.com, bp@alien8.de, peterz@infradead.org, James.Bottomley@HansenPartnership.com, catalin.marinas@arm.com, gregkh@linuxfoundation.org, linux@arm.linux.org.uk, hare@suse.de, linux-kernel@vger.kernel.org, hch@lst.de, dh.herrmann@gmail.com, tglx@linutronix.de In-Reply-To: <1461614832-17633-40-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-40-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] x86/efi: Enable runtime call flag checking Git-Commit-ID: 9788375dc4cdc9c00645028384fb40402eab774f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2319 Lines: 67 Commit-ID: 9788375dc4cdc9c00645028384fb40402eab774f Gitweb: http://git.kernel.org/tip/9788375dc4cdc9c00645028384fb40402eab774f Author: Mark Rutland AuthorDate: Mon, 25 Apr 2016 21:07:11 +0100 Committer: Ingo Molnar 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 Signed-off-by: Matt Fleming Cc: Ard Biesheuvel Cc: Ben Hutchings Cc: Borislav Petkov Cc: Catalin Marinas Cc: Christoph Hellwig Cc: Darren Hart Cc: David Herrmann Cc: David Howells Cc: Greg KH Cc: Hannes Reinecke Cc: Harald Hoyer harald@redhat.com Cc: James Bottomley Cc: Kweh Hock Leong Cc: Leif Lindholm Cc: Peter Jones Cc: Peter Zijlstra Cc: Raphael Hertzog Cc: Russell King Cc: Thomas Gleixner Cc: Will Deacon Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-40-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- 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 #include +#include #include /* @@ -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 *, ...);