spl: Remove filename from spl_load_info

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. However, this is unnecessary now that
filesystems set bl_len to ARCH_DMA_MINALIGN instead. With this done, we can
remove filename entirely.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-sunxi/spl_spi_sunxi.c b/arch/arm/mach-sunxi/spl_spi_sunxi.c
index 896aba69c3293641931e5995e02674cd1756562d..5e7fba0c8e4b37703ae9422ceada06c4ab5634ef 100644 (file)
--- a/arch/arm/mach-sunxi/spl_spi_sunxi.c
+++ b/arch/arm/mach-sunxi/spl_spi_sunxi.c
@@ -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,

diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c
index c105c55877af4de86417eda4331639f3e682caf1..4975ce4d6ece1ea3e7e2ea2b21bb2b574f24df29 100644 (file)
--- a/common/spl/spl_blk_fs.c
+++ b/common/spl/spl_blk_fs.c
@@ -14,6 +14,7 @@
 
 struct blk_dev {
        const char *ifname;
+       const char *filename;
        char dev_part_str[8];
 };
 
@@ -31,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;
        }
 
@@ -87,8 +88,8 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
                debug("Found FIT\n");
                load.read = spl_fit_read;
                load.bl_len = ARCH_DMA_MINALIGN;
-               load.filename = (void *)filename;
                load.priv = &dev;
+               dev.filename = filename;
 
                return spl_load_simple_fit(spl_image, &load, 0, header);
        }

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 5b723456478996de4e533f43647b392b669580d1..8a2c4e3af4929a3935b4d0490591e6f376877d7f 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -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)
@@ -98,7 +98,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
                debug("Found FIT\n");
                load.read = spl_fit_read;
                load.bl_len = ARCH_DMA_MINALIGN;
-               load.filename = (void *)filename;
+               load.priv = (void *)filename;
 
                return spl_load_simple_fit(spl_image, &load, 0, header);
        } else {

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 9f41ea648cee448509d6d919dab3e43d73675fbb..8c4ffe743d55ca6c4aed0cf9418d9f73bbf9c450 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -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;
 

diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c
index 1fcc89fa66036773baea3843a09f86f7db890b70..45d7c5f6cfb24a75dfb3748f3f79a85c4aca3185 100644 (file)
--- a/common/spl/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -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;
 

diff --git a/common/spl/spl_semihosting.c b/common/spl/spl_semihosting.c
index 8f11c29913f20d2b443ed6a31f64176ad3045002..24a3d9fd1c9e9b2423945873dff9207c25cc9b53 100644 (file)
--- a/common/spl/spl_semihosting.c
+++ b/common/spl/spl_semihosting.c
@@ -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);

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index af7a28e7c25dc08c640f2e45afc2ad4fd815177c..373caea322a6c2482a41b3749ab7d33c17900fad 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -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;
 

diff --git a/common/spl/spl_ymodem.c b/common/spl/spl_ymodem.c
index 8616cb3e915c96ac3e4702230d0dd09e0c462e78..3f92b9b003693aa632d73cb3af3d89c9e5e11e8f 100644 (file)
--- a/common/spl/spl_ymodem.c
+++ b/common/spl/spl_ymodem.c
@@ -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;

diff --git a/include/spl.h b/include/spl.h
index 5a355e0a1e0579fbe6f8fd99da369f64bdb04756..fec656d30183dce1204ffd5675f1f72a5d7b0150 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -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
         *

diff --git a/test/image/spl_load_os.c b/test/image/spl_load_os.c
index 794cfad4e70e4507e3362d8e370917e47ddc3932..f46df907c637f4c90e96642721917076a747cb03 100644 (file)
--- a/test/image/spl_load_os.c
+++ b/test/image/spl_load_os.c
@@ -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));