From: Lee Jones <lee.jones@xxxxxxxxxx>
Currently, when a remote processor does not require resources, the
platform-specific remoteproc driver has to create a fake resource
table in order to by-pass the strict checking. But there is no hard
requirement for a remote processor so require or support shared
resources. This patch removes the strict checking and skips
resource table related operations if none is provided.
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
Signed-off-by: Loic Pallardy <loic.pallardy@xxxxxx>
---
drivers/remoteproc/remoteproc_core.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 73b460a..235ca2a 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -685,6 +685,9 @@ static int rproc_handle_resources(struct rproc *rproc, struct resource_table *ta
rproc_handle_resource_t handler;
int ret = 0, i;
+ if (!table_ptr)
+ return ret;
+
for (i = 0; i < table_ptr->num; i++) {
int offset = table_ptr->offset[i];
struct fw_rsc_hdr *hdr = (void *)table_ptr + offset;
@@ -1337,7 +1340,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, *loaded_table;
- int ret, tablesz, local_tablesz;
+ int ret, tablesz = 0, local_tablesz;
ret = rproc_fw_sanity_check(rproc, fw);
if (ret)
@@ -1361,8 +1364,8 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
/* 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;
+ rproc->cached_table = table;
+ goto skip_resources;
}
/* verify resource table consistency */
@@ -1384,6 +1387,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
goto clean_up;
}
+skip_resources:
rproc->table_ptr = rproc->cached_table;
if (!list_empty(&rproc->override_resources)) {
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-remoteproc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
