lkml.org 
[lkml]   [2024]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/7] remoteproc: core: Implement the support of an alternative boot
    Date
    Implement a new method to load a firmware and start the remote processor.
    In this method the firmware is loaded first and then the loaded resource
    table is obtained.

    Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
    ---
    drivers/remoteproc/remoteproc_core.c | 86 +++++++++++++++++++++++++++-
    include/linux/remoteproc.h | 2 +
    2 files changed, 87 insertions(+), 1 deletion(-)

    diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
    index 34b0093689da..47956e07365e 100644
    --- a/drivers/remoteproc/remoteproc_core.c
    +++ b/drivers/remoteproc/remoteproc_core.c
    @@ -38,6 +38,7 @@
    #include <linux/virtio_ring.h>
    #include <asm/byteorder.h>
    #include <linux/platform_device.h>
    +#include <linux/tee_remoteproc.h>

    #include "remoteproc_internal.h"

    @@ -1493,6 +1494,86 @@ static int rproc_set_rsc_table(struct rproc *rproc)
    return 0;
    }

    +/*
    + * Alternative method to load a firmware and boot a remote processor with it.
    + * Similar to rproc_fw_boot but the resource table is obtained and parsed only after loading the
    + * firmware.
    + */
    +static int rproc_alt_fw_boot(struct rproc *rproc, const struct firmware *fw)
    +{
    + struct device *dev = &rproc->dev;
    + const char *name = rproc->firmware;
    + int ret;
    +
    + dev_info(dev, "Booting a private format image %s, size %zd\n", name, fw->size);
    +
    + /*
    + * if enabling an IOMMU isn't relevant for this rproc, this is
    + * just a nop
    + */
    + ret = rproc_enable_iommu(rproc);
    + if (ret) {
    + dev_err(dev, "can't enable iommu: %d\n", ret);
    + return ret;
    + }
    +
    + /* Prepare rproc for firmware loading if needed */
    + ret = rproc_prepare_device(rproc);
    + if (ret) {
    + dev_err(dev, "can't prepare rproc %s: %d\n", rproc->name, ret);
    + goto disable_iommu;
    + }
    +
    + /* load the image to memory */
    + ret = rproc_load_segments(rproc, fw);
    + if (ret) {
    + dev_err(dev, "Failed to load firmware: %d\n", ret);
    + return ret;
    + }
    +
    + ret = rproc_set_rsc_table(rproc);
    + if (ret) {
    + dev_err(dev, "can't load resource table: %d\n", ret);
    + goto unprepare_device;
    + }
    +
    + /* reset max_notifyid */
    + rproc->max_notifyid = -1;
    +
    + /* reset handled vdev */
    + rproc->nb_vdev = 0;
    +
    + /* handle fw resources which are required to boot rproc */
    + ret = rproc_handle_resources(rproc, rproc_loading_handlers);
    + if (ret) {
    + dev_err(dev, "Failed to process resources: %d\n", ret);
    + goto clean_up_resources;
    + }
    +
    + /* Allocate carveout resources associated to rproc */
    + ret = rproc_alloc_registered_carveouts(rproc);
    + if (ret) {
    + dev_err(dev, "Failed to allocate associated carveouts: %d\n",
    + ret);
    + goto clean_up_resources;
    + }
    +
    + ret = rproc_start(rproc, fw);
    + if (ret)
    + goto clean_up_resources;
    +
    + return 0;
    +
    +clean_up_resources:
    + rproc_resource_cleanup(rproc);
    +unprepare_device:
    + /* release HW resources if needed */
    + rproc_unprepare_device(rproc);
    +disable_iommu:
    + rproc_disable_iommu(rproc);
    + return ret;
    +}
    +
    static int rproc_reset_rsc_table_on_detach(struct rproc *rproc)
    {
    struct resource_table *table_ptr;
    @@ -1957,7 +2038,10 @@ int rproc_boot(struct rproc *rproc)
    goto downref_rproc;
    }

    - ret = rproc_fw_boot(rproc, firmware_p);
    + if (rproc->alt_boot)
    + ret = rproc_alt_fw_boot(rproc, firmware_p);
    + else
    + ret = rproc_fw_boot(rproc, firmware_p);

    release_firmware(firmware_p);
    }
    diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
    index b4795698d8c2..ba219a77e055 100644
    --- a/include/linux/remoteproc.h
    +++ b/include/linux/remoteproc.h
    @@ -544,6 +544,7 @@ enum rproc_features {
    * @elf_machine: firmware ELF machine
    * @cdev: character device of the rproc
    * @cdev_put_on_release: flag to indicate if remoteproc should be shutdown on @char_dev release
    + * @alt_boot flag to indicate if remoteproc should use the alternate boot method.
    * @features: indicate remoteproc features
    */
    struct rproc {
    @@ -585,6 +586,7 @@ struct rproc {
    u16 elf_machine;
    struct cdev cdev;
    bool cdev_put_on_release;
    + bool alt_boot;
    DECLARE_BITMAP(features, RPROC_MAX_FEATURES);
    };

    --
    2.25.1

    \
     
     \ /
      Last update: 2024-05-27 15:02    [W:3.618 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site