vbe: Update simple-fw to support using the SPL loader

For a sandbox implementation, where code size is no object, it makes sense
to use the full bootstd drivers to load images.

For real boards, running from SRAM, this adds quite a bit of overhead.

Add a way to load the next phase using just the underlying storage
driver, to reduce code size. For now, only MMC is supported.

Change the log_debug() to show the load address and size in a more
neutral way, rather than suggesting that the load has already happened.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/vbe_common.c b/boot/vbe_common.c
index 2bc6c4d..0d51fe7 100644 (file)
--- a/boot/vbe_common.c
+++ b/boot/vbe_common.c
@@ -239,7 +239,7 @@ int vbe_read_fit(struct udevice *blk, ulong area_offset, ulong area_size,
        if (ret < 0)
                return log_msg_ret("ld", ret);
        node = ret;
-       log_debug("loaded to %lx\n", load_addr);
+       log_debug("load %lx size %lx\n", load_addr, len);
 
        fdt_load_addr = 0;
        fdt_size = 0;

diff --git a/boot/vbe_simple_fw.c b/boot/vbe_simple_fw.c
index 9da3e49..cb5534f 100644 (file)
--- a/boot/vbe_simple_fw.c
+++ b/boot/vbe_simple_fw.c
@@ -8,6 +8,7 @@
 
 #define LOG_CATEGORY LOGC_BOOT
 
+#include <binman_sym.h>
 #include <bloblist.h>
 #include <bootdev.h>
 #include <bootflow.h>
@@ -17,13 +18,24 @@
 #include <image.h>
 #include <log.h>
 #include <mapmem.h>
-#include <memalign.h>
 #include <mmc.h>
 #include <spl.h>
 #include <vbe.h>
 #include <dm/device-internal.h>
+#include "vbe_common.h"
 #include "vbe_simple.h"
 
+#ifdef CONFIG_BOOTMETH_VBE_SIMPLE
+binman_sym_extern(ulong, vbe_a, image_pos);
+binman_sym_extern(ulong, vbe_a, size);
+#else
+binman_sym_declare(ulong, vbe_a, image_pos);
+binman_sym_declare(ulong, vbe_a, size);
+#endif
+
+binman_sym_declare(ulong, vpl, image_pos);
+binman_sym_declare(ulong, vpl, size);
+
 /**
  * vbe_simple_read_bootflow_fw() - Create a bootflow for firmware
  *
@@ -54,6 +66,8 @@ int vbe_simple_read_bootflow_fw(struct udevice *dev, struct bootflow *bflow)
        ret = vbe_read_fit(blk, priv->area_start + priv->skip_offset,
                           priv->area_size, NULL, &load_addr, &len,
                           &bflow->name);
+       if (ret)
+               return log_msg_ret("vbe", ret);
 
        /* set up the bootflow with the info we obtained */
        bflow->blk = blk;
@@ -63,16 +77,14 @@ int vbe_simple_read_bootflow_fw(struct udevice *dev, struct bootflow *bflow)
        return 0;
 }
 
-static int simple_load_from_image(struct spl_image_info *spl_image,
+static int simple_load_from_image(struct spl_image_info *image,
                                  struct spl_boot_device *bootdev)
 {
-       struct udevice *meth, *bdev;
-       struct simple_priv *priv;
-       struct bootflow bflow;
        struct vbe_handoff *handoff;
        int ret;
 
-       if (xpl_phase() != PHASE_VPL && xpl_phase() != PHASE_SPL)
+       if (xpl_phase() != PHASE_VPL && xpl_phase() != PHASE_SPL &&
+           xpl_phase() != PHASE_TPL)
                return -ENOENT;
 
        ret = bloblist_ensure_size(BLOBLISTT_VBE, sizeof(struct vbe_handoff),
@@ -80,36 +92,64 @@ static int simple_load_from_image(struct spl_image_info *spl_image,
        if (ret)
                return log_msg_ret("ro", ret);
 
-       vbe_find_first_device(&meth);
-       if (!meth)
-               return log_msg_ret("vd", -ENODEV);
-       log_debug("vbe dev %s\n", meth->name);
-       ret = device_probe(meth);
-       if (ret)
-               return log_msg_ret("probe", ret);
-
-       priv = dev_get_priv(meth);
-       log_debug("simple %s\n", priv->storage);
-       ret = bootdev_find_by_label(priv->storage, &bdev, NULL);
-       if (ret)
-               return log_msg_ret("bd", ret);
-       log_debug("bootdev %s\n", bdev->name);
-
-       bootflow_init(&bflow, bdev, meth);
-       ret = bootmeth_read_bootflow(meth, &bflow);
-       log_debug("\nfw ret=%d\n", ret);
-       if (ret)
-               return log_msg_ret("rd", ret);
-
-       /* jump to the image */
-       spl_image->flags = SPL_SANDBOXF_ARG_IS_BUF;
-       spl_image->arg = bflow.buf;
-       spl_image->size = bflow.size;
-       log_debug("Image: %s at %p size %x\n", bflow.name, bflow.buf,
-                 bflow.size);
-
-       /* this is not used from now on, so free it */
-       bootflow_free(&bflow);
+       if (USE_BOOTMETH) {
+               struct udevice *meth, *bdev;
+               struct simple_priv *priv;
+               struct bootflow bflow;
+
+               vbe_find_first_device(&meth);
+               if (!meth)
+                       return log_msg_ret("vd", -ENODEV);
+               log_debug("vbe dev %s\n", meth->name);
+               ret = device_probe(meth);
+               if (ret)
+                       return log_msg_ret("probe", ret);
+
+               priv = dev_get_priv(meth);
+               log_debug("simple %s\n", priv->storage);
+               ret = bootdev_find_by_label(priv->storage, &bdev, NULL);
+               if (ret)
+                       return log_msg_ret("bd", ret);
+               log_debug("bootdev %s\n", bdev->name);
+
+               bootflow_init(&bflow, bdev, meth);
+               ret = bootmeth_read_bootflow(meth, &bflow);
+               log_debug("\nfw ret=%d\n", ret);
+               if (ret)
+                       return log_msg_ret("rd", ret);
+
+               /* jump to the image */
+               image->flags = SPL_SANDBOXF_ARG_IS_BUF;
+               image->arg = bflow.buf;
+               image->size = bflow.size;
+               log_debug("Image: %s at %p size %x\n", bflow.name, bflow.buf,
+                         bflow.size);
+
+               /* this is not used from now on, so free it */
+               bootflow_free(&bflow);
+       } else {
+               struct udevice *media, *blk;
+               ulong offset, size;
+
+               ret = uclass_get_device_by_seq(UCLASS_MMC, 1, &media);
+               if (ret)
+                       return log_msg_ret("vdv", ret);
+               ret = blk_get_from_parent(media, &blk);
+               if (ret)
+                       return log_msg_ret("med", ret);
+               if (xpl_phase() == PHASE_TPL) {
+                       offset = binman_sym(ulong, vpl, image_pos);
+                       size = binman_sym(ulong, vpl, size);
+               } else {
+                       offset = binman_sym(ulong, vbe_a, image_pos);
+                       size = binman_sym(ulong, vbe_a, size);
+                       printf("offset=%lx\n", offset);
+               }
+
+               ret = vbe_read_fit(blk, offset, size, image, NULL, NULL, NULL);
+               if (ret)
+                       return log_msg_ret("vbe", ret);
+       }
 
        /* Record that VBE was used in this phase */
        handoff->phases |= 1 << xpl_phase();