Merge tag 'rproc-v4.16' of git://github.com/andersson/remoteproc

Pull remoteproc updates from Bjorn Andersson:
 "This contains a few bug fixes and a cleanup up of the resource-table
  handling in the framework, which removes the need for drivers with no
  resource table to provide a fake one"

* tag 'rproc-v4.16' of git://github.com/andersson/remoteproc:
  remoteproc: Reset table_ptr on stop
  remoteproc: Drop dangling find_rsc_table dummies
  remoteproc: Move resource table load logic to find
  remoteproc: Don't handle empty resource table
  remoteproc: Merge rproc_ops and rproc_fw_ops
  remoteproc: Clone rproc_ops in rproc_alloc()
  remoteproc: Cache resource table size
  remoteproc: Remove depricated crash completion
  virtio_remoteproc: correct put_device virtio_device.dev

diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index 3f6af54dbc9656703d3cf2c2328c394a517bd83b..373c167892d7d4754ccef7161f1f3fea1054afc6 100644 (file)
--- a/drivers/remoteproc/qcom_adsp_pil.c
+++ b/drivers/remoteproc/qcom_adsp_pil.c
@@ -85,11 +85,6 @@ static int adsp_load(struct rproc *rproc, const struct firmware *fw)
                             adsp->mem_region, adsp->mem_phys, adsp->mem_size);
 }
 
-static const struct rproc_fw_ops adsp_fw_ops = {
-       .find_rsc_table = qcom_mdt_find_rsc_table,
-       .load = adsp_load,
-};
-
 static int adsp_start(struct rproc *rproc)
 {
        struct qcom_adsp *adsp = (struct qcom_adsp *)rproc->priv;
@@ -182,6 +177,7 @@ static const struct rproc_ops adsp_ops = {
        .start = adsp_start,
        .stop = adsp_stop,
        .da_to_va = adsp_da_to_va,
+       .load = adsp_load,
 };
 
 static irqreturn_t adsp_wdog_interrupt(int irq, void *dev)
@@ -344,8 +340,6 @@ static int adsp_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       rproc->fw_ops = &adsp_fw_ops;
-
        adsp = (struct qcom_adsp *)rproc->priv;
        adsp->dev = &pdev->dev;
        adsp->rproc = rproc;

diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
index e9b5f2a98c4dbfea4772085099de3e17c5b6d64e..00602499713f43e3b82d92852c4225ab748fe0ef 100644 (file)
--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
@@ -32,25 +32,6 @@
 
 static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);
 
-/**
- * qcom_mdt_find_rsc_table() - provide dummy resource table for remoteproc
- * @rproc:     remoteproc handle
- * @fw:                firmware header
- * @tablesz:   outgoing size of the table
- *
- * Returns a dummy table.
- */
-struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc,
-                                              const struct firmware *fw,
-                                              int *tablesz)
-{
-       static struct resource_table table = { .ver = 1, };
-
-       *tablesz = sizeof(table);
-       return &table;
-}
-EXPORT_SYMBOL_GPL(qcom_mdt_find_rsc_table);
-
 static int glink_subdev_probe(struct rproc_subdev *subdev)
 {
        struct qcom_rproc_glink *glink = to_glink_subdev(subdev);

diff --git a/drivers/remoteproc/qcom_common.h b/drivers/remoteproc/qcom_common.h
index 832e20271664e020e99182ca0247298999b4620e..728be9834d8b2196eac80865f261acd40ffc1b87 100644 (file)
--- a/drivers/remoteproc/qcom_common.h
+++ b/drivers/remoteproc/qcom_common.h
@@ -27,10 +27,6 @@ struct qcom_rproc_ssr {
        const char *name;
 };
 
-struct resource_table *qcom_mdt_find_rsc_table(struct rproc *rproc,
-                                              const struct firmware *fw,
-                                              int *tablesz);
-
 void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink);
 void qcom_remove_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink);
 

diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 8a3fa2bcc9f699da150222335c37e3e96eb31f26..b4e5e725848d263936d93b7bbe1645dd94e37ce1 100644 (file)
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -303,16 +303,6 @@ static void q6v5_clk_disable(struct device *dev,
                clk_disable_unprepare(clks[i]);
 }
 
