mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-15 17:28:15 +00:00
d455d8789d
The sandbox/ext4/fat/generic fs commands do not gracefully deal with files greater than 2GB. Negative values are returned in such cases. To handle this, the fs functions have been modified to take an additional parameter of type "* loff_t" which is then populated. The return value of the fs functions are used only for error conditions. Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> [trini: Update board/gdsys/p1022/controlcenterd-id.c, drivers/fpga/zynqpl.c for changes] Signed-off-by: Tom Rini <trini@ti.com>
503 lines
10 KiB
C
503 lines
10 KiB
C
/*
|
|
* Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <config.h>
|
|
#include <errno.h>
|
|
#include <common.h>
|
|
#include <part.h>
|
|
#include <ext4fs.h>
|
|
#include <fat.h>
|
|
#include <fs.h>
|
|
#include <sandboxfs.h>
|
|
#include <asm/io.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
static block_dev_desc_t *fs_dev_desc;
|
|
static disk_partition_t fs_partition;
|
|
static int fs_type = FS_TYPE_ANY;
|
|
|
|
static inline int fs_probe_unsupported(block_dev_desc_t *fs_dev_desc,
|
|
disk_partition_t *fs_partition)
|
|
{
|
|
printf("** Unrecognized filesystem type **\n");
|
|
return -1;
|
|
}
|
|
|
|
static inline int fs_ls_unsupported(const char *dirname)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline int fs_exists_unsupported(const char *filename)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int fs_size_unsupported(const char *filename, loff_t *size)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline int fs_read_unsupported(const char *filename, void *buf,
|
|
loff_t offset, loff_t len,
|
|
loff_t *actread)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline int fs_write_unsupported(const char *filename, void *buf,
|
|
loff_t offset, loff_t len,
|
|
loff_t *actwrite)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline void fs_close_unsupported(void)
|
|
{
|
|
}
|
|
|
|
static inline int fs_uuid_unsupported(char *uuid_str)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
struct fstype_info {
|
|
int fstype;
|
|
/*
|
|
* Is it legal to pass NULL as .probe()'s fs_dev_desc parameter? This
|
|
* should be false in most cases. For "virtual" filesystems which
|
|
* aren't based on a U-Boot block device (e.g. sandbox), this can be
|
|
* set to true. This should also be true for the dumm entry at the end
|
|
* of fstypes[], since that is essentially a "virtual" (non-existent)
|
|
* filesystem.
|
|
*/
|
|
bool null_dev_desc_ok;
|
|
int (*probe)(block_dev_desc_t *fs_dev_desc,
|
|
disk_partition_t *fs_partition);
|
|
int (*ls)(const char *dirname);
|
|
int (*exists)(const char *filename);
|
|
int (*size)(const char *filename, loff_t *size);
|
|
int (*read)(const char *filename, void *buf, loff_t offset,
|
|
loff_t len, loff_t *actread);
|
|
int (*write)(const char *filename, void *buf, loff_t offset,
|
|
loff_t len, loff_t *actwrite);
|
|
void (*close)(void);
|
|
int (*uuid)(char *uuid_str);
|
|
};
|
|
|
|
static struct fstype_info fstypes[] = {
|
|
#ifdef CONFIG_FS_FAT
|
|
{
|
|
.fstype = FS_TYPE_FAT,
|
|
.null_dev_desc_ok = false,
|
|
.probe = fat_set_blk_dev,
|
|
.close = fat_close,
|
|
.ls = file_fat_ls,
|
|
.exists = fat_exists,
|
|
.size = fat_size,
|
|
.read = fat_read_file,
|
|
#ifdef CONFIG_FAT_WRITE
|
|
.write = file_fat_write,
|
|
#else
|
|
.write = fs_write_unsupported,
|
|
#endif
|
|
.uuid = fs_uuid_unsupported,
|
|
},
|
|
#endif
|
|
#ifdef CONFIG_FS_EXT4
|
|
{
|
|
.fstype = FS_TYPE_EXT,
|
|
.null_dev_desc_ok = false,
|
|
.probe = ext4fs_probe,
|
|
.close = ext4fs_close,
|
|
.ls = ext4fs_ls,
|
|
.exists = ext4fs_exists,
|
|
.size = ext4fs_size,
|
|
.read = ext4_read_file,
|
|
#ifdef CONFIG_CMD_EXT4_WRITE
|
|
.write = ext4_write_file,
|
|
#else
|
|
.write = fs_write_unsupported,
|
|
#endif
|
|
.uuid = ext4fs_uuid,
|
|
},
|
|
#endif
|
|
#ifdef CONFIG_SANDBOX
|
|
{
|
|
.fstype = FS_TYPE_SANDBOX,
|
|
.null_dev_desc_ok = true,
|
|
.probe = sandbox_fs_set_blk_dev,
|
|
.close = sandbox_fs_close,
|
|
.ls = sandbox_fs_ls,
|
|
.exists = sandbox_fs_exists,
|
|
.size = sandbox_fs_size,
|
|
.read = fs_read_sandbox,
|
|
.write = fs_write_sandbox,
|
|
.uuid = fs_uuid_unsupported,
|
|
},
|
|
#endif
|
|
{
|
|
.fstype = FS_TYPE_ANY,
|
|
.null_dev_desc_ok = true,
|
|
.probe = fs_probe_unsupported,
|
|
.close = fs_close_unsupported,
|
|
.ls = fs_ls_unsupported,
|
|
.exists = fs_exists_unsupported,
|
|
.size = fs_size_unsupported,
|
|
.read = fs_read_unsupported,
|
|
.write = fs_write_unsupported,
|
|
.uuid = fs_uuid_unsupported,
|
|
},
|
|
};
|
|
|
|
static struct fstype_info *fs_get_info(int fstype)
|
|
{
|
|
struct fstype_info *info;
|
|
int i;
|
|
|
|
for (i = 0, info = fstypes; i < ARRAY_SIZE(fstypes) - 1; i++, info++) {
|
|
if (fstype == info->fstype)
|
|
return info;
|
|
}
|
|
|
|
/* Return the 'unsupported' sentinel */
|
|
return info;
|
|
}
|
|
|
|
int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype)
|
|
{
|
|
struct fstype_info *info;
|
|
int part, i;
|
|
#ifdef CONFIG_NEEDS_MANUAL_RELOC
|
|
static int relocated;
|
|
|
|
if (!relocated) {
|
|
for (i = 0, info = fstypes; i < ARRAY_SIZE(fstypes);
|
|
i++, info++) {
|
|
info->probe += gd->reloc_off;
|
|
info->close += gd->reloc_off;
|
|
info->ls += gd->reloc_off;
|
|
info->read += gd->reloc_off;
|
|
info->write += gd->reloc_off;
|
|
}
|
|
relocated = 1;
|
|
}
|
|
#endif
|
|
|
|
part = get_device_and_partition(ifname, dev_part_str, &fs_dev_desc,
|
|
&fs_partition, 1);
|
|
if (part < 0)
|
|
return -1;
|
|
|
|
for (i = 0, info = fstypes; i < ARRAY_SIZE(fstypes); i++, info++) {
|
|
if (fstype != FS_TYPE_ANY && info->fstype != FS_TYPE_ANY &&
|
|
fstype != info->fstype)
|
|
continue;
|
|
|
|
if (!fs_dev_desc && !info->null_dev_desc_ok)
|
|
continue;
|
|
|
|
if (!info->probe(fs_dev_desc, &fs_partition)) {
|
|
fs_type = info->fstype;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
static void fs_close(void)
|
|
{
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
|
|
info->close();
|
|
|
|
fs_type = FS_TYPE_ANY;
|
|
}
|
|
|
|
int fs_uuid(char *uuid_str)
|
|
{
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
|
|
return info->uuid(uuid_str);
|
|
}
|
|
|
|
int fs_ls(const char *dirname)
|
|
{
|
|
int ret;
|
|
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
|
|
ret = info->ls(dirname);
|
|
|
|
fs_type = FS_TYPE_ANY;
|
|
fs_close();
|
|
|
|
return ret;
|
|
}
|
|
|
|
int fs_exists(const char *filename)
|
|
{
|
|
int ret;
|
|
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
|
|
ret = info->exists(filename);
|
|
|
|
fs_close();
|
|
|
|
return ret;
|
|
}
|
|
|
|
int fs_size(const char *filename, loff_t *size)
|
|
{
|
|
int ret;
|
|
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
|
|
ret = info->size(filename, size);
|
|
|
|
fs_close();
|
|
|
|
return ret;
|
|
}
|
|
|
|
int fs_read(const char *filename, ulong addr, loff_t offset, loff_t len,
|
|
loff_t *actread)
|
|
{
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
void *buf;
|
|
int ret;
|
|
|
|
/*
|
|
* We don't actually know how many bytes are being read, since len==0
|
|
* means read the whole file.
|
|
*/
|
|
buf = map_sysmem(addr, len);
|
|
ret = info->read(filename, buf, offset, len, actread);
|
|
unmap_sysmem(buf);
|
|
|
|
/* If we requested a specific number of bytes, check we got it */
|
|
if (ret == 0 && len && *actread != len) {
|
|
printf("** Unable to read file %s **\n", filename);
|
|
ret = -1;
|
|
}
|
|
fs_close();
|
|
|
|
return ret;
|
|
}
|
|
|
|
int fs_write(const char *filename, ulong addr, loff_t offset, loff_t len,
|
|
loff_t *actwrite)
|
|
{
|
|
struct fstype_info *info = fs_get_info(fs_type);
|
|
void *buf;
|
|
int ret;
|
|
|
|
buf = map_sysmem(addr, len);
|
|
ret = info->write(filename, buf, offset, len, actwrite);
|
|
unmap_sysmem(buf);
|
|
|
|
if (ret < 0 && len != *actwrite) {
|
|
printf("** Unable to write file %s **\n", filename);
|
|
ret = -1;
|
|
}
|
|
fs_close();
|
|
|
|
return ret;
|
|
}
|
|
|
|
int do_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
|
|
int fstype)
|
|
{
|
|
loff_t size;
|
|
|
|
if (argc != 4)
|
|
return CMD_RET_USAGE;
|
|
|
|
if (fs_set_blk_dev(argv[1], argv[2], fstype))
|
|
return 1;
|
|
|
|
if (fs_size(argv[3], &size) < 0)
|
|
return CMD_RET_FAILURE;
|
|
|
|
setenv_hex("filesize", size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int do_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
|
|
int fstype)
|
|
{
|
|
unsigned long addr;
|
|
const char *addr_str;
|
|
const char *filename;
|
|
loff_t bytes;
|
|
loff_t pos;
|
|
loff_t len_read;
|
|
int ret;
|
|
unsigned long time;
|
|
char *ep;
|
|
|
|
if (argc < 2)
|
|
return CMD_RET_USAGE;
|
|
if (argc > 7)
|
|
return CMD_RET_USAGE;
|
|
|
|
if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype))
|
|
return 1;
|
|
|
|
if (argc >= 4) {
|
|
addr = simple_strtoul(argv[3], &ep, 16);
|
|
if (ep == argv[3] || *ep != '\0')
|
|
return CMD_RET_USAGE;
|
|
} else {
|
|
addr_str = getenv("loadaddr");
|
|
if (addr_str != NULL)
|
|
addr = simple_strtoul(addr_str, NULL, 16);
|
|
else
|
|
addr = CONFIG_SYS_LOAD_ADDR;
|
|
}
|
|
if (argc >= 5) {
|
|
filename = argv[4];
|
|
} else {
|
|
filename = getenv("bootfile");
|
|
if (!filename) {
|
|
puts("** No boot file defined **\n");
|
|
return 1;
|
|
}
|
|
}
|
|
if (argc >= 6)
|
|
bytes = simple_strtoul(argv[5], NULL, 16);
|
|
else
|
|
bytes = 0;
|
|
if (argc >= 7)
|
|
pos = simple_strtoul(argv[6], NULL, 16);
|
|
else
|
|
pos = 0;
|
|
|
|
time = get_timer(0);
|
|
ret = fs_read(filename, addr, pos, bytes, &len_read);
|
|
time = get_timer(time);
|
|
if (ret < 0)
|
|
return 1;
|
|
|
|
printf("%llu bytes read in %lu ms", len_read, time);
|
|
if (time > 0) {
|
|
puts(" (");
|
|
print_size(len_read / time * 1000, "/s");
|
|
puts(")");
|
|
}
|
|
puts("\n");
|
|
|
|
setenv_hex("filesize", len_read);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int do_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
|
|
int fstype)
|
|
{
|
|
if (argc < 2)
|
|
return CMD_RET_USAGE;
|
|
if (argc > 4)
|
|
return CMD_RET_USAGE;
|
|
|
|
if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype))
|
|
return 1;
|
|
|
|
if (fs_ls(argc >= 4 ? argv[3] : "/"))
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int file_exists(const char *dev_type, const char *dev_part, const char *file,
|
|
int fstype)
|
|
{
|
|
if (fs_set_blk_dev(dev_type, dev_part, fstype))
|
|
return 0;
|
|
|
|
return fs_exists(file);
|
|
}
|
|
|
|
int do_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
|
|
int fstype)
|
|
{
|
|
unsigned long addr;
|
|
const char *filename;
|
|
loff_t bytes;
|
|
loff_t pos;
|
|
loff_t len;
|
|
int ret;
|
|
unsigned long time;
|
|
|
|
if (argc < 6 || argc > 7)
|
|
return CMD_RET_USAGE;
|
|
|
|
if (fs_set_blk_dev(argv[1], argv[2], fstype))
|
|
return 1;
|
|
|
|
addr = simple_strtoul(argv[3], NULL, 16);
|
|
filename = argv[4];
|
|
bytes = simple_strtoul(argv[5], NULL, 16);
|
|
if (argc >= 7)
|
|
pos = simple_strtoul(argv[6], NULL, 16);
|
|
else
|
|
pos = 0;
|
|
|
|
time = get_timer(0);
|
|
ret = fs_write(filename, addr, pos, bytes, &len);
|
|
time = get_timer(time);
|
|
if (ret < 0)
|
|
return 1;
|
|
|
|
printf("%llu bytes written in %lu ms", len, time);
|
|
if (time > 0) {
|
|
puts(" (");
|
|
print_size(len / time * 1000, "/s");
|
|
puts(")");
|
|
}
|
|
puts("\n");
|
|
|
|
return 0;
|
|
}
|
|
|
|
int do_fs_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
|
|
int fstype)
|
|
{
|
|
int ret;
|
|
char uuid[37];
|
|
memset(uuid, 0, sizeof(uuid));
|
|
|
|
if (argc < 3 || argc > 4)
|
|
return CMD_RET_USAGE;
|
|
|
|
if (fs_set_blk_dev(argv[1], argv[2], fstype))
|
|
return 1;
|
|
|
|
ret = fs_uuid(uuid);
|
|
if (ret)
|
|
return CMD_RET_FAILURE;
|
|
|
|
if (argc == 4)
|
|
setenv(argv[3], uuid);
|
|
else
|
|
printf("%s\n", uuid);
|
|
|
|
return CMD_RET_SUCCESS;
|
|
}
|