On Sun, Aug 24, 2025 at 09:52:37PM +0200, Christophe JAILLET wrote:
> If an error occurs after a successful k3_rproc_request_mbox() call,
> mbox_free_channel() should be called to avoid a leak.
>
> Such a call is missing in the error handling path of k3_dsp_rproc_probe().
> It is also missing both in the error handling path of k3_m4_rproc_probe()
> and in the (in-existent) corresponding remove function.
>
> Switch to managed resources to avoid these leaks and simplify the code.
> Remove the now unneeded mbox_free_channel().
>
> Signed-off-by: Christophe JAILLET <christophe.jail...@wanadoo.fr>
> Reviewed-by: Beleswar Padhi <b-pa...@ti.com>
> Tested-by: Beleswar Padhi <b-pa...@ti.com>
> ---
Appied.
Thanks,
Mathieu
> Compile tested only.
>
> Changes in v5:
> - Update subject line [Beleswar Prasad Padhi]
> - Add R-b and T-b tags
> - Rebase with latest -next (especially, because of commit f9a4c582e508
> ("remoteproc: k3: Remove remote processor mailbox ping))
>
> v4:
> https://lore.kernel.org/all/f96befca61e7a819c0e955e4ebe40dc8a481619d.1751060507.git.christophe.jail...@wanadoo.fr/
>
> Previous versions:
>
> https://lore.kernel.org/all/591e219df99da6f02c9d402f7854bc3ab23e76f9.1726328417.git.christophe.jail...@wanadoo.fr/
> ---
> drivers/remoteproc/ti_k3_common.c | 12 ++++++++++++
> drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 --
> drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 --
> 3 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/remoteproc/ti_k3_common.c
> b/drivers/remoteproc/ti_k3_common.c
> index 8266e11914af..56b71652e449 100644
> --- a/drivers/remoteproc/ti_k3_common.c
> +++ b/drivers/remoteproc/ti_k3_common.c
> @@ -155,11 +155,19 @@ int k3_rproc_release(struct k3_rproc *kproc)
> }
> EXPORT_SYMBOL_GPL(k3_rproc_release);
>
> +static void k3_rproc_free_channel(void *data)
> +{
> + struct k3_rproc *kproc = data;
> +
> + mbox_free_channel(kproc->mbox);
> +}
> +
> int k3_rproc_request_mbox(struct rproc *rproc)
> {
> struct k3_rproc *kproc = rproc->priv;
> struct mbox_client *client = &kproc->client;
> struct device *dev = kproc->dev;
> + int ret;
>
> client->dev = dev;
> client->tx_done = NULL;
> @@ -172,6 +180,10 @@ int k3_rproc_request_mbox(struct rproc *rproc)
> return dev_err_probe(dev, PTR_ERR(kproc->mbox),
> "mbox_request_channel failed\n");
>
> + ret = devm_add_action_or_reset(dev, k3_rproc_free_channel, kproc);
> + if (ret)
> + return ret;
> +
> return 0;
> }
> EXPORT_SYMBOL_GPL(k3_rproc_request_mbox);
> diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> index 7a72933bd403..d6ceea6dc920 100644
> --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> @@ -175,8 +175,6 @@ static void k3_dsp_rproc_remove(struct platform_device
> *pdev)
> if (ret)
> dev_err(dev, "failed to detach proc (%pe)\n",
> ERR_PTR(ret));
> }
> -
> - mbox_free_channel(kproc->mbox);
> }
>
> static const struct k3_rproc_mem_data c66_mems[] = {
> diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> index ca5ff280d2dc..04f23295ffc1 100644
> --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
> @@ -1206,8 +1206,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
> return;
> }
> }
> -
> - mbox_free_channel(kproc->mbox);
> }
> }
>
> --
> 2.51.0
>