-static struct resource_table *q6v5_find_rsc_table(struct rproc *rproc,
-                                                 const struct firmware *fw,
-                                                 int *tablesz)
-{
-       static struct resource_table table = { .ver = 1, };
-
-       *tablesz = sizeof(table);
-       return &table;
-}
-
 static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
                                   bool remote_owner, phys_addr_t addr,
                                   size_t size)
@@ -342,11 +332,6 @@ static int q6v5_load(struct rproc *rproc, const struct firmware *fw)
        return 0;
 }
 
-static const struct rproc_fw_ops q6v5_fw_ops = {
-       .find_rsc_table = q6v5_find_rsc_table,
-       .load = q6v5_load,
-};
-
 static int q6v5_rmb_pbl_wait(struct q6v5 *qproc, int ms)
 {
        unsigned long timeout;
@@ -931,6 +916,7 @@ static const struct rproc_ops q6v5_ops = {
        .start = q6v5_start,
        .stop = q6v5_stop,
        .da_to_va = q6v5_da_to_va,
+       .load = q6v5_load,
 };
 
 static irqreturn_t q6v5_wdog_interrupt(int irq, void *dev)
@@ -1150,8 +1136,6 @@ static int q6v5_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       rproc->fw_ops = &q6v5_fw_ops;
-
        qproc = (struct q6v5 *)rproc->priv;
        qproc->dev = &pdev->dev;
        qproc->rproc = rproc;

diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c
index c7686393d5056ee230282308c16d7ce12cba25df..3f0609236a769c995f75a411c37b638177254400 100644 (file)
--- a/drivers/remoteproc/qcom_wcnss.c
+++ b/drivers/remoteproc/qcom_wcnss.c
@@ -156,11 +156,6 @@ static int wcnss_load(struct rproc *rproc, const struct firmware *fw)
                             wcnss->mem_region, wcnss->mem_phys, wcnss->mem_size);
 }
 
