| Message ID | 1461591994-14918-3-git-send-email-mark.rutland@arm.com |
|---|---|
| State | Accepted |
| Commit | ee6cab5d4aba1df12e0386d22c5a1c4e71d34b31 |
| Headers | show |
On Mon, Apr 25, 2016 at 02:46:31PM +0100, Mark Rutland wrote: > Define ARCH_EFI_IRQ_FLAGS_MASK for arm64, which will enable the generic > runtime wrapper code to detect when firmware erroneously modifies flags > over a runtime services function call. > > Signed-off-by: Mark Rutland <mark.rutland@arm.com> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Leif Lindholm <leif.lindholm@linaro.org> > Cc: Matt Fleming <matt@codeblueprint.co.uk> > Cc: Will Deacon <will.deacon@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-efi@vger.kernel.org > --- > arch/arm64/include/asm/efi.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h > index f4f71224..b44603e 100644 > --- a/arch/arm64/include/asm/efi.h > +++ b/arch/arm64/include/asm/efi.h > @@ -4,6 +4,7 @@ > #include <asm/io.h> > #include <asm/mmu_context.h> > #include <asm/neon.h> > +#include <asm/ptrace.h> > #include <asm/tlbflush.h> > > #ifdef CONFIG_EFI > @@ -33,6 +34,8 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); > kernel_neon_end(); \ > }) > > +#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT) I look forward to the day when the firmware returns in big-endian AArch32 ;) Anyway, this looks good to me: Acked-by: Will Deacon <will.deacon@arm.com> Will
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index f4f71224..b44603e 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -4,6 +4,7 @@ #include <asm/io.h> #include <asm/mmu_context.h> #include <asm/neon.h> +#include <asm/ptrace.h> #include <asm/tlbflush.h> #ifdef CONFIG_EFI @@ -33,6 +34,8 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); kernel_neon_end(); \ }) +#define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT) + /* arch specific definitions used by the stub code */ /*
Define ARCH_EFI_IRQ_FLAGS_MASK for arm64, which will enable the generic runtime wrapper code to detect when firmware erroneously modifies flags over a runtime services function call. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org --- arch/arm64/include/asm/efi.h | 3 +++ 1 file changed, 3 insertions(+) -- 1.9.1