@@ -354,7 +354,6 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
struct spl_load_info load;
debug("Found FIT image\n");
- load.filename = NULL;
load.bl_len = 1;
load.read = spi_load_read;
ret = spl_load_simple_fit(spl_image, &load,
@@ -9,10 +9,12 @@
#include <spl.h>
#include <image.h>
#include <fs.h>
+#include <asm/cache.h>
#include <asm/io.h>
struct blk_dev {
const char *ifname;
+ const char *filename;
char dev_part_str[8];
};
@@ -30,11 +32,11 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
return ret;
}
- ret = fs_read(load->filename, virt_to_phys(buf), file_offset, size,
+ ret = fs_read(dev->filename, virt_to_phys(buf), file_offset, size,
&actlen);
if (ret < 0) {
printf("spl: error reading image %s. Err - %d\n",
- load->filename, ret);
+ dev->filename, ret);
return ret;
}
@@ -85,9 +87,9 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.read = spl_fit_read;
- load.bl_len = 1;
- load.filename = (void *)filename;
+ load.bl_len = ARCH_DMA_MINALIGN;
load.priv = &dev;
+ dev.filename = filename;
return spl_load_simple_fit(spl_image, &load, 0, header);
}
@@ -51,7 +51,7 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
{
loff_t actread;
int ret;
- char *filename = (char *)load->filename;
+ char *filename = load->priv;
ret = fat_read_file(filename, buf, file_offset, size, &actread);
if (ret)
@@ -97,8 +97,8 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.read = spl_fit_read;
- load.bl_len = 1;
- load.filename = (void *)filename;
+ load.bl_len = ARCH_DMA_MINALIGN;
+ load.priv = (void *)filename;
return spl_load_simple_fit(spl_image, &load, 0, header);
} else {
@@ -14,7 +14,6 @@
#include <mapmem.h>
#include <spl.h>
#include <sysinfo.h>
-#include <asm/cache.h>
#include <asm/global_data.h>
#include <asm/io.h>
#include <linux/libfdt.h>
@@ -172,28 +171,11 @@ static int spl_fit_get_image_node(const struct spl_fit_info *ctx,
static int get_aligned_image_offset(struct spl_load_info *info, int offset)
{
- /*
- * If it is a FS read, get the first address before offset which is
- * aligned to ARCH_DMA_MINALIGN. If it is raw read return the
- * block number to which offset belongs.
- */
- if (info->filename)
- return offset & ~(ARCH_DMA_MINALIGN - 1);
-
return ALIGN_DOWN(offset, info->bl_len);
}
static int get_aligned_image_overhead(struct spl_load_info *info, int offset)
{
- /*
- * If it is a FS read, get the difference between the offset and
- * the first address before offset which is aligned to
- * ARCH_DMA_MINALIGN. If it is raw read return the offset within the
- * block.
- */
- if (info->filename)
- return offset & (ARCH_DMA_MINALIGN - 1);
-
return offset & (info->bl_len - 1);
}
@@ -202,9 +184,6 @@ static int get_aligned_image_size(struct spl_load_info *info, int data_size,
{
data_size = data_size + get_aligned_image_overhead(info, offset);
- if (info->filename)
- return data_size;
-
return ALIGN(data_size, info->bl_len);
}
@@ -295,7 +274,7 @@ static int load_simple_fit(struct spl_load_info *info, ulong fit_offset,
if (info->read(info,
fit_offset +
get_aligned_image_offset(info, offset), size,
- src_ptr) != size)
+ src_ptr) < length)
return -EIO;
debug("External data: dst=%p, offset=%x, size=%lx\n",
@@ -45,7 +45,8 @@ static struct boot_img_t *read_auth_image(struct spl_image_info *spl_image,
container, offset, size);
if (info->read(info, offset, size,
map_sysmem(images[image_index].dst - overhead,
- images[image_index].size)) != size) {
+ images[image_index].size)) <
+ images[image_index].size) {
printf("%s wrong\n", __func__);
return NULL;
}
@@ -77,7 +78,8 @@ static int read_auth_container(struct spl_image_info *spl_image,
debug("%s: container: %p offset: %lu size: %u\n", __func__,
container, offset, size);
- if (info->read(info, offset, size, container) != size) {
+ if (info->read(info, offset, size, container) <
+ CONTAINER_HDR_ALIGNMENT) {
ret = -EIO;
goto end;
}
@@ -107,7 +109,7 @@ static int read_auth_container(struct spl_image_info *spl_image,
debug("%s: container: %p offset: %lu size: %u\n",
__func__, container, offset, size);
- if (info->read(info, offset, size, container) != size) {
+ if (info->read(info, offset, size, container) < length) {
ret = -EIO;
goto end;
}
@@ -108,7 +108,6 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.priv = bd;
- load.filename = NULL;
load.bl_len = bd->blksz;
load.read = h_spl_load_read;
ret = spl_load_simple_fit(spl_image, &load,
@@ -118,7 +117,6 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
struct spl_load_info load;
load.priv = bd;
- load.filename = NULL;
load.bl_len = bd->blksz;
load.read = h_spl_load_read;
@@ -90,7 +90,6 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.priv = &offset;
- load.filename = NULL;
load.bl_len = bl_len;
load.read = spl_nand_fit_read;
return spl_load_simple_fit(spl_image, &load, offset, header);
@@ -99,7 +98,6 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
struct spl_load_info load;
load.priv = &offset;
- load.filename = NULL;
load.bl_len = bl_len;
load.read = spl_nand_fit_read;
return spl_load_imx_container(spl_image, &load, offset);
@@ -108,7 +106,6 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
struct spl_load_info load;
debug("Found legacy image\n");
- load.filename = NULL;
load.bl_len = IS_ENABLED(CONFIG_SPL_LZMA) ? bl_len : 1;
load.read = spl_nand_legacy_read;
@@ -69,7 +69,6 @@ static int spl_smh_load_image(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.read = smh_fit_read;
load.bl_len = 1;
- load.filename = NULL;
load.priv = &fd;
ret = spl_load_simple_fit(spl_image, &load, 0, header);
@@ -152,7 +152,6 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.priv = flash;
- load.filename = NULL;
load.bl_len = 1;
load.read = spl_spi_fit_read;
err = spl_load_simple_fit(spl_image, &load,
@@ -163,7 +162,6 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
struct spl_load_info load;
load.priv = flash;
- load.filename = NULL;
load.bl_len = 1;
load.read = spl_spi_fit_read;
@@ -135,7 +135,6 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image,
debug("Found FIT\n");
load.priv = (void *)&info;
- load.filename = NULL;
load.bl_len = 1;
info.buf = buf;
info.image_read = BUF_SIZE;
@@ -287,12 +287,10 @@ static inline void *spl_image_fdt_addr(struct spl_image_info *info)
*
* @priv: Private data for the device
* @bl_len: Block length for reading in bytes
- * @filename: Name of the fit image file.
* @read: Function to call to read from the device
*/
struct spl_load_info {
void *priv;
- const char *filename;
/**
* read() - Read from device
*
@@ -57,7 +57,6 @@ static int spl_test_load(struct unit_test_state *uts)
ret = sandbox_find_next_phase(fname, sizeof(fname), true);
if (ret)
ut_assertf(0, "%s not found, error %d\n", fname, ret);
- load.filename = fname;
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
For filesystems, filename serves the same purpose as priv. However, spl_load_fit_image also uses it to determine whether to use a DMA-aligned buffer. This is beneficial for FAT, which uses a bounce-buffer if the destination is not DMA-aligned. Remove this logic, and instead achieve it by setting bl_len to ARCH_DMA_MINALIGN. With this done, we can remove filename entirely. One wrinkle bears mentioning: because filesystems are not block-based, we may read less than the size passed to spl_load_info.read. This can happen if the file size is not DMA-aligned. This is fine as long as we read the amount we originally wanted to. Modify the conditions for callers of spl_load_info.read to check against the original, unaligned size to avoid failing spuriously. Signed-off-by: Sean Anderson <seanga2@gmail.com> --- Changes in v6: - New arch/arm/mach-sunxi/spl_spi_sunxi.c | 1 - common/spl/spl_blk_fs.c | 10 ++++++---- common/spl/spl_fat.c | 6 +++--- common/spl/spl_fit.c | 23 +---------------------- common/spl/spl_imx_container.c | 8 +++++--- common/spl/spl_mmc.c | 2 -- common/spl/spl_nand.c | 3 --- common/spl/spl_semihosting.c | 1 - common/spl/spl_spi.c | 2 -- common/spl/spl_ymodem.c | 1 - include/spl.h | 2 -- test/image/spl_load_os.c | 1 - 12 files changed, 15 insertions(+), 45 deletions(-)