-static const struct rproc_fw_ops wcnss_fw_ops = {
-       .find_rsc_table = qcom_mdt_find_rsc_table,
-       .load = wcnss_load,
-};
-
 static void wcnss_indicate_nv_download(struct qcom_wcnss *wcnss)
 {
        u32 val;
@@ -313,6 +308,7 @@ static const struct rproc_ops wcnss_ops = {
        .start = wcnss_start,
        .stop = wcnss_stop,
        .da_to_va = wcnss_da_to_va,
+       .load = wcnss_load,
 };
 
 static irqreturn_t wcnss_wdog_interrupt(int irq, void *dev)
@@ -492,8 +488,6 @@ static int wcnss_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       rproc->fw_ops = &wcnss_fw_ops;
-
        wcnss = (struct qcom_wcnss *)rproc->priv;
        wcnss->dev = &pdev->dev;
        wcnss->rproc = rproc;

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index eab14b414bf0dda6e7461b7b05246f4842844090..4170dfbd93bdba5e9fa6a57e5c68ec9d95a9a274 100644 (file)
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -732,17 +732,20 @@ static rproc_handle_resource_t rproc_loading_handlers[RSC_LAST] = {
 };
 
 /* handle firmware resource entries before booting the remote processor */
-static int rproc_handle_resources(struct rproc *rproc, int len,
+static int rproc_handle_resources(struct rproc *rproc,
                                  rproc_handle_resource_t handlers[RSC_LAST])
 {
        struct device *dev = &rproc->dev;
        rproc_handle_resource_t handler;
        int ret = 0, i;
 
+       if (!rproc->table_ptr)
+               return 0;
+
        for (i = 0; i < rproc->table_ptr->num; i++) {
                int offset = rproc->table_ptr->offset[i];
                struct fw_rsc_hdr *hdr = (void *)rproc->table_ptr + offset;
-               int avail = len - offset - sizeof(*hdr);
+               int avail = rproc->table_sz - offset - sizeof(*hdr);
                void *rsc = (void *)hdr + sizeof(*hdr);
 
                /* make sure table isn't truncated */
@@ -849,16 +852,9 @@ static void rproc_resource_cleanup(struct rproc *rproc)
 
 static int rproc_start(struct rproc *rproc, const struct firmware *fw)
 {
-       struct resource_table *table, *loaded_table;
+       struct resource_table *loaded_table;
        struct device *dev = &rproc->dev;
-       int ret, tablesz;
-
-       /* look for the resource table */
-       table = rproc_find_rsc_table(rproc, fw, &tablesz);
-       if (!table) {
-               dev_err(dev, "Resource table look up failed\n");
-               return -EINVAL;
-       }
+       int ret;
 
        /* load the ELF segments to memory */
        ret = rproc_load_segments(rproc, fw);
@@ -877,7 +873,7 @@ static int rproc_start(struct rproc *rproc, const struct firmware *fw)
         */
        loaded_table = rproc_find_loaded_rsc_table(rproc, fw);
        if (loaded_table) {
-               memcpy(loaded_table, rproc->cached_table, tablesz);
+               memcpy(loaded_table, rproc->cached_table, rproc->table_sz);
                rproc->table_ptr = loaded_table;
        }
 
@@ -911,8 +907,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 {
        struct device *dev = &rproc->dev;
        const char *name = rproc->firmware;
-       struct resource_table *table;
-       int ret, tablesz;
+       int ret;
 
        ret = rproc_fw_sanity_check(rproc, fw);
        if (ret)
@@ -931,32 +926,17 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
        }
 
        rproc->bootaddr = rproc_get_boot_addr(rproc, fw);
-       ret = -EINVAL;
 
-       /* look for the resource table */
-       table = rproc_find_rsc_table(rproc, fw, &tablesz);
-       if (!table) {
-               dev_err(dev, "Failed to find resource table\n");
-               goto clean_up;
-       }
-
-       /*
-        * Create a copy of the resource table. When a virtio device starts
-        * and calls vring_new_virtqueue() the address of the allocated vring
-        * will be stored in the cached_table. Before the device is started,
-        * cached_table will be copied into device memory.
-        */
-       rproc->cached_table = kmemdup(table, tablesz, GFP_KERNEL);
-       if (!rproc->cached_table)
-               goto clean_up;
-
-       rproc->table_ptr = rproc->cached_table;
+       /* load resource table */
+       ret = rproc_load_rsc_table(rproc, fw);
+       if (ret)
+               goto disable_iommu;
 
        /* reset max_notifyid */
        rproc->max_notifyid = -1;
 
        /* handle fw resources which are required to boot rproc */
-       ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);
+       ret = rproc_handle_resources(rproc, rproc_loading_handlers);
        if (ret) {
                dev_err(dev, "Failed to process resources: %d\n", ret);
                goto clean_up_resources;
@@ -970,11 +950,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
 
 clean_up_resources:
        rproc_resource_cleanup(rproc);
-clean_up:
        kfree(rproc->cached_table);
        rproc->cached_table = NULL;
        rproc->table_ptr = NULL;
-
+disable_iommu:
        rproc_disable_iommu(rproc);
        return ret;
 }
@@ -1021,6 +1000,9 @@ static int rproc_stop(struct rproc *rproc)
        /* remove any subdevices for the remote processor */
        rproc_remove_subdevices(rproc);
 
+       /* the installed resource table is no longer accessible */
+       rproc->table_ptr = rproc->cached_table;
+
        /* power off the remote processor */
        ret = rproc->ops->stop(rproc);
        if (ret) {
@@ -1028,10 +1010,6 @@ static int rproc_stop(struct rproc *rproc)
                return ret;
        }
 
-       /* if in crash state, unlock crash handler */
-       if (rproc->state == RPROC_CRASHED)
-               complete_all(&rproc->crash_comp);
-
        rproc->state = RPROC_OFFLINE;
 
        dev_info(dev, "stopped remote processor %s\n", rproc->name);
@@ -1057,8 +1035,6 @@ int rproc_trigger_recovery(struct rproc *rproc)
 
        dev_err(dev, "recovering %s\n", rproc->name);
 
-       init_completion(&rproc->crash_comp);
-
        ret = mutex_lock_interruptible(&rproc->lock);
        if (ret)
                return ret;
@@ -1067,9 +1043,6 @@ int rproc_trigger_recovery(struct rproc *rproc)
        if (ret)
                goto unlock_mutex;
 
-       /* wait until there is no more rproc users */
-       wait_for_completion(&rproc->crash_comp);
-
        /* load firmware */
        ret = request_firmware(&firmware_p, rproc->firmware, dev);
        if (ret < 0) {
@@ -1357,6 +1330,7 @@ static void rproc_type_release(struct device *dev)
                ida_simple_remove(&rproc_dev_index, rproc->index);
 
        kfree(rproc->firmware);
+       kfree(rproc->ops);
        kfree(rproc);
 }
 
@@ -1421,9 +1395,15 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
                return NULL;
        }
 
+       rproc->ops = kmemdup(ops, sizeof(*ops), GFP_KERNEL);
+       if (!rproc->ops) {
+               kfree(p);
+               kfree(rproc);
+               return NULL;
+       }
+
        rproc->firmware = p;
        rproc->name = name;
-       rproc->ops = ops;
        rproc->priv = &rproc[1];
        rproc->auto_boot = true;
 
@@ -1445,8 +1425,14 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
 
        atomic_set(&rproc->power, 0);
 
-       /* Set ELF as the default fw_ops handler */
-       rproc->fw_ops = &rproc_elf_fw_ops;
+       /* Default to ELF loader if no load function is specified */
+       if (!rproc->ops->load) {
+               rproc->ops->load = rproc_elf_load_segments;
+               rproc->ops->load_rsc_table = rproc_elf_load_rsc_table;
+               rproc->ops->find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table;
+               rproc->ops->sanity_check = rproc_elf_sanity_check;
+               rproc->ops->get_boot_addr = rproc_elf_get_boot_addr;
+       }
 
        mutex_init(&rproc->lock);
 
@@ -1459,7 +1445,6 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
        INIT_LIST_HEAD(&rproc->subdevs);
 
        INIT_WORK(&rproc->crash_handler, rproc_crash_handler_work);
-       init_completion(&rproc->crash_comp);
 
        rproc->state = RPROC_OFFLINE;
 

diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c
index c523983a4aec483aecad95bce12a04f381885ead..b17d72ec8603bca2b1a6481c2e3d70c37537cbfd 100644 (file)
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -39,8 +39,7 @@
  *
  * Make sure this fw image is sane.
  */
-static int
-rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
+int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
 {
        const char *name = rproc->firmware;
        struct device *dev = &rproc->dev;
@@ -98,6 +97,7 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
 
        return 0;
 }
+EXPORT_SYMBOL(rproc_elf_sanity_check);
 
 /**
  * rproc_elf_get_boot_addr() - Get rproc's boot address.
@@ -110,13 +110,13 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
  * Note that the boot address is not a configurable property of all remote
  * processors. Some will always boot at a specific hard-coded address.
  */
-static
 u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
 {
        struct elf32_hdr *ehdr  = (struct elf32_hdr *)fw->data;
 
        return ehdr->e_entry;
 }
+EXPORT_SYMBOL(rproc_elf_get_boot_addr);
 
 /**
  * rproc_elf_load_segments() - load firmware segments to memory
@@ -142,8 +142,7 @@ u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
  * directly allocate memory for every segment/resource. This is not yet
  * supported, though.
  */
-static int
-rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
+int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
 {
        struct device *dev = &rproc->dev;
        struct elf32_hdr *ehdr;
@@ -207,6 +206,7 @@ rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw)
 
        return ret;
 }
+EXPORT_SYMBOL(rproc_elf_load_segments);
 
 static struct elf32_shdr *
 find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size)
@@ -268,41 +268,49 @@ find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size)
 }
 
 /**
- * rproc_elf_find_rsc_table() - find the resource table
+ * rproc_elf_load_rsc_table() - load the resource table
  * @rproc: the rproc handle
  * @fw: the ELF firmware image
- * @tablesz: place holder for providing back the table size
  *
  * This function finds the resource table inside the remote processor's
- * firmware. It is used both upon the registration of @rproc (in order
- * to look for and register the supported virito devices), and when the
- * @rproc is booted.
+ * firmware, load it into the @cached_table and update @table_ptr.
  *
- * Returns the pointer to the resource table if it is found, and write its
- * size into @tablesz. If a valid table isn't found, NULL is returned
- * (and @tablesz isn't set).
+ * Return: 0 on success, negative errno on failure.
  */
