summaryrefslogtreecommitdiff
path: root/boot/bootmeth_extlinux.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-11-18 08:24:06 -0600
committerTom Rini <trini@konsulko.com>2024-11-18 08:24:06 -0600
commit0e6432e19f9c812b4986ca7fd8e6db9fd2c199d3 (patch)
tree8cea1d6d85b2141ecb3491bcf28115e80dc5e797 /boot/bootmeth_extlinux.c
parenta38390284ad4261723d3a2411ba988828e994535 (diff)
parent6ea8dc661b04ddd5c19163932ee12705c53f552a (diff)
Merge patch series "Fix boot failure due to misaligned DMA buffer"
Nam Cao <namcao@linutronix.de> says: We observed the following sporadic boot failure while booting from MMC device: => boot CACHE: Misaligned operation at range [9efa25f8, 9efa27f8] CACHE: Misaligned operation at range [9efa25f8, 9efa27f8] CACHE: Misaligned operation at range [9efa25f8, 9efa27f8] CACHE: Misaligned operation at range [9efa25f8, 9efa27f8] ** Booting bootflow 'mmc@2194000.bootdev.part_1' with extlinux Ignoring unknown command: �D���D�� Boot failed (err=-14) The reason is because while allocating buffer to read a file from MMC, alignment of 1 byte is used. Thus, the buffer doesn't work for performing DMA, and garbage data is read. While looking at this issue, I also noticed that if no alignment specified (align=0) then fs_read_alloc() is documented to use the default. But the default is no alignment. Therefore, other users of fs_read_alloc() which specify align=0 may be broken as well. The first patch changes extlinux_read_bootflow() to use proper buffer alignment for DMA. The second patch changes the default alignment of fs_read_alloc() to be DMA-suitable, to fix other potential bugs.
Diffstat (limited to 'boot/bootmeth_extlinux.c')
-rw-r--r--boot/bootmeth_extlinux.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c
index be8fbf4df63..c6ae6dffcb7 100644
--- a/boot/bootmeth_extlinux.c
+++ b/boot/bootmeth_extlinux.c
@@ -8,6 +8,7 @@
#define LOG_CATEGORY UCLASS_BOOTSTD
+#include <asm/cache.h>
#include <bootdev.h>
#include <bootflow.h>
#include <bootmeth.h>
@@ -159,7 +160,7 @@ static int extlinux_read_bootflow(struct udevice *dev, struct bootflow *bflow)
return log_msg_ret("try", ret);
size = bflow->size;
- ret = bootmeth_alloc_file(bflow, 0x10000, 1);
+ ret = bootmeth_alloc_file(bflow, 0x10000, ARCH_DMA_MINALIGN);
if (ret)
return log_msg_ret("read", ret);