dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fs: Use ARCH_DMA_MINALIGN as default alignment for fs_read_alloc()

Browse Source 
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: de7b5a8a1a ("fs: Create functions to load and allocate a file")
Signed-off-by: Nam Cao <namcao@linutronix.de>
Tested-by: Javier Fernandez Pastrana <javier.pastrana@linutronix.de>
This commit is contained in:
Nam Cao
2024-11-07 16:01:06 +01:00
committed by Tom Rini
parent 5efd63c93c
commit 6ea8dc661b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/fs.c
View File

@@ -23,6 +23,7 @@
#include <time.h> #include <time.h>
#include <ubifs_uboot.h> #include <ubifs_uboot.h>
#include <btrfs.h> #include <btrfs.h>
#include <asm/cache.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/io.h> #include <asm/io.h>
#include <div64.h> #include <div64.h>
@@ -1001,6 +1002,9 @@ int fs_read_alloc(const char *fname, ulong size, uint align, void **bufp)
char *buf; char *buf;
int ret; int ret;
if (!align)
align = ARCH_DMA_MINALIGN;
buf = memalign(align, size + 1); buf = memalign(align, size + 1);
if (!buf) if (!buf)
return log_msg_ret("buf", -ENOMEM); return log_msg_ret("buf", -ENOMEM);

2
include/fs.h
View File

@@ -325,7 +325,7 @@ int do_fs_types(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]);
* *
* @fname: Filename to read * @fname: Filename to read
* @size: Size of file to read (must be correct!) * @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 * @bufp: On success, returns the allocated buffer with the nul-terminated file
* in it * in it
* Return: 0 if OK, -ENOMEM if out of memory, -EIO if read failed * Return: 0 if OK, -ENOMEM if out of memory, -EIO if read failed