From b46cec41664f35c689385c70c76d274a059c7251 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Tue, 6 Jun 2023 09:23:28 +0100 Subject: [PATCH] ubifs: allow loading to above 4GiB The ubifsload command is truncating any address above 4GiB as it casts this address to an u32, instead of using an unsigned long which most of the other load commands do. Change this to an unsigned long to allow loading into high memory for boards which use these areas. Fixes the following error: => ubifsload 0x2100000000 /boot/Image.lzma Loading file '/boot/Image.lzma' to addr 0x00000000... Unhandled exception: Store/AMO access fault Signed-off-by: Ben Dooks Signed-off-by: Ben Dooks --- cmd/ubifs.c | 4 ++-- fs/ubifs/ubifs.c | 4 ++-- include/ubifs_uboot.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/ubifs.c b/cmd/ubifs.c index 6a01d09..2a035bc 100644 --- a/cmd/ubifs.c +++ b/cmd/ubifs.c @@ -111,7 +111,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc, char *filename; char *endp; int ret; - u32 addr; + unsigned long addr; u32 size = 0; if (!ubifs_mounted) { @@ -133,7 +133,7 @@ static int do_ubifs_load(struct cmd_tbl *cmdtp, int flag, int argc, if (endp == argv[3]) return CMD_RET_USAGE; } - debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size); + debug("Loading file '%s' to address 0x%08lx (size %d)\n", filename, addr, size); ret = ubifs_load(filename, addr, size); if (ret) { diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index d3026e3..609bdbf 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -925,12 +925,12 @@ void ubifs_close(void) } /* Compat wrappers for common/cmd_ubifs.c */ -int ubifs_load(char *filename, u32 addr, u32 size) +int ubifs_load(char *filename, unsigned long addr, u32 size) { loff_t actread; int err; - printf("Loading file '%s' to addr 0x%08x...\n", filename, addr); + printf("Loading file '%s' to addr 0x%08lx...\n", filename, addr); err = ubifs_read(filename, (void *)(uintptr_t)addr, 0, size, &actread); if (err == 0) { diff --git a/include/ubifs_uboot.h b/include/ubifs_uboot.h index b025779..db8a29e 100644 --- a/include/ubifs_uboot.h +++ b/include/ubifs_uboot.h @@ -21,7 +21,7 @@ int ubifs_init(void); int uboot_ubifs_mount(char *vol_name); void uboot_ubifs_umount(void); int ubifs_is_mounted(void); -int ubifs_load(char *filename, u32 addr, u32 size); +int ubifs_load(char *filename, unsigned long addr, u32 size); int ubifs_set_blk_dev(struct blk_desc *rbdd, struct disk_partition *info); int ubifs_ls(const char *dir_name); -- 2.7.4