On Sat, Mar 11, 2023 at 07:17:50PM +0100, Christophe JAILLET wrote:
> Le 01/02/2023 à 11:15, Johan Hovold a écrit :
> > Make sure to disable clocks also in case attaching the power domain
> > fails.
> >
> > Fixes: 7de109c0abe9 ("interconnect: icc-rpm: Add support for bus power domain")
> > Cc: stable-u79uwXL29TY76Z2rM5mHXA@xxxxxxxxxxxxxxxx # 5.17
> > Cc: Yassine Oudjana <y.oudjana-g/b1ySJe57IN+BqQ9rBEUg@xxxxxxxxxxxxxxxx>
> > Signed-off-by: Johan Hovold <johan+linaro-DgEjT+Ai2ygdnm+yROfE0A@xxxxxxxxxxxxxxxx>
> > ---
> > drivers/interconnect/qcom/icc-rpm.c | 9 ++++-----
> > 1 file changed, 4 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c
> > index 91778cfcbc65..da595059cafd 100644
> > --- a/drivers/interconnect/qcom/icc-rpm.c
> > +++ b/drivers/interconnect/qcom/icc-rpm.c
> > @@ -498,8 +498,7 @@ int qnoc_probe(struct platform_device *pdev)
> >
> > if (desc->has_bus_pd) {
> > ret = dev_pm_domain_attach(dev, true);
> > - if (ret)
> > - return ret;
> > + goto err_disable_clks;
>
> Hi,
> this change looks strange because we now skip the rest of the function.
>
> Is it really intended?
No, this was definitely not intentional. Thanks for catching this. I'll
send a follow up fix for Georgi to fold in or apply on top.
> Also, should dev_pm_domain_detach() be called somewhere in the error
> handling path and remove function ?
In principle, yes. (I think read the above as being another device
managed resource.)
It turns out, however, that this code is totally bogus as any power
domain would already have been attached by the platform bus code and the
above call would always just succeed. The platform code would also
handle detach on errors.
I'll send a patch to remove this.
Johan
