On Fri, 26 Sept 2025 at 14:33, Peng Fan <[email protected]> wrote: > > Proper cleanup should be done when rproc_add() fails by invoking both > pm_runtime_disable() and pm_runtime_put_noidle() to avoid leaving the > device in an inconsistent power state. > > Fix it by adding pm_runtime_put_noidle() and pm_runtime_disable() > in the error path. > > Also Update the remove() callback to use pm_runtime_put_noidle() instead of > pm_runtime_put(), to clearly indicate that only need to restore the usage > count. > > Fixes: a876a3aacc43 ("remoteproc: imx_rproc: detect and attach to pre-booted > remote cores") > Cc: Ulf Hansson <[email protected]> > Cc: Hiago De Franco <[email protected]> > Suggested-by: Ulf Hansson <[email protected]> > Signed-off-by: Peng Fan <[email protected]>
Reviewed-by: Ulf Hansson <[email protected]> Kind regards Uffe > --- > drivers/remoteproc/imx_rproc.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index > bb25221a4a8987ff427d68e2a5535f0e156b0097..8424e6ea5569b9ba6b07525643ce795faaeb2898 > 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -1136,11 +1136,16 @@ static int imx_rproc_probe(struct platform_device > *pdev) > ret = rproc_add(rproc); > if (ret) { > dev_err(dev, "rproc_add failed\n"); > - goto err_put_clk; > + goto err_put_pm; > } > > return 0; > > +err_put_pm: > + if (dcfg->method == IMX_RPROC_SCU_API) { > + pm_runtime_disable(dev); > + pm_runtime_put_noidle(dev); > + } > err_put_clk: > clk_disable_unprepare(priv->clk); > err_put_scu: > @@ -1160,7 +1165,7 @@ static void imx_rproc_remove(struct platform_device > *pdev) > > if (priv->dcfg->method == IMX_RPROC_SCU_API) { > pm_runtime_disable(priv->dev); > - pm_runtime_put(priv->dev); > + pm_runtime_put_noidle(priv->dev); > } > clk_disable_unprepare(priv->clk); > rproc_del(rproc); > > -- > 2.37.1 >
