From: Simon Glass <sjg@chromium.org> This existing function does not have any context associated with it. Rename it so that fs_read() can be used for the new FS uclass. Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/bootmeth-uclass.c | 2 +- cmd/mvebu/bubt.c | 6 +++--- cmd/sysboot.c | 2 +- cmd/xxd.c | 2 +- common/spl/spl_blk_fs.c | 4 ++-- common/splash_source.c | 2 +- doc/develop/bootstd/overview.rst | 4 ++-- drivers/bootcount/bootcount_fs.c | 5 +++-- drivers/dfu/dfu_mmc.c | 3 ++- drivers/dfu/dfu_scsi.c | 3 ++- drivers/fpga/zynqpl.c | 8 +++++--- drivers/misc/fs_loader.c | 5 +++-- drivers/net/phy/aquantia.c | 4 ++-- fs/fs_legacy.c | 6 +++--- include/fs_legacy.h | 9 +++++---- lib/efi_loader/efi_file.c | 4 ++-- lib/efi_loader/efi_var_file.c | 4 ++-- test/image/spl_load_fs.c | 5 +++-- 18 files changed, 43 insertions(+), 35 deletions(-) diff --git a/boot/bootmeth-uclass.c b/boot/bootmeth-uclass.c index f49e9c2a008..f0e541c0934 100644 --- a/boot/bootmeth-uclass.c +++ b/boot/bootmeth-uclass.c @@ -421,7 +421,7 @@ int bootmeth_common_read_file(struct udevice *dev, struct bootflow *bflow, if (ret) return log_msg_ret("fs", ret); - ret = fs_read(file_path, addr, 0, 0, &len_read); + ret = fs_legacy_read(file_path, addr, 0, 0, &len_read); if (ret) return ret; *sizep = len_read; diff --git a/cmd/mvebu/bubt.c b/cmd/mvebu/bubt.c index b64d5a5733c..04a48f2a561 100644 --- a/cmd/mvebu/bubt.c +++ b/cmd/mvebu/bubt.c @@ -311,7 +311,7 @@ static size_t mmc_read_file(const char *file_name) } /* Perfrom file read */ - rc = fs_read(file_name, get_load_addr(), 0, 0, &act_read); + rc = fs_legacy_read(file_name, get_load_addr(), 0, 0, &act_read); if (rc) return 0; @@ -448,7 +448,7 @@ static size_t sata_read_file(const char *file_name) } /* Perfrom file read */ - rc = fs_read(file_name, get_load_addr(), 0, 0, &act_read); + rc = fs_legacy_read(file_name, get_load_addr(), 0, 0, &act_read); if (rc) return 0; @@ -624,7 +624,7 @@ static size_t usb_read_file(const char *file_name) } /* Perfrom file read */ - rc = fs_read(file_name, get_load_addr(), 0, 0, &act_read); + rc = fs_legacy_read(file_name, get_load_addr(), 0, 0, &act_read); if (rc) return 0; diff --git a/cmd/sysboot.c b/cmd/sysboot.c index 735c90fa42c..1dad64c9ac5 100644 --- a/cmd/sysboot.c +++ b/cmd/sysboot.c @@ -35,7 +35,7 @@ static int sysboot_read_file(struct pxe_context *ctx, const char *file_path, ret = fs_set_blk_dev(info->ifname, info->dev_part_str, info->fstype); if (ret) return ret; - ret = fs_read(file_path, addr, 0, 0, &len_read); + ret = fs_legacy_read(file_path, addr, 0, 0, &len_read); if (ret) return ret; *sizep = len_read; diff --git a/cmd/xxd.c b/cmd/xxd.c index f1294d763b1..32864d8c906 100644 --- a/cmd/xxd.c +++ b/cmd/xxd.c @@ -59,7 +59,7 @@ static int do_xxd(struct cmd_tbl *cmdtp, int flag, int argc, if (fs_set_blk_dev(ifname, dev, FS_TYPE_ANY)) return CMD_RET_FAILURE; - if (fs_read(file, addr, 0, 0, &file_size)) { + if (fs_legacy_read(file, addr, 0, 0, &file_size)) { log_err("Cannot read file: ifname=%s dev=%s file=%s\n", ifname, dev, file); return CMD_RET_FAILURE; } diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index aa2a031d169..8b458c429a9 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -32,8 +32,8 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset, return ret; } - ret = fs_read(dev->filename, virt_to_phys(buf), file_offset, size, - &actlen); + ret = fs_legacy_read(dev->filename, virt_to_phys(buf), file_offset, + size, &actlen); if (ret < 0) { printf("spl: error reading image %s. Err - %d\n", dev->filename, ret); diff --git a/common/splash_source.c b/common/splash_source.c index f6b51aab017..6bbe705c20e 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -295,7 +295,7 @@ static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr) } splash_select_fs_dev(location); - res = fs_read(splash_file, bmp_load_addr, 0, 0, &actread); + res = fs_legacy_read(splash_file, bmp_load_addr, 0, 0, &actread); out: if (location->ubivol != NULL) diff --git a/doc/develop/bootstd/overview.rst b/doc/develop/bootstd/overview.rst index 7bca043791b..ca76bad7bca 100644 --- a/doc/develop/bootstd/overview.rst +++ b/doc/develop/bootstd/overview.rst @@ -795,8 +795,8 @@ partitions on bootdevs and using bootmeths to find bootflows. How about bootdevs which are not block devices? They are handled by the same methods as above, but with a different implementation. For example, the bootmeth -for PXE boot (over a network) uses `tftp` to read files rather than `fs_read()`. -But other than that it is very similar. +for PXE boot (over a network) uses `tftp` to read files rather than +`fs_legacy_read()`. But other than that it is very similar. Tests diff --git a/drivers/bootcount/bootcount_fs.c b/drivers/bootcount/bootcount_fs.c index f8e1478b7b7..cffe67cbba0 100644 --- a/drivers/bootcount/bootcount_fs.c +++ b/drivers/bootcount/bootcount_fs.c @@ -61,8 +61,9 @@ ulong bootcount_load(void) return 0; } - ret = fs_read(CONFIG_SYS_BOOTCOUNT_FS_NAME, CONFIG_SYS_BOOTCOUNT_ADDR, - 0, sizeof(bootcount_ext_t), &len_read); + ret = fs_legacy_read(CONFIG_SYS_BOOTCOUNT_FS_NAME, + CONFIG_SYS_BOOTCOUNT_ADDR, 0, + sizeof(bootcount_ext_t), &len_read); if (ret != 0 || len_read != sizeof(bootcount_ext_t)) { puts("Error loading bootcount\n"); return 0; diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index c19eb919388..3814b6c5874 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -128,7 +128,8 @@ static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, switch (op) { case DFU_OP_READ: - ret = fs_read(dfu->name, (size_t)buf, offset, *len, &size); + ret = fs_legacy_read(dfu->name, (size_t)buf, offset, *len, + &size); if (ret) { puts("dfu: fs_read error!\n"); return ret; diff --git a/drivers/dfu/dfu_scsi.c b/drivers/dfu/dfu_scsi.c index 9f95194784c..38f9e2e3842 100644 --- a/drivers/dfu/dfu_scsi.c +++ b/drivers/dfu/dfu_scsi.c @@ -107,7 +107,8 @@ static int scsi_file_op(enum dfu_op op, struct dfu_entity *dfu, u64 offset, void switch (op) { case DFU_OP_READ: - ret = fs_read(dfu->name, (size_t)buf, offset, *len, &size); + ret = fs_legacy_read(dfu->name, (size_t)buf, offset, *len, + &size); if (ret) { puts("dfu: fs_read error!\n"); return ret; diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 0a87eb7917a..763e0718a10 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -442,7 +442,7 @@ static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize, if (fs_set_blk_dev(interface, dev_part, fstype)) return FPGA_FAIL; - if (fs_read(filename, (u32) buf, pos, blocksize, &actread) < 0) + if (fs_legacy_read(filename, (u32)buf, pos, blocksize, &actread) < 0) return FPGA_FAIL; if (zynq_validate_bitstream(desc, buf, bsize, blocksize, &swap, @@ -465,10 +465,12 @@ static int zynq_loadfs(xilinx_desc *desc, const void *buf, size_t bsize, return FPGA_FAIL; if (bsize > blocksize) { - if (fs_read(filename, (u32) buf, pos, blocksize, &actread) < 0) + if (fs_legacy_read(filename, (u32)buf, pos, blocksize, + &actread) < 0) return FPGA_FAIL; } else { - if (fs_read(filename, (u32) buf, pos, bsize, &actread) < 0) + if (fs_legacy_read(filename, (u32)buf, pos, bsize, + &actread) < 0) return FPGA_FAIL; } } while (bsize > blocksize); diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c index cf253c9864e..f52f3b4267e 100644 --- a/drivers/misc/fs_loader.c +++ b/drivers/misc/fs_loader.c @@ -181,8 +181,9 @@ static int fw_get_filesystem_firmware(struct udevice *dev) if (!firmwarep) return -ENOMEM; - ret = fs_read(firmwarep->name, (ulong)map_to_sysmem(firmwarep->data), - firmwarep->offset, firmwarep->size, &actread); + ret = fs_legacy_read(firmwarep->name, + (ulong)map_to_sysmem(firmwarep->data), + firmwarep->offset, firmwarep->size, &actread); if (ret) { debug("Error: %d Failed to read %s from flash %lld != %zu.\n", diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c index 5af993a6898..273e16d6b33 100644 --- a/drivers/net/phy/aquantia.c +++ b/drivers/net/phy/aquantia.c @@ -155,8 +155,8 @@ static int aquantia_read_fw(u8 **fw_addr, size_t *fw_length) if (ret < 0) goto cleanup; - ret = fs_read(CONFIG_PHY_AQUANTIA_FW_NAME, (ulong)addr, 0, length, - &read); + ret = fs_legacy_read(CONFIG_PHY_AQUANTIA_FW_NAME, (ulong)addr, 0, + length, &read); if (ret < 0) goto cleanup; diff --git a/fs/fs_legacy.c b/fs/fs_legacy.c index 5be041e2133..5a7a3ae4194 100644 --- a/fs/fs_legacy.c +++ b/fs/fs_legacy.c @@ -638,8 +638,8 @@ static int _fs_read(const char *filename, ulong addr, loff_t offset, loff_t len, return ret; } -int fs_read(const char *filename, ulong addr, loff_t offset, loff_t len, - loff_t *actread) +int fs_legacy_read(const char *filename, ulong addr, loff_t offset, loff_t len, + loff_t *actread) { return _fs_read(filename, addr, offset, len, 0, actread); } @@ -1141,7 +1141,7 @@ int fs_read_alloc(const char *fname, ulong size, uint align, struct abuf *buf) return log_msg_ret("buf", -ENOMEM); buf->size--; - ret = fs_read(fname, abuf_addr(buf), 0, size, &bytes_read); + ret = fs_legacy_read(fname, abuf_addr(buf), 0, size, &bytes_read); if (ret) { abuf_uninit(buf); return log_msg_ret("read", ret); diff --git a/include/fs_legacy.h b/include/fs_legacy.h index 4a564950b74..f1be6fbdc13 100644 --- a/include/fs_legacy.h +++ b/include/fs_legacy.h @@ -53,7 +53,7 @@ int fs_set_blk_dev_with_part(struct blk_desc *desc, int part); * fs_set_blk_dev() or fs_set_dev_with_part(). * * Many file functions implicitly call fs_close(), e.g. fs_closedir(), - * fs_exist(), fs_ln(), fs_ls(), fs_mkdir(), fs_read(), fs_size(), fs_write(), + * fs_exist(), fs_ln(), fs_ls(), fs_mkdir(), fs_legacy_read(), fs_size(), fs_write(), * fs_unlink(), fs_rename(). */ void fs_close(void); @@ -103,7 +103,8 @@ int fs_exists(const char *filename); int fs_size(const char *filename, loff_t *size); /** - * fs_read() - read file from the partition previously set by fs_set_blk_dev() + * fs_legacy_read() - read file from the partition previously set by + * fs_set_blk_dev() * * Note that not all filesystem drivers support either or both of offset != 0 * and len != 0. @@ -115,8 +116,8 @@ int fs_size(const char *filename, loff_t *size); * @actread: returns the actual number of bytes read * Return: 0 if OK with valid @actread, -1 on error conditions */ -int fs_read(const char *filename, ulong addr, loff_t offset, loff_t len, - loff_t *actread); +int fs_legacy_read(const char *filename, ulong addr, loff_t offset, loff_t len, + loff_t *actread); /** * fs_write() - write file to the partition previously set by fs_set_blk_dev() diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index 65bc99b961b..2aa9f191731 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -484,8 +484,8 @@ static efi_status_t file_read(struct file_handle *fh, u64 *buffer_size, if (set_blk_dev(fh)) return EFI_DEVICE_ERROR; - if (fs_read(fh->path, map_to_sysmem(buffer), fh->offset, - *buffer_size, &actread)) + if (fs_legacy_read(fh->path, map_to_sysmem(buffer), fh->offset, + *buffer_size, &actread)) return EFI_DEVICE_ERROR; *buffer_size = actread; diff --git a/lib/efi_loader/efi_var_file.c b/lib/efi_loader/efi_var_file.c index f3f034dde48..3c6247dc858 100644 --- a/lib/efi_loader/efi_var_file.c +++ b/lib/efi_loader/efi_var_file.c @@ -170,8 +170,8 @@ efi_status_t efi_var_from_file(void) ret = efi_set_blk_dev_to_system_partition(); if (ret != EFI_SUCCESS) goto error; - r = fs_read(EFI_VAR_FILE_NAME, map_to_sysmem(buf), 0, EFI_VAR_BUF_SIZE, - &len); + r = fs_legacy_read(EFI_VAR_FILE_NAME, map_to_sysmem(buf), 0, + EFI_VAR_BUF_SIZE, &len); if (r || len < sizeof(struct efi_var_file)) { log_err("Failed to load EFI variables\n"); goto error; diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c index 4663729f58c..ca1a8a9c6c8 100644 --- a/test/image/spl_load_fs.c +++ b/test/image/spl_load_fs.c @@ -282,8 +282,9 @@ static int spl_test_fs(struct unit_test_state *uts, const char *test_name, data_read = malloc_cache_aligned(data_size); ut_assertnonnull(data_read); ut_assertok(fs_set_blk_dev_with_part(dev_desc, 0)); - ut_assertok(fs_read("/" CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, - virt_to_phys(data_read), 0, data_size, &actread)); + ut_assertok(fs_legacy_read("/" CONFIG_SPL_FS_LOAD_PAYLOAD_NAME, + virt_to_phys(data_read), 0, data_size, + &actread)); ut_asserteq(data_size, actread); ut_asserteq_mem(data_write, data_read, data_size); -- 2.43.0