Merge pull request #4204 from lewurm/arm64-icache-big-little-fix
arm64: fixes around icache flushing
This commit is contained in:
commit
077fa099ea
|
@ -329,11 +329,34 @@ void ARM64XEmitter::FlushIcacheSection(u8* start, u8* end)
|
||||||
// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
|
// Header file says this is equivalent to: sys_icache_invalidate(start, end - start);
|
||||||
sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
|
sys_cache_control(kCacheFunctionPrepareForExecution, start, end - start);
|
||||||
#else
|
#else
|
||||||
#ifdef __clang__
|
// Don't rely on GCC's __clear_cache implementation, as it caches
|
||||||
__clear_cache(start, end);
|
// icache/dcache cache line sizes, that can vary between cores on
|
||||||
#else
|
// big.LITTLE architectures.
|
||||||
__builtin___clear_cache(start, end);
|
u64 addr, ctr_el0;
|
||||||
#endif
|
static size_t icache_line_size = 0xffff, dcache_line_size = 0xffff;
|
||||||
|
size_t isize, dsize;
|
||||||
|
|
||||||
|
__asm__ volatile("mrs %0, ctr_el0" : "=r"(ctr_el0));
|
||||||
|
isize = 4 << ((ctr_el0 >> 0) & 0xf);
|
||||||
|
dsize = 4 << ((ctr_el0 >> 16) & 0xf);
|
||||||
|
|
||||||
|
// use the global minimum cache line size
|
||||||
|
icache_line_size = isize = icache_line_size < isize ? icache_line_size : isize;
|
||||||
|
dcache_line_size = dsize = dcache_line_size < dsize ? dcache_line_size : dsize;
|
||||||
|
|
||||||
|
addr = (u64)start & ~(u64)(dsize - 1);
|
||||||
|
for (; addr < (u64)end; addr += dsize)
|
||||||
|
// use "civac" instead of "cvau", as this is the suggested workaround for
|
||||||
|
// Cortex-A53 errata 819472, 826319, 827319 and 824069.
|
||||||
|
__asm__ volatile("dc civac, %0" : : "r"(addr) : "memory");
|
||||||
|
__asm__ volatile("dsb ish" : : : "memory");
|
||||||
|
|
||||||
|
addr = (u64)start & ~(u64)(isize - 1);
|
||||||
|
for (; addr < (u64)end; addr += isize)
|
||||||
|
__asm__ volatile("ic ivau, %0" : : "r"(addr) : "memory");
|
||||||
|
|
||||||
|
__asm__ volatile("dsb ish" : : : "memory");
|
||||||
|
__asm__ volatile("isb" : : : "memory");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue