openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

remoteproc: Correct resource handling upon boot failure 

The freeing of resources will attempt to clear values previously set in
the cached resource table, so make sure to free the table after we have
cleaned up the resources.

Fixes: 988d204cda ("remoteproc: Move handling of cached table to boot/shutdown")
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson 2016-10-02 17:41:29 -07:00
parent eeac0a8788
commit 229b85a6a5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/remoteproc/remoteproc_core.c
View File

@ -847,14 +847,14 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers); ret = rproc_handle_resources(rproc, tablesz, rproc_loading_handlers);
if (ret) { if (ret) {
dev_err(dev, "Failed to process resources: %d\n", ret); dev_err(dev, "Failed to process resources: %d\n", ret);
goto clean_up; goto clean_up_resources;
} }
/* load the ELF segments to memory */ /* load the ELF segments to memory */
ret = rproc_load_segments(rproc, fw); ret = rproc_load_segments(rproc, fw);
if (ret) { if (ret) {
dev_err(dev, "Failed to load program segments: %d\n", ret); dev_err(dev, "Failed to load program segments: %d\n", ret);
goto clean_up; goto clean_up_resources;
} }
/* /*
@ -875,7 +875,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
ret = rproc->ops->start(rproc); ret = rproc->ops->start(rproc);
if (ret) { if (ret) {
dev_err(dev, "can't start rproc %s: %d\n", rproc->name, ret); dev_err(dev, "can't start rproc %s: %d\n", rproc->name, ret);
goto clean_up; goto clean_up_resources;
} }
rproc->state = RPROC_RUNNING; rproc->state = RPROC_RUNNING;
@ -884,12 +884,13 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
return 0; return 0;
clean_up_resources:
rproc_resource_cleanup(rproc);
clean_up: clean_up:
kfree(rproc->cached_table); kfree(rproc->cached_table);
rproc->cached_table = NULL; rproc->cached_table = NULL;
rproc->table_ptr = NULL; rproc->table_ptr = NULL;
rproc_resource_cleanup(rproc);
rproc_disable_iommu(rproc); rproc_disable_iommu(rproc);
return ret; return ret;
} }