diff mbox

[U-Boot] part_iso: Cache align read buffer

Message ID 20170322134324.27189-1-mnhu@prevas.dk
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Martin Hundebøll March 22, 2017, 1:43 p.m. UTC
The global 'tmpbuf' variable in part_iso triggers invalid cache
alignment warnings when not being aligned to ARCH_DMA_MINALIGN:

  ERROR: v7_outer_cache_inval_range - start address is not aligned - 0x4ffbb6ac
  ERROR: v7_outer_cache_inval_range - stop address is not aligned - 0x4ffbbeac

The quick fix here is to align the global 'tmpbuf' variable using
DEFINE_CACHE_ALIGN_BUFFER. A real fix would be to change part_iso.c to
use function local buffers defined with ALLOC_CACHE_ALIGN_BUFFER.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
---
 disk/part_iso.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Tom Rini March 22, 2017, 2:50 p.m. UTC | #1
On Wed, Mar 22, 2017 at 02:43:24PM +0100, Martin Hundebøll wrote:
> The global 'tmpbuf' variable in part_iso triggers invalid cache
> alignment warnings when not being aligned to ARCH_DMA_MINALIGN:
> 
>   ERROR: v7_outer_cache_inval_range - start address is not aligned - 0x4ffbb6ac
>   ERROR: v7_outer_cache_inval_range - stop address is not aligned - 0x4ffbbeac
> 
> The quick fix here is to align the global 'tmpbuf' variable using
> DEFINE_CACHE_ALIGN_BUFFER. A real fix would be to change part_iso.c to
> use function local buffers defined with ALLOC_CACHE_ALIGN_BUFFER.

Can we try and do the real fix please?  The merge window isn't even
closed just yet, thanks!
diff mbox

Patch

diff --git a/disk/part_iso.c b/disk/part_iso.c
index bb8ed658f2..970a27bf67 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -8,6 +8,7 @@ 
 #include <common.h>
 #include <command.h>
 #include <asm/unaligned.h>
+#include <memalign.h>
 #include "part_iso.h"
 
 #ifdef HAVE_BLOCK_DEVICE
@@ -24,7 +25,7 @@ 
 #undef CHECK_FOR_POWERPC_PLATTFORM
 #define CD_SECTSIZE 2048
 
-static unsigned char tmpbuf[CD_SECTSIZE];
+DEFINE_CACHE_ALIGN_BUFFER(unsigned char, tmpbuf, CD_SECTSIZE);
 
 unsigned long iso_dread(struct blk_desc *block_dev, lbaint_t start,
                         lbaint_t blkcnt, void *buffer)