-static struct resource_table *
-rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw,
-                        int *tablesz)
+int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware *fw)
 {
        struct elf32_hdr *ehdr;
        struct elf32_shdr *shdr;
        struct device *dev = &rproc->dev;
        struct resource_table *table = NULL;
        const u8 *elf_data = fw->data;
+       size_t tablesz;
 
        ehdr = (struct elf32_hdr *)elf_data;
 
        shdr = find_table(dev, ehdr, fw->size);
        if (!shdr)
-               return NULL;
+               return -EINVAL;
 
        table = (struct resource_table *)(elf_data + shdr->sh_offset);
-       *tablesz = shdr->sh_size;
+       tablesz = shdr->sh_size;
+
+       /*
+        * Create a copy of the resource table. When a virtio device starts
+        * and calls vring_new_virtqueue() the address of the allocated vring
+        * will be stored in the cached_table. Before the device is started,
+        * cached_table will be copied into device memory.
+        */
+       rproc->cached_table = kmemdup(table, tablesz, GFP_KERNEL);
+       if (!rproc->cached_table)
+               return -ENOMEM;
 
-       return table;
+       rproc->table_ptr = rproc->cached_table;
+       rproc->table_sz = tablesz;
+
+       return 0;
 }
+EXPORT_SYMBOL(rproc_elf_load_rsc_table);
 
 /**
  * rproc_elf_find_loaded_rsc_table() - find the loaded resource table
@@ -315,8 +323,8 @@ rproc_elf_find_rsc_table(struct rproc *rproc, const struct firmware *fw,
  * Returns the pointer to the resource table if it is found or NULL otherwise.
  * If the table wasn't loaded yet the result is unspecified.
  */
