diff options
| author | Alex Kiernan <alex.kiernan@gmail.com> | 2018-07-25 11:45:58 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-03 19:53:54 -0400 |
| commit | fe9805fc7fe757072f8020ad154aa5aae6241afe (patch) | |
| tree | 4d3cabcd4325a2f82273bbcba40c1e24ec6a771c /drivers/bootcount | |
| parent | 1416e2d22531c6d4ba9c9c8a4766cbe906ed7ce0 (diff) | |
| download | u-boot-fe9805fc7fe757072f8020ad154aa5aae6241afe.tar.gz u-boot-fe9805fc7fe757072f8020ad154aa5aae6241afe.tar.xz u-boot-fe9805fc7fe757072f8020ad154aa5aae6241afe.zip | |
bootcount: Fix misaligned cache operation
1947c2d2a0 introduces cache line flushes for the bootcounter, but if
the start address is not aligned then the flush causes warnings of
the form:
CACHE: Misaligned operation at range [4030b7fc, 4030b83c]
Align both the start and end of the buffer (possibly crossing multiple
lines).
Fixes: 1947c2d2a0 ("bootcount: flush after storing the bootcounter")
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'drivers/bootcount')
| -rw-r--r-- | drivers/bootcount/bootcount.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/bootcount/bootcount.c b/drivers/bootcount/bootcount.c index a3162c97ed..646c563f8a 100644 --- a/drivers/bootcount/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -11,16 +11,23 @@ __weak void bootcount_store(ulong a) { void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR; + uintptr_t flush_start = rounddown(CONFIG_SYS_BOOTCOUNT_ADDR, + CONFIG_SYS_CACHELINE_SIZE); + uintptr_t flush_end; #if defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) raw_bootcount_store(reg, (BOOTCOUNT_MAGIC & 0xffff0000) | a); + + flush_end = roundup(CONFIG_SYS_BOOTCOUNT_ADDR + 4, + CONFIG_SYS_CACHELINE_SIZE); #else raw_bootcount_store(reg, a); raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC); + + flush_end = roundup(CONFIG_SYS_BOOTCOUNT_ADDR + 8, + CONFIG_SYS_CACHELINE_SIZE); #endif /* defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD */ - flush_dcache_range(CONFIG_SYS_BOOTCOUNT_ADDR, - CONFIG_SYS_BOOTCOUNT_ADDR + - CONFIG_SYS_CACHELINE_SIZE); + flush_dcache_range(flush_start, flush_end); } __weak ulong bootcount_load(void) |