summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/abort-ev7.S
diff options
context:
space:
mode:
authorDave Estes <cestes@quicinc.com>2009-08-11 23:58:49 +0200
committerDaniel Walker <dwalker@codeaurora.org>2010-05-03 20:15:05 +0200
commite220ba60223a9d63e70217e5b112160df8c21cea (patch)
treecdbdcbd9865d10ed0d3b977bc254c1ee0328e460 /arch/arm/mm/abort-ev7.S
parentarm: msm: add oprofile pmu support (diff)
downloadlinux-e220ba60223a9d63e70217e5b112160df8c21cea.tar.xz
linux-e220ba60223a9d63e70217e5b112160df8c21cea.zip
arm: mm: qsd8x50: Fix incorrect permission faults
Handle incorrectly reported permission faults for qsd8650. On permission faults, retry MVA to PA conversion. If retry detects translation fault. Report as translation fault. Cc: Jamie Lokier <jamie@shareable.org> Signed-off-by: Dave Estes <cestes@quicinc.com>
Diffstat (limited to 'arch/arm/mm/abort-ev7.S')
-rw-r--r--arch/arm/mm/abort-ev7.S21
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mm/abort-ev7.S b/arch/arm/mm/abort-ev7.S
index 2e6dc040c654..ec88b157d3bb 100644
--- a/arch/arm/mm/abort-ev7.S
+++ b/arch/arm/mm/abort-ev7.S
@@ -29,5 +29,26 @@ ENTRY(v7_early_abort)
* V6 code adjusts the returned DFSR.
* New designs should not need to patch up faults.
*/
+
+#if defined(CONFIG_VERIFY_PERMISSION_FAULT)
+ /*
+ * Detect erroneous permission failures and fix
+ */
+ ldr r3, =0x40d @ On permission fault
+ and r3, r1, r3
+ cmp r3, #0x0d
+ movne pc, lr
+
+ mcr p15, 0, r0, c7, c8, 0 @ Retranslate FAR
+ isb
+ mrc p15, 0, r2, c7, c4, 0 @ Read the PAR
+ and r3, r2, #0x7b @ On translation fault
+ cmp r3, #0x0b
+ movne pc, lr
+ bic r1, r1, #0xf @ Fix up FSR FS[5:0]
+ and r2, r2, #0x7e
+ orr r1, r1, r2, LSR #1
+#endif
+
mov pc, lr
ENDPROC(v7_early_abort)