summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin Garg <nitin.garg@freescale.com>2014-04-01 22:17:37 -0500
committerNitin Garg <nitin.garg@freescale.com>2014-04-02 19:43:01 -0500
commitff019a8c415296b9dad340a98f7bfead98404935 (patch)
tree2ca4ce57204a311d135979f37292f61f042ab371
parentd503c8268ff7bebddcc6d8041d404f2a5be38591 (diff)
downloadu-boot-imx-ff019a8c415296b9dad340a98f7bfead98404935.zip
u-boot-imx-ff019a8c415296b9dad340a98f7bfead98404935.tar.gz
u-boot-imx-ff019a8c415296b9dad340a98f7bfead98404935.tar.bz2
ENGR00306276-1: ARM: Add workaround for Cortex-A9 errata 794072
A short loop including a DMB instruction might cause a denial of service on another processor which executes a CP15 broadcast operation. Exists on r1, r2, r3, r4 revisions. Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
-rw-r--r--README1
-rw-r--r--arch/arm/cpu/armv7/start.S2
2 files changed, 2 insertions, 1 deletions
diff --git a/README b/README
index 8b13b2a..d0f32ad 100644
--- a/README
+++ b/README
@@ -489,6 +489,7 @@ The following options need to be configured:
CONFIG_ARM_ERRATA_742230
CONFIG_ARM_ERRATA_743622
CONFIG_ARM_ERRATA_751472
+ CONFIG_ARM_ERRATA_794072
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 e9e57e6..38b6021 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -315,7 +315,7 @@ ENTRY(cpu_init_cp15)
mcr p15, 0, r0, c1, c0, 0 @ write system control register
#endif
-#ifdef CONFIG_ARM_ERRATA_742230
+#if (defined(CONFIG_ARM_ERRATA_742230) || defined(CONFIG_ARM_ERRATA_794072))
mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register
orr r0, r0, #1 << 4 @ set bit #4
mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register