diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2015-08-30 16:55:49 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-09-02 21:28:25 -0600 |
| commit | 81b0618ddf449aab669b42068ad8c90f63714c14 (patch) | |
| tree | 1350181c3ca0be07b3951a2a881d951449da67f6 /arch/arm/cpu/armv7/cpu.c | |
| parent | 6460fc42a1fe4de24a68a64cba7ce84b1fe5bcb1 (diff) | |
| download | blackbird-obmc-uboot-81b0618ddf449aab669b42068ad8c90f63714c14.tar.gz blackbird-obmc-uboot-81b0618ddf449aab669b42068ad8c90f63714c14.zip | |
arm: Turn of d-cache before i-cache
Booting the kernel fails on RK3288 (and probably other rockchip SoCs)
when the i-cache is disabled/flushed before d-cache.
I have not investigated whether this is due to U-Boot hanging or whether
it's very early in the linux boot, but following the approach of the
various rockchip U-Boot forks (first disable d-cache then i-cache) makes
things work.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/cpu/armv7/cpu.c')
| -rw-r--r-- | arch/arm/cpu/armv7/cpu.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/cpu.c b/arch/arm/cpu/armv7/cpu.c index 0b0e5003cc..6eac5ef3fe 100644 --- a/arch/arm/cpu/armv7/cpu.c +++ b/arch/arm/cpu/armv7/cpu.c @@ -36,12 +36,6 @@ int cleanup_before_linux_select(int flags) disable_interrupts(); #endif - /* - * Turn off I-cache and invalidate it - */ - icache_disable(); - invalidate_icache_all(); - if (flags & CBL_DISABLE_CACHES) { /* * turn off D-cache @@ -61,7 +55,16 @@ int cleanup_before_linux_select(int flags) * to avoid coherency problems for kernel */ invalidate_dcache_all(); + + icache_disable(); + invalidate_icache_all(); } else { + /* + * Turn off I-cache and invalidate it + */ + icache_disable(); + invalidate_icache_all(); + flush_dcache_all(); invalidate_icache_all(); icache_enable(); |
