Skip to contentSkip to conversation

Patch "ARM: 8642/1: LPAE: catch pending imprecise abort on unmask" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Feb 10, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: 8642/1: LPAE: catch pending imprecise abort on unmask

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-8642-1-lpae-catch-pending-imprecise-abort-on-unmask.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 97a98ae5b8acf08d07d972c087b2def060bc9b73 Mon Sep 17 00:00:00 2001

From: Alexander Sverdlin <[email protected]>
Date: Tue, 17 Jan 2017 21:10:11 +0100
Subject: ARM: 8642/1: LPAE: catch pending imprecise abort on unmask

From: Alexander Sverdlin <[email protected]>

commit 97a98ae5b8acf08d07d972c087b2def060bc9b73 upstream.

Asynchronous external abort is coded differently in DFSR with LPAE enabled.

Fixes 9254970c "ARM: 8447/1: catch pending imprecise abort on unmask".
Cc Russell King <[email protected]>
Cc Andrew Morton <[email protected]>
---
 arch/arm/mm/fault.c |    4 ++--
 arch/arm/mm/fault.h |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mm/fault.c +2 -2
@@ -610,9 +610,9 @@ static int __init early_abort_handler(un
 
 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
@@ -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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/arm-8642-1-lpae-catch-pending-imprecise-abort-on-unmask.patch