[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241025205924.2087768-4-arnaud.pouliquen@foss.st.com>
Date: Fri, 25 Oct 2024 22:59:20 +0200
From: Arnaud Pouliquen <arnaud.pouliquen@...s.st.com>
To: Bjorn Andersson <andersson@...nel.org>,
Mathieu Poirier
<mathieu.poirier@...aro.org>,
Jens Wiklander <jens.wiklander@...aro.org>,
"Rob Herring" <robh+dt@...nel.org>,
Krzysztof Kozlowski
<krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>
CC: <linux-stm32@...md-mailman.stormreply.com>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-remoteproc@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<op-tee@...ts.trustedfirmware.org>, <devicetree@...r.kernel.org>,
Arnaud Pouliquen <arnaud.pouliquen@...s.st.com>
Subject: [PATCH v12 3/7] remoteproc: core: Refactor resource table cleanup into rproc_release_fw
This patch centralizing the cleanup of the resource table into a new
helper function rproc_release_fw().
More than just factorizing the code into a common function, it is the
first step to integrate the release of the firmware image loaded by the
OP-TEE remoteproc framework.
Suggested-by: Mathieu Poirier <mathieu.poirier@...aro.org>
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@...s.st.com>
---
drivers/remoteproc/remoteproc_core.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index ace11ea17097..7694817f25d4 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -1256,6 +1256,13 @@ static int rproc_alloc_registered_carveouts(struct rproc *rproc)
return 0;
}
+static void rproc_release_fw(struct rproc *rproc)
+{
+ /* Free the copy of the resource table */
+ kfree(rproc->cached_table);
+ rproc->cached_table = NULL;
+ rproc->table_ptr = NULL;
+}
/**
* rproc_resource_cleanup() - clean up and free all acquired resources
@@ -1485,9 +1492,7 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
clean_up_resources:
rproc_resource_cleanup(rproc);
- kfree(rproc->cached_table);
- rproc->cached_table = NULL;
- rproc->table_ptr = NULL;
+ rproc_release_fw(rproc);
unprepare_rproc:
/* release HW resources if needed */
rproc_unprepare_device(rproc);
@@ -2067,10 +2072,7 @@ int rproc_shutdown(struct rproc *rproc)
rproc_disable_iommu(rproc);
- /* Free the copy of the resource table */
- kfree(rproc->cached_table);
- rproc->cached_table = NULL;
- rproc->table_ptr = NULL;
+ rproc_release_fw(rproc);
out:
mutex_unlock(&rproc->lock);
return ret;
@@ -2133,10 +2135,7 @@ int rproc_detach(struct rproc *rproc)
rproc_disable_iommu(rproc);
- /* Free the copy of the resource table */
- kfree(rproc->cached_table);
- rproc->cached_table = NULL;
- rproc->table_ptr = NULL;
+ rproc_release_fw(rproc);
out:
mutex_unlock(&rproc->lock);
return ret;
--
2.25.1
Powered by blists - more mailing lists