On Fri, Aug 30, 2024 at 11:51:43AM +0200, Arnaud Pouliquen wrote:
> This patch centralizing the cleanup of the resource table into a new
> helper function rproc_release_fw().
>
Sure, but you did not explain _why_ the change is needed.
> Suggested-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@xxxxxxxxxxx>
> ---
> 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
>
