Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 229b85a6 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

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: 988d204c ("remoteproc: Move handling of cached table to boot/shutdown")
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent eeac0a87

drivers/remoteproc/remoteproc_core.c

+5 −4
Original line number Diff line number Diff line
@@ -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);

	if (ret) {

		dev_err(dev, "Failed to process resources: %d\n", ret);

		goto clean_up;

		goto clean_up_resources;

	}



	/* load the ELF segments to memory */

	ret = rproc_load_segments(rproc, fw);

	if (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);

	if (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;
@@ -884,12 +884,13 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) 


	return 0;



clean_up_resources:

	rproc_resource_cleanup(rproc);

clean_up:

	kfree(rproc->cached_table);

	rproc->cached_table = NULL;

	rproc->table_ptr = NULL;



	rproc_resource_cleanup(rproc);

	rproc_disable_iommu(rproc);

	return ret;

}