From 6d1f679bb5c4468da52f1a8aab05748423b4ffe3 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 11 Jan 2013 17:12:32 +0100 Subject: [PATCH] ARM: Errata 743622 Restrict the appliance of ERRATA 743622 to CPU revisions: r2p0-r2p2. Was 'foc_arm_errata.patch' --- kernel/fiasco/src/kern/arm/cpu-arm.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kernel/fiasco/src/kern/arm/cpu-arm.cpp b/kernel/fiasco/src/kern/arm/cpu-arm.cpp index dddedde6..4267083f 100644 --- a/kernel/fiasco/src/kern/arm/cpu-arm.cpp +++ b/kernel/fiasco/src/kern/arm/cpu-arm.cpp @@ -462,7 +462,13 @@ Cpu::id_init() } //--------------------------------------------------------------------------- -IMPLEMENTATION [arm && armv6plus]: +IMPLEMENTATION [arm && armv6plus && omap4_pandaboard]: + +PRIVATE static inline +void Cpu::init_errata_workarounds() {} + +//--------------------------------------------------------------------------- +IMPLEMENTATION [arm && armv6plus && !omap4_pandaboard]: PRIVATE static inline void @@ -562,8 +568,8 @@ Cpu::init_errata_workarounds() if (rev == 0x20 || rev == 0x21 || rev == 0x22) set_c15_c0_1((1 << 12) | (1 << 22)); - // errata: 743622 - if ((rev & 0xf0) == 0x20) + // errata: 743622 (r2p0 - r2p2) + if ((rev & 0xf0) == 0x20 && (rev & 0xf) < 0x3) set_c15_c0_1(1 << 6); // errata: 751472