remoteproc: Move resource table load logic to find

Extend the previous operation of finding the resource table in the ELF
with the extra step of populating the rproc struct with a copy and the
size. This allows drivers to override the mechanism used for acquiring
the resource table, or omit it for firmware that is known not to have a
resource table.

This leaves the custom, dummy, find_rsc_table implementations found in
some drivers dangling.

Reviewed-By: Loic Pallardy <loic.pallardy@st.com>
Tested-By: Loic Pallardy <loic.pallardy@st.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

3 files changed, 35 insertions, 50 deletions

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 3160cfe897da..84e07d5b7c2c 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -907,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)
@@ -927,27 +926,11 @@ 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;
-        rproc->table_sz = tablesz;
+        /* load resource table */
+        ret = rproc_load_rsc_table(rproc, fw);
+        if (ret)
+                goto disable_iommu;
 
         /* reset max_notifyid */
         rproc->max_notifyid = -1;
@@ -967,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;
 }
@@ -1443,7 +1425,7 @@ struct rproc *rproc_alloc(struct device *dev, const char *name,
         /* Default to ELF loader if no load function is specified */
         if (!rproc->ops->load) {
                 rproc->ops->load = rproc_elf_load_segments;
-                rproc->ops->find_rsc_table = rproc_elf_find_rsc_table;
+                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;
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c
index 822fa1bf893f..b17d72ec8603 100644
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -268,42 +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.
  */
-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_find_rsc_table);
+EXPORT_SYMBOL(rproc_elf_load_rsc_table);
 
 /**
  * rproc_elf_find_loaded_rsc_table() - find the loaded resource table
diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h
index a42690c514e2..55a2950c5cb7 100644
--- a/drivers/remoteproc/remoteproc_internal.h
+++ b/drivers/remoteproc/remoteproc_internal.h
@@ -57,9 +57,7 @@ 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);
-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 resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc,
                                                        const struct firmware *fw);
 
@@ -90,15 +88,13 @@ int rproc_load_segments(struct rproc *rproc, const struct firmware *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->ops->find_rsc_table)
-                return rproc->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