-static struct resource_table *
-rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)
+struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,
+                                                      const struct firmware *fw)
 {
        struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data;
        struct elf32_shdr *shdr;
@@ -327,11 +335,4 @@ rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)
 
        return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size);
 }
-
-const struct rproc_fw_ops rproc_elf_fw_ops = {
-       .load = rproc_elf_load_segments,
-       .find_rsc_table = rproc_elf_find_rsc_table,
-       .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
-       .sanity_check = rproc_elf_sanity_check,
-       .get_boot_addr = rproc_elf_get_boot_addr
-};
+EXPORT_SYMBOL(rproc_elf_find_loaded_rsc_table);

diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index c1077bec5d0b848327f1c44331dc1d32ad33bef6..55a2950c5cb734eeb16ca5326d08d45d44a7234f 100644 (file)
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -25,26 +25,6 @@
 
 struct rproc;
 
-/**
- * struct rproc_fw_ops - firmware format specific operations.
- * @find_rsc_table:    find the resource table inside the firmware image
- * @find_loaded_rsc_table: find the loaded resouce table
- * @load:              load firmeware to memory, where the remote processor
- *                     expects to find it
- * @sanity_check:      sanity check the fw image
- * @get_boot_addr:     get boot address to entry point specified in firmware
- */
-struct rproc_fw_ops {
-       struct resource_table *(*find_rsc_table)(struct rproc *rproc,
-                                                const struct firmware *fw,
-                                                int *tablesz);
-       struct resource_table *(*find_loaded_rsc_table)(
-                               struct rproc *rproc, const struct firmware *fw);
-       int (*load)(struct rproc *rproc, const struct firmware *fw);
-       int (*sanity_check)(struct rproc *rproc, const struct firmware *fw);
-       u32 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw);
-};
-
 /* from remoteproc_core.c */
 void rproc_release(struct kref *kref);
 irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id);
@@ -74,11 +54,18 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i);
 void *rproc_da_to_va(struct rproc *rproc, u64 da, int len);
 int rproc_trigger_recovery(struct rproc *rproc);
 
+int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw);
+u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware *fw);
+int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw);
+int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware *fw);
+struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,
+                                                      const struct firmware *fw);
+
 static inline
 int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)
 {
-       if (rproc->fw_ops->sanity_check)
-               return rproc->fw_ops->sanity_check(rproc, fw);
+       if (rproc->ops->sanity_check)
+               return rproc->ops->sanity_check(rproc, fw);
 
        return 0;
 }
