ARM: 8559/1: errata: Workaround erratum A12 821420

This erratum has a very simple workaround (set a bit in a register), so
let's apply it.  Apparently the workaround's downside is a very slight
power impact.

Note that applying this errata fixes deadlocks that are easy to
reproduce with real world applications.

The arguments for why this needs to be in the kernel are similar to the
arugments made in the patch "Workaround errata A12 818325/852422 A17
852423".

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 39cd37f29aafb16ca6926d0600ac475d1b1753c6..ed275aa293e58014efcb1b158758f855efa5832c 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1200,6 +1200,16 @@ config ARM_ERRATA_818325_852422
          Feature Register. This bit disables an optimisation applied to a
          sequence of 2 instructions that use opposing condition codes.
 
+config ARM_ERRATA_821420
+       bool "ARM errata: A12: sequence of VMOV to core registers might lead to a dead lock"
+       depends on CPU_V7
+       help
+         This option enables the workaround for the 821420 Cortex-A12
+         (all revs) erratum. In very rare timing conditions, a sequence
+         of VMOV to Core registers instructions, for which the second
+         one is in the shadow of a branch or abort, can lead to a
+         deadlock when the VMOV instructions are issued out-of-order.
+
 config ARM_ERRATA_852423
        bool "ARM errata: A17: some seqs of opposed cond code instrs => deadlock or corruption"
        depends on CPU_V7

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index b20b02e0b727f99f29d7abe2aae990783172c509..eefc10ff8e7e871d3d9cba136dc81dc5d70c585f 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -367,6 +367,11 @@ __ca12_errata:
        mrc     p15, 0, r10, c15, c0, 1         @ read diagnostic register
        orr     r10, r10, #1 << 12              @ set bit #12
        mcr     p15, 0, r10, c15, c0, 1         @ write diagnostic register
+#endif
+#ifdef CONFIG_ARM_ERRATA_821420
+       mrc     p15, 0, r10, c15, c0, 2         @ read internal feature reg
+       orr     r10, r10, #1 << 1               @ set bit #1
+       mcr     p15, 0, r10, c15, c0, 2         @ write internal feature reg
 #endif
        b       __errata_finish