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 <ben.dooks@sifive.com>
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>

diff --git a/cmd/ubifs.c b/cmd/ubifs.c
index 6a01d0988a2da4ebdade2bb7149790f29eec7737..2a035bc7ae6f334a1957d8351f31cf2e8447e0d8 100644 (file)
--- 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 d3026e3101689205d1052dc2deac67a57d7ec6f6..609bdbf60377316cb6b90086e3fa1ed32ea4e88f 100644 (file)
--- 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 b025779d59ff679c2748c7e5948cb0fda8bc2466..db8a29e9bbd8e9a570669179f9b03567c77bbf9a 100644 (file)
--- 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);