Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[deliverable/linux.git] / arch / arm / mm / proc-v7.S

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 6fcaac8e200f888e18207ae6cdfeca8adc000c5e..a7123b4e129dfc40f9c0d0df4417d086e23ee9a0 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -362,6 +362,39 @@ __ca15_errata:
 #endif
        b       __errata_finish
 
+__ca12_errata:
+#ifdef CONFIG_ARM_ERRATA_818325_852422
+       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
+#ifdef CONFIG_ARM_ERRATA_825619
+       mrc     p15, 0, r10, c15, c0, 1         @ read diagnostic register
+       orr     r10, r10, #1 << 24              @ set bit #24
+       mcr     p15, 0, r10, c15, c0, 1         @ write diagnostic register
+#endif
+       b       __errata_finish
+
+__ca17_errata:
+#ifdef CONFIG_ARM_ERRATA_852421
+       cmp     r6, #0x12                       @ only present up to r1p2
+       mrcle   p15, 0, r10, c15, c0, 1         @ read diagnostic register
+       orrle   r10, r10, #1 << 24              @ set bit #24
+       mcrle   p15, 0, r10, c15, c0, 1         @ write diagnostic register
+#endif
+#ifdef CONFIG_ARM_ERRATA_852423
+       cmp     r6, #0x12                       @ only present up to r1p2
+       mrcle   p15, 0, r10, c15, c0, 1         @ read diagnostic register
+       orrle   r10, r10, #1 << 12              @ set bit #12
+       mcrle   p15, 0, r10, c15, c0, 1         @ write diagnostic register
+#endif
+       b       __errata_finish
+
 __v7_pj4b_setup:
 #ifdef CONFIG_CPU_PJ4B
 
@@ -443,6 +476,16 @@ __v7_setup_cont:
        teq     r0, r10
        beq     __ca9_errata
 
+       /* Cortex-A12 Errata */
+       ldr     r10, =0x00000c0d                @ Cortex-A12 primary part number
+       teq     r0, r10
+       beq     __ca12_errata
+
+       /* Cortex-A17 Errata */
+       ldr     r10, =0x00000c0e                @ Cortex-A17 primary part number
+       teq     r0, r10
+       beq     __ca17_errata
+
        /* Cortex-A15 Errata */
        ldr     r10, =0x00000c0f                @ Cortex-A15 primary part number
        teq     r0, r10