diff options
| author | Nam Cao <[email protected]> | 2024-11-07 16:01:06 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-11-18 08:23:56 -0600 |
| commit | 6ea8dc661b04ddd5c19163932ee12705c53f552a (patch) | |
| tree | 8cea1d6d85b2141ecb3491bcf28115e80dc5e797 | |
| parent | 5efd63c93c4546978c6a3a8e83c61011721b73b6 (diff) | |
fs: Use ARCH_DMA_MINALIGN as default alignment for fs_read_alloc()
The comment above fs_read_alloc() explains:
@align: Alignment to use for memory allocation (0 for default)
However, in the actual implementation, there is no alignment when @align is
zero.
This current default is probably fine for most cases. But for some block
devices which transfer data via DMA, ARCH_DMA_MINALIGN is needed.
Change the default alignment to ARCH_DMA_MINALIGN.
Fixes: de7b5a8a1ac0 ("fs: Create functions to load and allocate a file")
Signed-off-by: Nam Cao <[email protected]>
Tested-by: Javier Fernandez Pastrana <[email protected]>
| -rw-r--r-- | fs/fs.c | 4 | ||||
| -rw-r--r-- | include/fs.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -23,6 +23,7 @@ #include <time.h> #include <ubifs_uboot.h> #include <btrfs.h> +#include <asm/cache.h> #include <asm/global_data.h> #include <asm/io.h> #include <div64.h> @@ -1001,6 +1002,9 @@ int fs_read_alloc(const char *fname, ulong size, uint align, void **bufp) char *buf; int ret; + if (!align) + align = ARCH_DMA_MINALIGN; + buf = memalign(align, size + 1); if (!buf) return log_msg_ret("buf", -ENOMEM); diff --git a/include/fs.h b/include/fs.h index 63727567ccc..2474880385d 100644 --- a/include/fs.h +++ b/include/fs.h @@ -325,7 +325,7 @@ int do_fs_types(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]); * * @fname: Filename to read * @size: Size of file to read (must be correct!) - * @align: Alignment to use for memory allocation (0 for default) + * @align: Alignment to use for memory allocation (0 for default: ARCH_DMA_MINALIGN) * @bufp: On success, returns the allocated buffer with the nul-terminated file * in it * Return: 0 if OK, -ENOMEM if out of memory, -EIO if read failed |