diff options
| author | Tien Fong Chee <tien.fong.chee@intel.com> | 2018-06-27 13:50:20 +0800 |
|---|---|---|
| committer | Tien Fong Chee <tien.fong.chee@intel.com> | 2018-06-27 13:50:20 +0800 |
| commit | c60a78e486f4727465287f13bec06ea9b9cf9889 (patch) | |
| tree | d3b8c90659199a169efa0d7149bd76bc1e83cbbb | |
| parent | 2a2102e92e470beec51d8b2dea8323cfc92f92b1 (diff) | |
| download | u-boot-socfpga-c60a78e486f4727465287f13bec06ea9b9cf9889.tar.gz | |
FogBugz #568246-1: arm: Add workaround for Cortex-A9 errata 845369
This workaround is porting from U-boot mainstream with minor modification
by removing the Kconfig to fit into downstream which is not fully
supporting Kconfig.
http://git.denx.de/?p=u-boot.git;a=commit;h=11d94319c32cc8590db2f1e186d19f32e652436c
Comment of patch from mainstream:
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: Tien Fong Chee <tien.fong.chee@intel.com>
| -rw-r--r-- | arch/arm/cpu/armv7/start.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index fedd7c8f7e..424461716f 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -169,6 +169,12 @@ ENTRY(cpu_init_cp15) 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 pc, lr @ back to my caller ENDPROC(cpu_init_cp15) |