[1/2] arm: Add ARM ERRATA 775420 workaround

Commit Message

Simon Horman Sept. 21, 2012, 1:04 a.m. UTC

On Thu, Sep 20, 2012 at 10:58:53AM +0100, Catalin Marinas wrote:
> On 12 September 2012 08:14, Simon Horman <[e-mail]> wrote:
> > +config ARM_ERRATA_775420
> > +       bool "ARM errata: A data cache maintenance operation which aborts, might lead to deadlock"
> > +       depends on CPU_V7
> > +       help
> > +         This option enables the workaround for the 775420 Cortex-A9 (r2p2,
> > +         r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance
> > +         operation aborts with MMU exception, it might cause the processor
> > +         deadlock. This workaround puts DSB before executing ISB at the
> > +         beginning of the abort exception handler.
> > +
> >  endmenu
> 
> The only case where we can get an abort on cache maintenance is
> v7_coherent_user_range(). I don't think we have any ISB on the
> exception handling path for this function, so we could just add the
> DSB there:

I think that an advantage of Abe-san's implementation is that
it might to be a bit more robust. But your proposal is certainly
much cleaner and for that reason I agree it is a good option.

I've updated the patch, but since the code is now all yours
I'm unsure if the author should be changed or not.

----------------------------------------------------------------
From: Kouei Abe <[e-mail]>

arm: Add ARM ERRATA 775420 workaround

Workaround for the 775420 Cortex-A9 (r2p2, r2p6,r2p8,r2p10,r3p0) erratum.
In case a date cache maintenance operation aborts with MMU exception, it
might cause the processor to deadlock. This workaround puts DSB before
executing ISB if an abort may occur on cache maintenance.

Based on work by Kouei Abe and feedback from Catalin Marinas.

Cc: Catalin Marinas <[e-mail]>
Signed-off-by: Kouei Abe <[e-mail]>
Signed-off-by: Simon Horman <[e-mail]>

---

v2
* Add some details to changelog entry
* Alternate implementation suggested by Catalin Marinas
  - Add the dsb directly to v7_coherent_user_range() rather
    than the exception handler
---
 arch/arm/Kconfig       |   10 ++++++++++
 arch/arm/mm/cache-v7.S |    3 +++
 2 files changed, 13 insertions(+)

Comments

Catalin Marinas Sept. 21, 2012, 8:29 a.m. UTC | #1

On Fri, Sep 21, 2012 at 02:04:04AM +0100, Simon Horman wrote:
> On Thu, Sep 20, 2012 at 10:58:53AM +0100, Catalin Marinas wrote:
> > On 12 September 2012 08:14, Simon Horman <[e-mail]> wrote:
> > > +config ARM_ERRATA_775420
> > > +       bool "ARM errata: A data cache maintenance operation which aborts, might lead to deadlock"
> > > +       depends on CPU_V7
> > > +       help
> > > +         This option enables the workaround for the 775420 Cortex-A9 (r2p2,
> > > +         r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance
> > > +         operation aborts with MMU exception, it might cause the processor
> > > +         deadlock. This workaround puts DSB before executing ISB at the
> > > +         beginning of the abort exception handler.
> > > +
> > >  endmenu
> > 
> > The only case where we can get an abort on cache maintenance is
> > v7_coherent_user_range(). I don't think we have any ISB on the
> > exception handling path for this function, so we could just add the
> > DSB there:
> 
> I think that an advantage of Abe-san's implementation is that
> it might to be a bit more robust. But your proposal is certainly
> much cleaner and for that reason I agree it is a good option.

It is more robust but I'm not sure it's worth putting a DSB a any data
abort.

> I've updated the patch, but since the code is now all yours
> I'm unsure if the author should be changed or not.

But the Kconfig entry is yours and it has more lines :)

Acked-by: Catalin Marinas <[e-mail]>

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2f88d8d..48c19d4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1413,6 +1413,16 @@  config PL310_ERRATA_769419
 	  on systems with an outer cache, the store buffer is drained
 	  explicitly.
 
+config ARM_ERRATA_775420
+       bool "ARM errata: A data cache maintenance operation which aborts, might lead to deadlock"
+       depends on CPU_V7
+       help
+	 This option enables the workaround for the 775420 Cortex-A9 (r2p2,
+	 r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance
+	 operation aborts with MMU exception, it might cause the processor
+	 to deadlock. This workaround puts DSB before executing ISB if
+	 an abort may occur on cache maintenance.
+
 endmenu
 
 source "arch/arm/common/Kconfig"
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 39e3fb3..3b17227 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -211,6 +211,9 @@  ENTRY(v7_coherent_user_range)
  * isn't mapped, fail with -EFAULT.
  */
 9001:
+#ifdef CONFIG_ARM_ERRATA_775420
+	dsb
+#endif
 	mov	r0, #-EFAULT
 	mov	pc, lr
  UNWIND(.fnend		)