summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorGary Bisson <gary.bisson@boundarydevices.com>2022-01-11 18:06:06 +0100
committerStefano Babic <sbabic@denx.de>2022-02-05 15:49:00 +0100
commit18956cd41926b1d41b4ae09c4bb70a8e986c7085 (patch)
treea73978d7d4b646de0e76928c675dfe6640f6e345 /cmd
parentf8a5cda5ec27fd532a218c9988aa30b2318cb13d (diff)
cmd: bcb: fix bcb struct alignment issue
Without this patch the bcb struct could be located at an odd address which resulted in data not being copied to the buffer. Here was the repro steps (from Mattijs): => mmc dev 1 => bcb load 1 misc => bcb dump command 00000000: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00000010: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 => part start mmc 1 misc misc_start => mmc read ${loadaddr} ${misc_start} 4 => bcb load 1 misc => bcb dump command 00000000: 62 6f 6f 74 6f 6e 63 65 2d 62 6f 6f 74 6c 6f 61 00000010: 64 65 72 00 00 00 00 00 00 00 00 00 00 00 00 00 This behavior was observed on an Amlogic A311D (ARM64) platform with a recent GCC toolchain (11.2.0) but is most likely affecting other platforms. To avoid issues the structure is aligned on DMA minimum alignment value as it is passed directly to the read function. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # on khadas vim3
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bcb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/bcb.c b/cmd/bcb.c
index 6b6f1e9a2f..92f4d27990 100644
--- a/cmd/bcb.c
+++ b/cmd/bcb.c
@@ -12,6 +12,7 @@
#include <log.h>
#include <part.h>
#include <malloc.h>
+#include <memalign.h>
enum bcb_cmd {
BCB_CMD_LOAD,
@@ -24,7 +25,7 @@ enum bcb_cmd {
static int bcb_dev = -1;
static int bcb_part = -1;
-static struct bootloader_message bcb = { { 0 } };
+static struct bootloader_message bcb __aligned(ARCH_DMA_MINALIGN) = { { 0 } };
static int bcb_cmd_get(char *cmd)
{