spl: Convert NVMe to spl_load

This converts the blk load method (used exclusively by NVMe) to use
spl_load. As a consequence, it also adds support for LOAD_FIT_FULL and
IMX images.

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

diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c
index 53b8e1b11b4b5efcef8c264530424565ffb3c35e..ac267ab979bb8e4408fe3a35394a83ad2ffaa738 100644 (file)
--- a/common/spl/spl_blk_fs.c
+++ b/common/spl/spl_blk_fs.c
@@ -7,6 +7,7 @@
 
 #include <common.h>
 #include <spl.h>
+#include <spl_load.h>
 #include <image.h>
 #include <fs.h>
 #include <asm/cache.h>
@@ -48,11 +49,11 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
                       enum uclass_id uclass_id, int devnum, int partnum)
 {
        const char *filename = CONFIG_SPL_FS_LOAD_PAYLOAD_NAME;
-       struct legacy_img_hdr *header;
        struct blk_desc *blk_desc;
-       loff_t actlen, filesize;
+       loff_t filesize;
        struct blk_dev dev;
-       int ret = -ENODEV;
+       struct spl_load_info load;
+       int ret;
 
        blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum);
        if (!blk_desc) {
@@ -61,8 +62,8 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
        }
 
        blk_show_device(uclass_id, devnum);
-       header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
 
+       dev.filename = filename;
        dev.ifname = blk_get_uclass_name(uclass_id);
        snprintf(dev.dev_part_str, sizeof(dev.dev_part_str) - 1, "%x:%x",
                 devnum, partnum);
@@ -70,63 +71,18 @@ int spl_blk_load_image(struct spl_image_info *spl_image,
        if (ret) {
                printf("spl: unable to set blk_dev %s %s. Err - %d\n",
                       dev.ifname, dev.dev_part_str, ret);
-               goto out;
-       }
-
-       ret = fs_read(filename, virt_to_phys(header), 0,
-                     sizeof(struct legacy_img_hdr), &actlen);
-       if (ret) {
-               printf("spl: unable to read file %s. Err - %d\n", filename,
-                      ret);
-               goto out;
-       }
-
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
-           image_get_magic(header) == FDT_MAGIC) {
-               struct spl_load_info load;
-
-               debug("Found FIT\n");
-               load.read = spl_fit_read;
-               spl_set_bl_len(&load, ARCH_DMA_MINALIGN);
-               load.priv = &dev;
-               dev.filename = filename;
-
-               return spl_load_simple_fit(spl_image, &load, 0, header);
-       }
-
-       ret = spl_parse_image_header(spl_image, bootdev, header);
-       if (ret) {
-               printf("spl: unable to parse image header. Err - %d\n",
-                      ret);
-               goto out;
-       }
-
-       ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY);
-       if (ret) {
-               printf("spl: unable to set blk_dev %s %s. Err - %d\n",
-                      dev.ifname, dev.dev_part_str, ret);
-               goto out;
+               return ret;
        }
 
        ret = fs_size(filename, &filesize);
        if (ret) {
                printf("spl: unable to get file size: %s. Err - %d\n",
                       filename, ret);
-               goto out;
-       }
-
-       ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY);
-       if (ret) {
-               printf("spl: unable to set blk_dev %s %s. Err - %d\n",
-                      dev.ifname, dev.dev_part_str, ret);
-               goto out;
+               return ret;
        }
 
-       ret = fs_read(filename, (ulong)spl_image->load_addr, 0, filesize,
-                     &actlen);
-       if (ret)
-               printf("spl: unable to read file %s. Err - %d\n",
-                      filename, ret);
-out:
-       return ret;
+       load.read = spl_fit_read;
+       spl_set_bl_len(&load, ARCH_DMA_MINALIGN);
+       load.priv = &dev;
+       return spl_load(spl_image, bootdev, &load, filesize, 0);
 }

diff --git a/include/spl_load.h b/include/spl_load.h
index b48f80324bbe7972f7686b5412220f9dbb625420..2618109cee0fc7f72e87315ee247486da6f830ef 100644 (file)
--- a/include/spl_load.h
+++ b/include/spl_load.h
@@ -95,6 +95,7 @@ static inline int _spl_load(struct spl_image_info *spl_image,
  * inline if there is one caller, and extern otherwise.
  */
 #define SPL_LOAD_USERS \
+       IS_ENABLED(CONFIG_SPL_BLK_FS) + \
        IS_ENABLED(CONFIG_SPL_FS_EXT4) + \
        IS_ENABLED(CONFIG_SPL_FS_FAT) + \
        IS_ENABLED(CONFIG_SPL_SYS_MMCSD_RAW_MODE) + \

diff --git a/test/image/spl_load_fs.c b/test/image/spl_load_fs.c
index 67c19da95e75777a6c1ebed66d72e34815080a93..5f1de5486f4e7fc8bddd44ab8d2e74540904a4ba 100644 (file)
--- a/test/image/spl_load_fs.c
+++ b/test/image/spl_load_fs.c
@@ -395,6 +395,8 @@ static int spl_test_blk(struct unit_test_state *uts, const char *test_name,
        return spl_test_mmc_fs(uts, test_name, type, create_ext2, true);
 }
 SPL_IMG_TEST(spl_test_blk, LEGACY, DM_FLAGS);
+SPL_IMG_TEST(spl_test_blk, LEGACY_LZMA, DM_FLAGS);
+SPL_IMG_TEST(spl_test_blk, IMX8, DM_FLAGS);
 SPL_IMG_TEST(spl_test_blk, FIT_EXTERNAL, DM_FLAGS);
 SPL_IMG_TEST(spl_test_blk, FIT_INTERNAL, DM_FLAGS);