diff options
| author | Tom Rini <trini@konsulko.com> | 2017-11-24 11:45:15 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-24 11:45:15 -0500 |
| commit | 93a51d301ad051ec6f8c6016862c7719b8b434d3 (patch) | |
| tree | 440cb71963adf70d5beebdc1c63d1ac0b1c18750 /arch | |
| parent | bb7ab1ccfec9aa4e2df3e8eb49ca85f6c0c65560 (diff) | |
| parent | f2a226780fa0e4055bec636b8108bf7e80951174 (diff) | |
Merge git://git.denx.de/u-boot-arc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arc/lib/bootm.c | 8 | ||||
| -rw-r--r-- | arch/arc/lib/cache.c | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index a498ce5b29..9eef7070cf 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -88,11 +88,11 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) r2 = (unsigned int)env_get("bootargs"); } - smp_set_core_boot_addr((unsigned long)kernel_entry, -1); - smp_kick_all_cpus(); - - if (!fake) + if (!fake) { + smp_set_core_boot_addr((unsigned long)kernel_entry, -1); + smp_kick_all_cpus(); kernel_entry(r0, 0, r2); + } } int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) diff --git a/arch/arc/lib/cache.c b/arch/arc/lib/cache.c index cbae27e9fc..d8741fe959 100644 --- a/arch/arc/lib/cache.c +++ b/arch/arc/lib/cache.c @@ -278,6 +278,13 @@ void invalidate_icache_all(void) /* Any write to IC_IVIC register triggers invalidation of entire I$ */ if (icache_status()) { write_aux_reg(ARC_AUX_IC_IVIC, 1); + /* + * As per ARC HS databook (see chapter 5.3.3.2) + * it is required to add 3 NOPs after each write to IC_IVIC. + */ + __builtin_arc_nop(); + __builtin_arc_nop(); + __builtin_arc_nop(); read_aux_reg(ARC_AUX_IC_CTRL); /* blocks */ } } |