@@ -86,8 +73,8 @@ int rproc_fw_sanity_check(struct rproc *rproc, const struct firmware *fw)
 static inline
 u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
 {
-       if (rproc->fw_ops->get_boot_addr)
-               return rproc->fw_ops->get_boot_addr(rproc, fw);
+       if (rproc->ops->get_boot_addr)
+               return rproc->ops->get_boot_addr(rproc, fw);
 
        return 0;
 }
@@ -95,33 +82,29 @@ u32 rproc_get_boot_addr(struct rproc *rproc, const struct firmware *fw)
 static inline
 int rproc_load_segments(struct rproc *rproc, const struct firmware *fw)
 {
-       if (rproc->fw_ops->load)
-               return rproc->fw_ops->load(rproc, fw);
+       if (rproc->ops->load)
+               return rproc->ops->load(rproc, fw);
 
        return -EINVAL;
 }
 
-static inline
-struct resource_table *rproc_find_rsc_table(struct rproc *rproc,
-                                           const struct firmware *fw,
-                                           int *tablesz)
+static inline int rproc_load_rsc_table(struct rproc *rproc,
+                                      const struct firmware *fw)
 {
-       if (rproc->fw_ops->find_rsc_table)
-               return rproc->fw_ops->find_rsc_table(rproc, fw, tablesz);
+       if (rproc->ops->load_rsc_table)
+               return rproc->ops->load_rsc_table(rproc, fw);
 
-       return NULL;
+       return 0;
 }
 
 static inline
 struct resource_table *rproc_find_loaded_rsc_table(struct rproc *rproc,
                                                   const struct firmware *fw)
 {
-       if (rproc->fw_ops->find_loaded_rsc_table)
-               return rproc->fw_ops->find_loaded_rsc_table(rproc, fw);
+       if (rproc->ops->find_loaded_rsc_table)
+               return rproc->ops->find_loaded_rsc_table(rproc, fw);
 
        return NULL;
 }
 
-extern const struct rproc_fw_ops rproc_elf_fw_ops;
-
 #endif /* REMOTEPROC_INTERNAL_H */

diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 294634836b321d01d2adbf5cd2613b488c5eb44f..b0633fd4c04141e9a0ff27f6a80e9dd0dfc8bad6 100644 (file)
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -327,7 +327,7 @@ int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id)
 
        ret = register_virtio_device(vdev);
        if (ret) {
-               put_device(&rproc->dev);
+               put_device(&vdev->dev);
                dev_err(dev, "failed to register vdev: %d\n", ret);
                goto out;
        }

