ARM: 8111/1: Enable erratum 798181 for Broadcom Brahma-B15

Broadcom Brahma-B15 (r0p0..r0p2) is also affected by Cortex-A15
erratum 798181, so enable the workaround for Brahma-B15.

Signed-off-by: Gregory Fong <gregory.0xf0@gmail.com>
Acked-by: Marc Carino <marc.ceeeee@gmail.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 12 insertions, 8 deletions

diff --git a/arch/arm/kernel/smp_tlb.c b/arch/arm/kernel/smp_tlb.c
index 95d063620b76..2e72be4f623e 100644
--- a/arch/arm/kernel/smp_tlb.c
+++ b/arch/arm/kernel/smp_tlb.c
@@ -92,15 +92,19 @@ void erratum_a15_798181_init(void)
         unsigned int midr = read_cpuid_id();
         unsigned int revidr = read_cpuid(CPUID_REVIDR);
 
-        /* Cortex-A15 r0p0..r3p2 w/o ECO fix affected */
-        if ((midr & 0xff0ffff0) != 0x410fc0f0 || midr > 0x413fc0f2 ||
-            (revidr & 0x210) == 0x210) {
-                return;
-        }
-        if (revidr & 0x10)
-                erratum_a15_798181_handler = erratum_a15_798181_partial;
-        else
+        /* Brahma-B15 r0p0..r0p2 affected
+         * Cortex-A15 r0p0..r3p2 w/o ECO fix affected */
+        if ((midr & 0xff0ffff0) == 0x420f00f0 && midr <= 0x420f00f2)
                 erratum_a15_798181_handler = erratum_a15_798181_broadcast;
+        else if ((midr & 0xff0ffff0) == 0x410fc0f0 && midr <= 0x413fc0f2 &&
+                 (revidr & 0x210) != 0x210) {
+                if (revidr & 0x10)
+                        erratum_a15_798181_handler =
+                                erratum_a15_798181_partial;
+                else
+                        erratum_a15_798181_handler =
+                                erratum_a15_798181_broadcast;
+        }
 }
 #endif