From f20a65847577ff40dc7e3739a0bb69926885c734 Mon Sep 17 00:00:00 2001 From: Nitin Garg Date: Tue, 31 Mar 2015 20:37:36 -0500 Subject: [PATCH] MLK-10524: iMX6x: Implement workaround for Cortex-A9 errata 845369 Under very rare timing circumstances, transitioning into streaming mode might create a data corruption. Present on Two or more processors or 1 core with ACP, all revisions. This erratum can be worked round by setting bit[22] of the undocumented Diagnostic Control Register to 1. Signed-off-by: Nitin Garg (cherry picked from commit 70ad44e523680de67dd8b7a7505d7f27799980ee) --- README | 1 + arch/arm/cpu/armv7/start.S | 6 ++++++ include/configs/mx6_common.h | 1 + 3 files changed, 8 insertions(+) diff --git a/README b/README index b2eee19773..e3db537130 100644 --- a/README +++ b/README @@ -645,6 +645,7 @@ The following options need to be configured: CONFIG_ARM_ERRATA_773022 CONFIG_ARM_ERRATA_774769 CONFIG_ARM_ERRATA_794072 + CONFIG_ARM_ERRATA_845369 If set, the workarounds for these ARM errata are applied early during U-Boot startup. Note that these options force the diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index b18094447b..e3e8b7ff54 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -9,6 +9,7 @@ * Copyright (c) 2003 Richard Woodruff * Copyright (c) 2003 Kshitij * Copyright (c) 2006-2008 Syed Mohammed Khasim + * Copyright (C) 2016 Freescale Semiconductor, Inc. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -163,6 +164,11 @@ ENTRY(cpu_init_cp15) orr r0, r0, #1 << 21 @ set bit #21 mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register #endif +#ifdef CONFIG_ARM_ERRATA_845369 + mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register + orr r0, r0, #1 << 22 @ set bit #22 + mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register +#endif mov r5, lr @ Store my Caller mrc p15, 0, r1, c0, c0, 0 @ r1 has Read Main ID Register (MIDR) diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index a228618b10..cf1e826394 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -13,6 +13,7 @@ #define CONFIG_ARM_ERRATA_751472 #define CONFIG_ARM_ERRATA_794072 #define CONFIG_ARM_ERRATA_761320 +#define CONFIG_ARM_ERRATA_845369 #ifndef CONFIG_SYS_L2CACHE_OFF #define CONFIG_SYS_L2_PL310