[U-Boot] [PATCH] bootcount: Fix misaligned cache operation

[U-Boot] [PATCH] bootcount: Fix misaligned cache operation

[Alex Kiernan]

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>
---

 drivers/bootcount/bootcount.c | 13 ++++++++++---
 1 file 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)
-- 
2.17.1

[U-Boot] [PATCH] bootcount: Fix misaligned cache operation

[Stefano Babic]

On 25/07/2018 13:45, Alex Kiernan wrote:
> 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).
> 

Thanks - not noted because I just used already aligned addresses :-)

> Fixes: 1947c2d2a0 ("bootcount: flush after storing the bootcounter")
> Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
> ---
> 
>  drivers/bootcount/bootcount.c | 13 ++++++++++---
>  1 file 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)
> 

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] bootcount: Fix misaligned cache operation

[Tom Rini]

On Wed, Jul 25, 2018 at 11:45:58AM +0000, Alex Kiernan wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180804/af1f8c12/attachment.sig>