diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-01-06 02:57:59 +0300 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-01-15 20:29:29 +0300 |
| commit | a4b24c7560ba64c3c54d8f90ee033a6f0565f8d3 (patch) | |
| tree | 7e702e463226973154bdd126f8d61f964865bd3b | |
| parent | b26210cda63564a7478486faaea713f6ea965633 (diff) | |
| download | linux-a4b24c7560ba64c3c54d8f90ee033a6f0565f8d3.tar.xz | |
remoteproc: Cache resource table size
We don't re-read the resource table during a recovery, so it is possible
in the recovery path that the resource table has a different size than
cached_table. Store the original size of cached_table to avoid these
getting out of sync.
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>
| -rw-r--r-- | drivers/remoteproc/remoteproc_core.c | 20 | ||||
| -rw-r--r-- | include/linux/remoteproc.h | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 758fad3131a3..208ccf709cad 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -732,7 +732,7 @@ 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; @@ -742,7 +742,7 @@ static int rproc_handle_resources(struct rproc *rproc, int len, 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 +849,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 +870,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; } @@ -951,12 +944,13 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) goto clean_up; rproc->table_ptr = rproc->cached_table; + rproc->table_sz = tablesz; /* 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; diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 6f1d8e025c81..6fdc62e29d6f 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -410,6 +410,7 @@ enum rproc_crash_type { * @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 { @@ -440,6 +441,7 @@ struct rproc { int max_notifyid; struct resource_table *table_ptr; struct resource_table *cached_table; + size_t table_sz; bool has_iommu; bool auto_boot; }; |