diff --git a/drivers/remoteproc/st_slim_rproc.c b/drivers/remoteproc/st_slim_rproc.c
index 6cfd862f945b48293620145e1bb5380e31ad26a7..1ffb1f0c43d6262052cfed675678c817ef9fd236 100644 (file)
--- a/drivers/remoteproc/st_slim_rproc.c
+++ b/drivers/remoteproc/st_slim_rproc.c
@@ -204,27 +204,9 @@ static const struct rproc_ops slim_rproc_ops = {
        .start          = slim_rproc_start,
        .stop           = slim_rproc_stop,
        .da_to_va       = slim_rproc_da_to_va,
-};
-
-/*
- * Firmware handler operations: sanity, boot address, load ...
- */
-
-static struct resource_table empty_rsc_tbl = {
-       .ver = 1,
-       .num = 0,
-};
-
-static struct resource_table *slim_rproc_find_rsc_table(struct rproc *rproc,
-                                              const struct firmware *fw,
-                                              int *tablesz)
-{
-       *tablesz = sizeof(empty_rsc_tbl);
-       return &empty_rsc_tbl;
-}
-
-static struct rproc_fw_ops slim_rproc_fw_ops = {
-       .find_rsc_table = slim_rproc_find_rsc_table,
+       .get_boot_addr  = rproc_elf_get_boot_addr,
+       .load           = rproc_elf_load_segments,
+       .sanity_check   = rproc_elf_sanity_check,
 };
 
 /**
@@ -249,7 +231,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev,
        struct rproc *rproc;
        struct resource *res;
        int err, i;
-       const struct rproc_fw_ops *elf_ops;
 
        if (!fw_name)
                return ERR_PTR(-EINVAL);
@@ -267,13 +248,6 @@ struct st_slim_rproc *st_slim_rproc_alloc(struct platform_device *pdev,
        slim_rproc = rproc->priv;
        slim_rproc->rproc = rproc;
 
-       elf_ops = rproc->fw_ops;
-       /* Use some generic elf ops */
-       slim_rproc_fw_ops.load = elf_ops->load;
-       slim_rproc_fw_ops.sanity_check = elf_ops->sanity_check;
-
-       rproc->fw_ops = &slim_rproc_fw_ops;
-
        /* get imem and dmem */
        for (i = 0; i < ARRAY_SIZE(mem_names); i++) {
                res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 44e630eb3d9443c94f8d215ca47ceb77a5b04054..728d421fffe983ff877b5ba279d21d7b3857352a 100644 (file)
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -324,6 +324,7 @@ struct rproc_mem_entry {
 };
 
 struct rproc;
+struct firmware;
 
 /**
  * struct rproc_ops - platform-specific device handlers
@@ -331,12 +332,24 @@ struct rproc;
  * @stop:      power off the device
  * @kick:      kick a virtqueue (virtqueue id given as a parameter)
  * @da_to_va:  optional platform hook to perform address translations
+ * @load_rsc_table:    load resource table from firmware image
+ * @find_loaded_rsc_table: find the loaded resouce table
+ * @load:              load firmeware to memory, where the remote processor
+ *                     expects to find it
+ * @sanity_check:      sanity check the fw image
+ * @get_boot_addr:     get boot address to entry point specified in firmware
  */
 struct rproc_ops {
        int (*start)(struct rproc *rproc);
        int (*stop)(struct rproc *rproc);
        void (*kick)(struct rproc *rproc, int vqid);
        void * (*da_to_va)(struct rproc *rproc, u64 da, int len);
+       int (*load_rsc_table)(struct rproc *rproc, const struct firmware *fw);
+       struct resource_table *(*find_loaded_rsc_table)(
+                               struct rproc *rproc, const struct firmware *fw);
+       int (*load)(struct rproc *rproc, const struct firmware *fw);
+       int (*sanity_check)(struct rproc *rproc, const struct firmware *fw);
+       u32 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw);
 };
 
 /**
@@ -390,7 +403,6 @@ enum rproc_crash_type {
  * @priv: private data which belongs to the platform-specific rproc module
  * @ops: platform-specific start/stop rproc handlers
  * @dev: virtual device for refcounting and common remoteproc behavior
- * @fw_ops: firmware-specific handlers
  * @power: refcount of users who need this rproc powered up
  * @state: state of the device
  * @lock: lock which protects concurrent manipulations of the rproc
@@ -406,11 +418,11 @@ enum rproc_crash_type {
  * @index: index of this rproc device
  * @crash_handler: workqueue for handling a crash
  * @crash_cnt: crash counter
- * @crash_comp: completion used to sync crash handler and the rproc reload
  * @recovery_disabled: flag that state if recovery was disabled
  * @max_notifyid: largest allocated notify id.
  * @table_ptr: pointer to the resource table in effect
  * @cached_table: copy of the resource table
+ * @table_sz: size of @cached_table
  * @has_iommu: flag to indicate if remote processor is behind an MMU
  */
 struct rproc {
@@ -419,9 +431,8 @@ struct rproc {
        const char *name;
        char *firmware;
        void *priv;
-       const struct rproc_ops *ops;
+       struct rproc_ops *ops;
        struct device dev;
-       const struct rproc_fw_ops *fw_ops;
        atomic_t power;
        unsigned int state;
        struct mutex lock;
@@ -437,11 +448,11 @@ struct rproc {
        int index;
        struct work_struct crash_handler;
        unsigned int crash_cnt;
-       struct completion crash_comp;
        bool recovery_disabled;
        int max_notifyid;
        struct resource_table *table_ptr;
        struct resource_table *cached_table;
+       size_t table_sz;
        bool has_iommu;
        bool auto_boot;
 };