* [PATCH] remoteproc: k3-dsp: Fix an error handling path in max77686_rtc_probe()
@ 2024-09-06 20:12 Christophe JAILLET
2024-09-06 22:10 ` Andrew Davis
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2024-09-06 20:12 UTC (permalink / raw)
To: Bjorn Andersson, Mathieu Poirier, Beleswar Padhi, Andrew Davis
Cc: linux-kernel, kernel-janitors, Christophe JAILLET,
linux-remoteproc
If an error occurs after the k3_dsp_rproc_request_mbox() call,
mbox_free_channel() must be called, as already done in the remove function.
Instead of adding an error handling path in the probe and changing all
error handling in the function, add a new devm_add_action_or_reset() and
simplify the .remove() function.
Fixes: ea1d6fb5b571 ("remoteproc: k3-dsp: Acquire mailbox handle during probe routine")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
Compile tested only
---
drivers/remoteproc/ti_k3_dsp_remoteproc.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
index 8be3f631c192..f29780de37a5 100644
--- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
@@ -610,6 +610,13 @@ static void k3_dsp_release_tsp(void *data)
ti_sci_proc_release(tsp);
}
+static void k3_dsp_free_channel(void *data)
+{
+ struct k3_dsp_rproc *kproc = data;
+
+ mbox_free_channel(kproc->mbox);
+}
+
static int k3_dsp_rproc_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -649,6 +656,10 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev)
if (ret)
return ret;
+ ret = devm_add_action_or_reset(dev, k3_dsp_free_channel, rproc);
+ if (ret)
+ return ret;
+
kproc->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci");
if (IS_ERR(kproc->ti_sci))
return dev_err_probe(dev, PTR_ERR(kproc->ti_sci),
@@ -741,8 +752,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_dsp_mem_data c66_mems[] = {
--
2.46.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] remoteproc: k3-dsp: Fix an error handling path in max77686_rtc_probe()
2024-09-06 20:12 [PATCH] remoteproc: k3-dsp: Fix an error handling path in max77686_rtc_probe() Christophe JAILLET
@ 2024-09-06 22:10 ` Andrew Davis
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Davis @ 2024-09-06 22:10 UTC (permalink / raw)
To: Christophe JAILLET, Bjorn Andersson, Mathieu Poirier,
Beleswar Padhi
Cc: linux-kernel, kernel-janitors, linux-remoteproc
On 9/6/24 3:12 PM, Christophe JAILLET wrote:
> If an error occurs after the k3_dsp_rproc_request_mbox() call,
> mbox_free_channel() must be called, as already done in the remove function.
>
> Instead of adding an error handling path in the probe and changing all
> error handling in the function, add a new devm_add_action_or_reset() and
> simplify the .remove() function.
>
Your patch subject is messed up, otherwise LGTM.
Reviewed-by: Andrew Davis <afd@ti.com>
> Fixes: ea1d6fb5b571 ("remoteproc: k3-dsp: Acquire mailbox handle during probe routine")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> Compile tested only
> ---
> drivers/remoteproc/ti_k3_dsp_remoteproc.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> index 8be3f631c192..f29780de37a5 100644
> --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c
> @@ -610,6 +610,13 @@ static void k3_dsp_release_tsp(void *data)
> ti_sci_proc_release(tsp);
> }
>
> +static void k3_dsp_free_channel(void *data)
> +{
> + struct k3_dsp_rproc *kproc = data;
> +
> + mbox_free_channel(kproc->mbox);
> +}
> +
> static int k3_dsp_rproc_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -649,6 +656,10 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> + ret = devm_add_action_or_reset(dev, k3_dsp_free_channel, rproc);
> + if (ret)
> + return ret;
> +
> kproc->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci");
> if (IS_ERR(kproc->ti_sci))
> return dev_err_probe(dev, PTR_ERR(kproc->ti_sci),
> @@ -741,8 +752,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_dsp_mem_data c66_mems[] = {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-06 22:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-06 20:12 [PATCH] remoteproc: k3-dsp: Fix an error handling path in max77686_rtc_probe() Christophe JAILLET
2024-09-06 22:10 ` Andrew Davis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).