Commit 04fcab32 authored by Gregory Fong's avatar Gregory Fong Committed by Russell King

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: default avatarGregory Fong <gregory.0xf0@gmail.com>
Acked-by: default avatarMarc Carino <marc.ceeeee@gmail.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c51e78ed
...@@ -92,15 +92,19 @@ void erratum_a15_798181_init(void) ...@@ -92,15 +92,19 @@ void erratum_a15_798181_init(void)
unsigned int midr = read_cpuid_id(); unsigned int midr = read_cpuid_id();
unsigned int revidr = read_cpuid(CPUID_REVIDR); unsigned int revidr = read_cpuid(CPUID_REVIDR);
/* Cortex-A15 r0p0..r3p2 w/o ECO fix affected */ /* Brahma-B15 r0p0..r0p2 affected
if ((midr & 0xff0ffff0) != 0x410fc0f0 || midr > 0x413fc0f2 || * Cortex-A15 r0p0..r3p2 w/o ECO fix affected */
(revidr & 0x210) == 0x210) { if ((midr & 0xff0ffff0) == 0x420f00f0 && midr <= 0x420f00f2)
return;
}
if (revidr & 0x10)
erratum_a15_798181_handler = erratum_a15_798181_partial;
else
erratum_a15_798181_handler = erratum_a15_798181_broadcast; 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 #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment