| Message ID | 20220323182609.58136-1-seanga2@gmail.com |
|---|---|
| State | Accepted |
| Commit | 847990219c04fe4d4b69deefdd29a2fb2d8171d9 |
| Delegated to: | Jaehoon Chung |
| Headers | show |
| Series | power-domain: Fix use of uninitialized value in dev_power_domain_ctrl | expand |
On Wed, 23 Mar 2022 at 12:26, Sean Anderson <seanga2@gmail.com> wrote: > > If dev_count_phandle_with_args returns 0 or another error, then pd will never > have been initialized by power_domain_get_by_index. Avoid comparing against > pd.dev in this situation. > > Fixes: 3e4fcfa4bc ("power-domain: fix hang in endless loop on i.MX8") > Signed-off-by: Sean Anderson <seanga2@gmail.com> > --- > > drivers/power/domain/power-domain-uclass.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 3/24/22 03:26, Sean Anderson wrote: > If dev_count_phandle_with_args returns 0 or another error, then pd will never > have been initialized by power_domain_get_by_index. Avoid comparing against > pd.dev in this situation. > > Fixes: 3e4fcfa4bc ("power-domain: fix hang in endless loop on i.MX8") > Signed-off-by: Sean Anderson <seanga2@gmail.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Best Regards, Jaehoon Chung > --- > > drivers/power/domain/power-domain-uclass.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c > index 33f9206bd0..1a317a00aa 100644 > --- a/drivers/power/domain/power-domain-uclass.c > +++ b/drivers/power/domain/power-domain-uclass.c > @@ -137,7 +137,7 @@ static int dev_power_domain_ctrl(struct udevice *dev, bool on) > * off their power-domain parent. So we will get here again and > * again and will be stuck in an endless loop. > */ > - if (!on && dev_get_parent(dev) == pd.dev && > + if (count > 0 && !on && dev_get_parent(dev) == pd.dev && > device_get_uclass_id(dev) == UCLASS_POWER_DOMAIN) > return ret; >
diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c index 33f9206bd0..1a317a00aa 100644 --- a/drivers/power/domain/power-domain-uclass.c +++ b/drivers/power/domain/power-domain-uclass.c @@ -137,7 +137,7 @@ static int dev_power_domain_ctrl(struct udevice *dev, bool on) * off their power-domain parent. So we will get here again and * again and will be stuck in an endless loop. */ - if (!on && dev_get_parent(dev) == pd.dev && + if (count > 0 && !on && dev_get_parent(dev) == pd.dev && device_get_uclass_id(dev) == UCLASS_POWER_DOMAIN) return ret;
If dev_count_phandle_with_args returns 0 or another error, then pd will never have been initialized by power_domain_get_by_index. Avoid comparing against pd.dev in this situation. Fixes: 3e4fcfa4bc ("power-domain: fix hang in endless loop on i.MX8") Signed-off-by: Sean Anderson <seanga2@gmail.com> --- drivers/power/domain/power-domain-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)