From 12493531960bc4eaab7755df097fbcb0b6cd832f Mon Sep 17 00:00:00 2001
From: Dave Estes <cestes@quicinc.com>
Date: Tue, 11 Aug 2009 17:58:49 -0400
Subject: [PATCH] --- yaml --- r: 191845 b: refs/heads/master c:
 e220ba60223a9d63e70217e5b112160df8c21cea h: refs/heads/master i:   191843:
 c540f15c657d913d05d97f5c674cdfe9a4b02285 v: v3

---
 [refs]                        |  2 +-
 trunk/arch/arm/mm/Kconfig     |  2 ++
 trunk/arch/arm/mm/abort-ev7.S | 21 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4b9e4cd3210e..2b661369f07e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee3c454b8da04815c1884ed85fe89d2d131c0e51
+refs/heads/master: e220ba60223a9d63e70217e5b112160df8c21cea
diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig
index 5bd7c89a6045..d3022dabb4aa 100644
--- a/trunk/arch/arm/mm/Kconfig
+++ b/trunk/arch/arm/mm/Kconfig
@@ -572,6 +572,8 @@ config CPU_TLB_V6
 config CPU_TLB_V7
 	bool
 
+config VERIFY_PERMISSION_FAULT
+	bool
 endif
 
 config CPU_HAS_ASID
diff --git a/trunk/arch/arm/mm/abort-ev7.S b/trunk/arch/arm/mm/abort-ev7.S
index 2e6dc040c654..ec88b157d3bb 100644
--- a/trunk/arch/arm/mm/abort-ev7.S
+++ b/trunk/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)