ARM: 8642/1: LPAE: catch pending imprecise abort on unmask (97a98ae5) · Commits · 戴 / test

Asynchronous external abort is coded differently in DFSR with LPAE enabled. Fixes: "ARM: 8447/1: catch pending imprecise abort on unmask". Signed-off-by:

Alexander Sverdlin <alexander.sverdlin@nokia.com> Cc: Russell King <linux@armlinux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mm/fault.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -610,9 +610,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr,

		void __init early_abt_enable(void)
		{
		fsr_info[22].fn = early_abort_handler;
		fsr_info[FSR_FS_AEA].fn = early_abort_handler;
		local_abt_enable();
		fsr_info[22].fn = do_bad;
		fsr_info[FSR_FS_AEA].fn = do_bad;
		}

		#ifndef CONFIG_ARM_LPAE

arch/arm/mm/fault.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,11 +11,15 @@
		#define FSR_FS5_0 (0x3f)

		#ifdef CONFIG_ARM_LPAE
		#define FSR_FS_AEA 17

		static inline int fsr_fs(unsigned int fsr)
		{
		return fsr & FSR_FS5_0;
		}
		#else
		#define FSR_FS_AEA 22

		static inline int fsr_fs(unsigned int fsr)
		{
		return (fsr & FSR_FS3_0) \| (fsr & FSR_FS4) >> 6;

Admin message