vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

arm64: cache maintenance code rework + bugfix

Browse source
This commit is contained in:
Leif Lindholm 2013-11-19 10:05:23 +00:00
parent d3def58c52
commit 8a07b55a04
2 changed files with 27 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
grub-core/kern/arm64/cache.c
View file

@ -19,11 +19,14 @@
#include <grub/cache.h> #include <grub/cache.h>
#include <grub/misc.h> #include <grub/misc.h>
grub_int64_t grub_arch_cache_dlinesz; static grub_int64_t dlinesz;
grub_int64_t grub_arch_cache_ilinesz; static grub_int64_t ilinesz;
/* Prototypes for asm functions. */ /* Prototypes for asm functions. */
void grub_arch_sync_caches_real (grub_uint64_t address, grub_uint64_t end); void grub_arch_clean_dcache_range (grub_addr_t beg, grub_addr_t end,
grub_uint64_t line_size);
void grub_arch_invalidate_icache_range (grub_addr_t beg, grub_addr_t end,
grub_uint64_t line_size);
static void static void
probe_caches (void) probe_caches (void)
@ -33,40 +36,28 @@ probe_caches (void)
/* Read Cache Type Register */ /* Read Cache Type Register */
asm volatile ("mrs %0, ctr_el0": "=r"(cache_type)); asm volatile ("mrs %0, ctr_el0": "=r"(cache_type));
grub_arch_cache_dlinesz = 8 << ((cache_type >> 16) & 0xf); dlinesz = 4 << ((cache_type >> 16) & 0xf);
grub_arch_cache_ilinesz = 8 << (cache_type & 0xf); ilinesz = 4 << (cache_type & 0xf);
grub_dprintf("cache", "D$ line size: %lld\n", grub_dprintf("cache", "D$ line size: %lld\n", (long long) dlinesz);
(long long) grub_arch_cache_dlinesz); grub_dprintf("cache", "I$ line size: %lld\n", (long long) ilinesz);
grub_dprintf("cache", "I$ line size: %lld\n",
(long long) grub_arch_cache_ilinesz);
} }
void void
grub_arch_sync_caches (void *address, grub_size_t len) grub_arch_sync_caches (void *address, grub_size_t len)
{ {
grub_uint64_t start, end; grub_uint64_t start, end, max;
if (grub_arch_cache_dlinesz == 0) if (dlinesz == 0)
probe_caches(); probe_caches();
if (grub_arch_cache_dlinesz == 0) if (dlinesz == 0)
grub_fatal ("Unknown cache line size!"); grub_fatal ("Unknown cache line size!");
grub_dprintf("cache", "syncing caches for %p-%lx\n", max = dlinesz > ilinesz ? dlinesz : ilinesz;
address, (grub_addr_t) address + len);
/* Align here to both cache lines. Saves a tiny bit of asm complexity and start = ALIGN_DOWN ((grub_uint64_t) address, max);
most of potential problems with different line sizes. */ end = ALIGN_UP ((grub_uint64_t) address + len, max);
start = (grub_uint64_t) address;
end = (grub_uint64_t) address + len;
start = ALIGN_DOWN (start, grub_arch_cache_dlinesz);
start = ALIGN_DOWN (start, grub_arch_cache_ilinesz);
end = ALIGN_UP (end, grub_arch_cache_dlinesz); grub_arch_clean_dcache_range (start, end, dlinesz);
end = ALIGN_UP (end, grub_arch_cache_ilinesz); grub_arch_invalidate_icache_range (start, end, ilinesz);
grub_dprintf("cache", "aligned to: %lx-%lx\n",
start, end);
grub_arch_sync_caches_real (start, end);
} }

30
grub-core/kern/arm64/cache_flush.S
View file

@ -25,26 +25,25 @@
* Simple cache maintenance functions * Simple cache maintenance functions
*/ */
// r0 - *beg (inclusive) // x0 - *beg (inclusive)
// r1 - *end (exclusive) // x1 - *end (exclusive)
clean_dcache_range: // x2 - line size
FUNCTION(grub_arch_clean_dcache_range)
// Clean data cache for range to point-of-unification // Clean data cache for range to point-of-unification
ldr x2, =EXT_C(grub_arch_cache_dlinesz)
ldr x2, [x2]
1: cmp x0, x1 1: cmp x0, x1
bge 2f bge 2f
dc cvau, x0 // Clean Virtual Address to PoU dc cvau, x0 // Clean Virtual Address to PoU
add x0, x0, x2 // Next line add x0, x0, x2 // Next line
b 1b b 1b
2: dsb ish 2: dsb ish
isb
ret ret
// r0 - *beg (inclusive) // x0 - *beg (inclusive)
// r1 - *end (exclusive) // x1 - *end (exclusive)
invalidate_icache_range: // x2 - line size
FUNCTION(grub_arch_invalidate_icache_range)
// Invalidate instruction cache for range to point-of-unification // Invalidate instruction cache for range to point-of-unification
ldr x2, =EXT_C(grub_arch_cache_ilinesz)
ldr x2, [x2]
1: cmp x0, x1 1: cmp x0, x1
bge 2f bge 2f
ic ivau, x0 // Invalidate Virtual Address to PoU ic ivau, x0 // Invalidate Virtual Address to PoU
@ -54,14 +53,3 @@ invalidate_icache_range:
2: dsb ish 2: dsb ish
isb isb
ret ret
// void grub_arch_sync_caches_real (void *address, grub_size_t len)
FUNCTION(grub_arch_sync_caches_real)
dsb ish
stp x0, x30, [sp, #-16]!
stp x0, x1, [sp, #-16]!
bl clean_dcache_range
ldp x0, x1, [sp], #16
bl invalidate_icache_range
ldp x0, x30, [sp], #16
ret