diff mbox series

[v6,1/2] power: domain: handle genpd correctly when needing interrupts

Message ID 20220726083257.1730630-2-martin.kepplinger@puri.sm (mailing list archive)
State New, archived
Headers show
Series power: domain: handle power supplies that need interrupts | expand

Commit Message

Martin Kepplinger July 26, 2022, 8:32 a.m. UTC
If for example the power-domains' power-supply node (regulator) needs
interrupts to work, the current setup with noirq callbacks cannot
work; for example a pmic regulator on i2c, when suspending, usually already
times out during suspend_noirq:

[   41.024193] buck4: failed to disable: -ETIMEDOUT

So fix system suspend and resume for these power-domains by using the
"outer" suspend/resume callbacks instead. Tested on the imx8mq-librem5 board,
but by looking at the dts, this will fix imx8mq-evk and possibly many other
boards too.

This is designed so that genpd providers just say "this genpd needs
interrupts" (by setting the flag) - without implying an implementation.

Initially system suspend problems had been discussed at
https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
which led to discussing the pmic that contains the regulators which
serve as power-domain power-supplies:
https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/

Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
---
 drivers/base/power/domain.c | 13 +++++++++++--
 include/linux/pm_domain.h   |  5 +++++
 2 files changed, 16 insertions(+), 2 deletions(-)

Comments

Ulf Hansson July 26, 2022, 3:07 p.m. UTC | #1
On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
<martin.kepplinger@puri.sm> wrote:
>
> If for example the power-domains' power-supply node (regulator) needs
> interrupts to work, the current setup with noirq callbacks cannot
> work; for example a pmic regulator on i2c, when suspending, usually already
> times out during suspend_noirq:
>
> [   41.024193] buck4: failed to disable: -ETIMEDOUT
>
> So fix system suspend and resume for these power-domains by using the
> "outer" suspend/resume callbacks instead. Tested on the imx8mq-librem5 board,
> but by looking at the dts, this will fix imx8mq-evk and possibly many other
> boards too.
>
> This is designed so that genpd providers just say "this genpd needs
> interrupts" (by setting the flag) - without implying an implementation.
>
> Initially system suspend problems had been discussed at
> https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> which led to discussing the pmic that contains the regulators which
> serve as power-domain power-supplies:
> https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
>
> Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> ---
>  drivers/base/power/domain.c | 13 +++++++++++--
>  include/linux/pm_domain.h   |  5 +++++
>  2 files changed, 16 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index 5a2e0232862e..58376752a4de 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -130,6 +130,7 @@ static const struct genpd_lock_ops genpd_spin_ops = {
>  #define genpd_is_active_wakeup(genpd)  (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP)
>  #define genpd_is_cpu_domain(genpd)     (genpd->flags & GENPD_FLAG_CPU_DOMAIN)
>  #define genpd_is_rpm_always_on(genpd)  (genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON)
> +#define genpd_irq_on(genpd)            (genpd->flags & GENPD_FLAG_IRQ_ON)
>
>  static inline bool irq_safe_dev_in_sleep_domain(struct device *dev,
>                 const struct generic_pm_domain *genpd)
> @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
>         genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
>         genpd->domain.ops.runtime_resume = genpd_runtime_resume;
>         genpd->domain.ops.prepare = genpd_prepare;
> -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> +
> +       if (genpd_irq_on(genpd)) {
> +               genpd->domain.ops.suspend = genpd_suspend_noirq;
> +               genpd->domain.ops.resume = genpd_resume_noirq;
> +       } else {
> +               genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> +               genpd->domain.ops.resume_noirq = genpd_resume_noirq;

As we discussed previously, I am thinking that it may be better to
move to using genpd->domain.ops.suspend_late and
genpd->domain.ops.resume_early instead.

Beside this, I think the $subject patch looks good to me.

[...]

Kind regards
Uffe
Rafael J. Wysocki July 26, 2022, 6:33 p.m. UTC | #2
On Tue, Jul 26, 2022 at 5:07 PM Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
> On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> <martin.kepplinger@puri.sm> wrote:
> >
> > If for example the power-domains' power-supply node (regulator) needs
> > interrupts to work, the current setup with noirq callbacks cannot
> > work; for example a pmic regulator on i2c, when suspending, usually already
> > times out during suspend_noirq:
> >
> > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> >
> > So fix system suspend and resume for these power-domains by using the
> > "outer" suspend/resume callbacks instead. Tested on the imx8mq-librem5 board,
> > but by looking at the dts, this will fix imx8mq-evk and possibly many other
> > boards too.
> >
> > This is designed so that genpd providers just say "this genpd needs
> > interrupts" (by setting the flag) - without implying an implementation.
> >
> > Initially system suspend problems had been discussed at
> > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > which led to discussing the pmic that contains the regulators which
> > serve as power-domain power-supplies:
> > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> >
> > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> > ---
> >  drivers/base/power/domain.c | 13 +++++++++++--
> >  include/linux/pm_domain.h   |  5 +++++
> >  2 files changed, 16 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> > index 5a2e0232862e..58376752a4de 100644
> > --- a/drivers/base/power/domain.c
> > +++ b/drivers/base/power/domain.c
> > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops genpd_spin_ops = {
> >  #define genpd_is_active_wakeup(genpd)  (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP)
> >  #define genpd_is_cpu_domain(genpd)     (genpd->flags & GENPD_FLAG_CPU_DOMAIN)
> >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON)
> > +#define genpd_irq_on(genpd)            (genpd->flags & GENPD_FLAG_IRQ_ON)
> >
> >  static inline bool irq_safe_dev_in_sleep_domain(struct device *dev,
> >                 const struct generic_pm_domain *genpd)
> > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
> >         genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
> >         genpd->domain.ops.runtime_resume = genpd_runtime_resume;
> >         genpd->domain.ops.prepare = genpd_prepare;
> > -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> > +
> > +       if (genpd_irq_on(genpd)) {
> > +               genpd->domain.ops.suspend = genpd_suspend_noirq;
> > +               genpd->domain.ops.resume = genpd_resume_noirq;
> > +       } else {
> > +               genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > +               genpd->domain.ops.resume_noirq = genpd_resume_noirq;
>
> As we discussed previously, I am thinking that it may be better to
> move to using genpd->domain.ops.suspend_late and
> genpd->domain.ops.resume_early instead.

Should I take this as a change request?

> Beside this, I think the $subject patch looks good to me.

Or not?
Ulf Hansson July 28, 2022, 9:19 a.m. UTC | #3
On Tue, 26 Jul 2022 at 20:33, Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Tue, Jul 26, 2022 at 5:07 PM Ulf Hansson <ulf.hansson@linaro.org> wrote:
> >
> > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > <martin.kepplinger@puri.sm> wrote:
> > >
> > > If for example the power-domains' power-supply node (regulator) needs
> > > interrupts to work, the current setup with noirq callbacks cannot
> > > work; for example a pmic regulator on i2c, when suspending, usually already
> > > times out during suspend_noirq:
> > >
> > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > >
> > > So fix system suspend and resume for these power-domains by using the
> > > "outer" suspend/resume callbacks instead. Tested on the imx8mq-librem5 board,
> > > but by looking at the dts, this will fix imx8mq-evk and possibly many other
> > > boards too.
> > >
> > > This is designed so that genpd providers just say "this genpd needs
> > > interrupts" (by setting the flag) - without implying an implementation.
> > >
> > > Initially system suspend problems had been discussed at
> > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > which led to discussing the pmic that contains the regulators which
> > > serve as power-domain power-supplies:
> > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > >
> > > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> > > ---
> > >  drivers/base/power/domain.c | 13 +++++++++++--
> > >  include/linux/pm_domain.h   |  5 +++++
> > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> > > index 5a2e0232862e..58376752a4de 100644
> > > --- a/drivers/base/power/domain.c
> > > +++ b/drivers/base/power/domain.c
> > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops genpd_spin_ops = {
> > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP)
> > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags & GENPD_FLAG_CPU_DOMAIN)
> > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON)
> > > +#define genpd_irq_on(genpd)            (genpd->flags & GENPD_FLAG_IRQ_ON)
> > >
> > >  static inline bool irq_safe_dev_in_sleep_domain(struct device *dev,
> > >                 const struct generic_pm_domain *genpd)
> > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
> > >         genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
> > >         genpd->domain.ops.runtime_resume = genpd_runtime_resume;
> > >         genpd->domain.ops.prepare = genpd_prepare;
> > > -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > > -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> > > +
> > > +       if (genpd_irq_on(genpd)) {
> > > +               genpd->domain.ops.suspend = genpd_suspend_noirq;
> > > +               genpd->domain.ops.resume = genpd_resume_noirq;
> > > +       } else {
> > > +               genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > > +               genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> >
> > As we discussed previously, I am thinking that it may be better to
> > move to using genpd->domain.ops.suspend_late and
> > genpd->domain.ops.resume_early instead.
>
> Should I take this as a change request?

Yes.

>
> > Beside this, I think the $subject patch looks good to me.
>
> Or not?

The patch needs to be updated before I give it my blessing, but the
only changes that are needed are the minor things I pointed out above.
Sorry if it was not clear enough.

Kind regards
Uffe
Martin Kepplinger Aug. 19, 2022, 9:17 a.m. UTC | #4
Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf Hansson:
> On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> <martin.kepplinger@puri.sm> wrote:
> > 
> > If for example the power-domains' power-supply node (regulator)
> > needs
> > interrupts to work, the current setup with noirq callbacks cannot
> > work; for example a pmic regulator on i2c, when suspending, usually
> > already
> > times out during suspend_noirq:
> > 
> > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > 
> > So fix system suspend and resume for these power-domains by using
> > the
> > "outer" suspend/resume callbacks instead. Tested on the imx8mq-
> > librem5 board,
> > but by looking at the dts, this will fix imx8mq-evk and possibly
> > many other
> > boards too.
> > 
> > This is designed so that genpd providers just say "this genpd needs
> > interrupts" (by setting the flag) - without implying an
> > implementation.
> > 
> > Initially system suspend problems had been discussed at
> > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > which led to discussing the pmic that contains the regulators which
> > serve as power-domain power-supplies:
> > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > 
> > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> > ---
> >  drivers/base/power/domain.c | 13 +++++++++++--
> >  include/linux/pm_domain.h   |  5 +++++
> >  2 files changed, 16 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/base/power/domain.c
> > b/drivers/base/power/domain.c
> > index 5a2e0232862e..58376752a4de 100644
> > --- a/drivers/base/power/domain.c
> > +++ b/drivers/base/power/domain.c
> > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > genpd_spin_ops = {
> >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > GENPD_FLAG_ACTIVE_WAKEUP)
> >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > GENPD_FLAG_CPU_DOMAIN)
> >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > GENPD_FLAG_RPM_ALWAYS_ON)
> > +#define genpd_irq_on(genpd)            (genpd->flags &
> > GENPD_FLAG_IRQ_ON)
> > 
> >  static inline bool irq_safe_dev_in_sleep_domain(struct device
> > *dev,
> >                 const struct generic_pm_domain *genpd)
> > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct generic_pm_domain
> > *genpd,
> >         genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
> >         genpd->domain.ops.runtime_resume = genpd_runtime_resume;
> >         genpd->domain.ops.prepare = genpd_prepare;
> > -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> > +
> > +       if (genpd_irq_on(genpd)) {
> > +               genpd->domain.ops.suspend = genpd_suspend_noirq;
> > +               genpd->domain.ops.resume = genpd_resume_noirq;
> > +       } else {
> > +               genpd->domain.ops.suspend_noirq =
> > genpd_suspend_noirq;
> > +               genpd->domain.ops.resume_noirq =
> > genpd_resume_noirq;
> 
> As we discussed previously, I am thinking that it may be better to
> move to using genpd->domain.ops.suspend_late and
> genpd->domain.ops.resume_early instead.

Wouldn't that better be a separate patch (on top)? Do you really want
me to change the current behaviour (default case) to from noirq to
late? Then I'll resend this series with such a patch added.

thanks,

                              martin

> 
> Beside this, I think the $subject patch looks good to me.
> 
> [...]
> 
> Kind regards
> Uffe
Ulf Hansson Aug. 19, 2022, 2:53 p.m. UTC | #5
On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
<martin.kepplinger@puri.sm> wrote:
>
> Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf Hansson:
> > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > <martin.kepplinger@puri.sm> wrote:
> > >
> > > If for example the power-domains' power-supply node (regulator)
> > > needs
> > > interrupts to work, the current setup with noirq callbacks cannot
> > > work; for example a pmic regulator on i2c, when suspending, usually
> > > already
> > > times out during suspend_noirq:
> > >
> > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > >
> > > So fix system suspend and resume for these power-domains by using
> > > the
> > > "outer" suspend/resume callbacks instead. Tested on the imx8mq-
> > > librem5 board,
> > > but by looking at the dts, this will fix imx8mq-evk and possibly
> > > many other
> > > boards too.
> > >
> > > This is designed so that genpd providers just say "this genpd needs
> > > interrupts" (by setting the flag) - without implying an
> > > implementation.
> > >
> > > Initially system suspend problems had been discussed at
> > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > which led to discussing the pmic that contains the regulators which
> > > serve as power-domain power-supplies:
> > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > >
> > > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> > > ---
> > >  drivers/base/power/domain.c | 13 +++++++++++--
> > >  include/linux/pm_domain.h   |  5 +++++
> > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/base/power/domain.c
> > > b/drivers/base/power/domain.c
> > > index 5a2e0232862e..58376752a4de 100644
> > > --- a/drivers/base/power/domain.c
> > > +++ b/drivers/base/power/domain.c
> > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > genpd_spin_ops = {
> > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > GENPD_FLAG_ACTIVE_WAKEUP)
> > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > GENPD_FLAG_CPU_DOMAIN)
> > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > GENPD_FLAG_IRQ_ON)
> > >
> > >  static inline bool irq_safe_dev_in_sleep_domain(struct device
> > > *dev,
> > >                 const struct generic_pm_domain *genpd)
> > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct generic_pm_domain
> > > *genpd,
> > >         genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
> > >         genpd->domain.ops.runtime_resume = genpd_runtime_resume;
> > >         genpd->domain.ops.prepare = genpd_prepare;
> > > -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > > -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> > > +
> > > +       if (genpd_irq_on(genpd)) {
> > > +               genpd->domain.ops.suspend = genpd_suspend_noirq;
> > > +               genpd->domain.ops.resume = genpd_resume_noirq;
> > > +       } else {
> > > +               genpd->domain.ops.suspend_noirq =
> > > genpd_suspend_noirq;
> > > +               genpd->domain.ops.resume_noirq =
> > > genpd_resume_noirq;
> >
> > As we discussed previously, I am thinking that it may be better to
> > move to using genpd->domain.ops.suspend_late and
> > genpd->domain.ops.resume_early instead.
>
> Wouldn't that better be a separate patch (on top)? Do you really want
> me to change the current behaviour (default case) to from noirq to
> late? Then I'll resend this series with such a patch added.

Sorry, I wasn't clear enough, the default behaviour should remain as is.

What I meant was, when genpd_irq_on() is true, we should use the
genpd->domain.ops.suspend_late and genpd->domain.ops.resume_early.

Kind regards
Uffe
Martin Kepplinger Aug. 22, 2022, 8:38 a.m. UTC | #6
Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> <martin.kepplinger@puri.sm> wrote:
> > 
> > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf Hansson:
> > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > <martin.kepplinger@puri.sm> wrote:
> > > > 
> > > > If for example the power-domains' power-supply node (regulator)
> > > > needs
> > > > interrupts to work, the current setup with noirq callbacks
> > > > cannot
> > > > work; for example a pmic regulator on i2c, when suspending,
> > > > usually
> > > > already
> > > > times out during suspend_noirq:
> > > > 
> > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > 
> > > > So fix system suspend and resume for these power-domains by
> > > > using
> > > > the
> > > > "outer" suspend/resume callbacks instead. Tested on the imx8mq-
> > > > librem5 board,
> > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > possibly
> > > > many other
> > > > boards too.
> > > > 
> > > > This is designed so that genpd providers just say "this genpd
> > > > needs
> > > > interrupts" (by setting the flag) - without implying an
> > > > implementation.
> > > > 
> > > > Initially system suspend problems had been discussed at
> > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > which led to discussing the pmic that contains the regulators
> > > > which
> > > > serve as power-domain power-supplies:
> > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > 
> > > > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> > > > ---
> > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > >  include/linux/pm_domain.h   |  5 +++++
> > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/base/power/domain.c
> > > > b/drivers/base/power/domain.c
> > > > index 5a2e0232862e..58376752a4de 100644
> > > > --- a/drivers/base/power/domain.c
> > > > +++ b/drivers/base/power/domain.c
> > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > genpd_spin_ops = {
> > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > GENPD_FLAG_CPU_DOMAIN)
> > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > GENPD_FLAG_IRQ_ON)
> > > > 
> > > >  static inline bool irq_safe_dev_in_sleep_domain(struct device
> > > > *dev,
> > > >                 const struct generic_pm_domain *genpd)
> > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > generic_pm_domain
> > > > *genpd,
> > > >         genpd->domain.ops.runtime_suspend =
> > > > genpd_runtime_suspend;
> > > >         genpd->domain.ops.runtime_resume =
> > > > genpd_runtime_resume;
> > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > > > -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> > > > +
> > > > +       if (genpd_irq_on(genpd)) {
> > > > +               genpd->domain.ops.suspend =
> > > > genpd_suspend_noirq;
> > > > +               genpd->domain.ops.resume = genpd_resume_noirq;
> > > > +       } else {
> > > > +               genpd->domain.ops.suspend_noirq =
> > > > genpd_suspend_noirq;
> > > > +               genpd->domain.ops.resume_noirq =
> > > > genpd_resume_noirq;
> > > 
> > > As we discussed previously, I am thinking that it may be better
> > > to
> > > move to using genpd->domain.ops.suspend_late and
> > > genpd->domain.ops.resume_early instead.
> > 
> > Wouldn't that better be a separate patch (on top)? Do you really
> > want
> > me to change the current behaviour (default case) to from noirq to
> > late? Then I'll resend this series with such a patch added.
> 
> Sorry, I wasn't clear enough, the default behaviour should remain as
> is.
> 
> What I meant was, when genpd_irq_on() is true, we should use the
> genpd->domain.ops.suspend_late and genpd->domain.ops.resume_early.

Testing that shows that this isn't working. I can provide the logs
later, but suspend fails and I think it makes sense: "suspend_late" is
simply already too late when i2c (or any needed driver) uses "suspend".

> 
> Kind regards
> Uffe
Ulf Hansson Aug. 24, 2022, 1:30 p.m. UTC | #7
On Mon, 22 Aug 2022 at 10:38, Martin Kepplinger
<martin.kepplinger@puri.sm> wrote:
>
> Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> > On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> > <martin.kepplinger@puri.sm> wrote:
> > >
> > > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf Hansson:
> > > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > > <martin.kepplinger@puri.sm> wrote:
> > > > >
> > > > > If for example the power-domains' power-supply node (regulator)
> > > > > needs
> > > > > interrupts to work, the current setup with noirq callbacks
> > > > > cannot
> > > > > work; for example a pmic regulator on i2c, when suspending,
> > > > > usually
> > > > > already
> > > > > times out during suspend_noirq:
> > > > >
> > > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > >
> > > > > So fix system suspend and resume for these power-domains by
> > > > > using
> > > > > the
> > > > > "outer" suspend/resume callbacks instead. Tested on the imx8mq-
> > > > > librem5 board,
> > > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > > possibly
> > > > > many other
> > > > > boards too.
> > > > >
> > > > > This is designed so that genpd providers just say "this genpd
> > > > > needs
> > > > > interrupts" (by setting the flag) - without implying an
> > > > > implementation.
> > > > >
> > > > > Initially system suspend problems had been discussed at
> > > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > > which led to discussing the pmic that contains the regulators
> > > > > which
> > > > > serve as power-domain power-supplies:
> > > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > >
> > > > > Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
> > > > > ---
> > > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > > >  include/linux/pm_domain.h   |  5 +++++
> > > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > >
> > > > > diff --git a/drivers/base/power/domain.c
> > > > > b/drivers/base/power/domain.c
> > > > > index 5a2e0232862e..58376752a4de 100644
> > > > > --- a/drivers/base/power/domain.c
> > > > > +++ b/drivers/base/power/domain.c
> > > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > > genpd_spin_ops = {
> > > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > > GENPD_FLAG_CPU_DOMAIN)
> > > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > > GENPD_FLAG_IRQ_ON)
> > > > >
> > > > >  static inline bool irq_safe_dev_in_sleep_domain(struct device
> > > > > *dev,
> > > > >                 const struct generic_pm_domain *genpd)
> > > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > > generic_pm_domain
> > > > > *genpd,
> > > > >         genpd->domain.ops.runtime_suspend =
> > > > > genpd_runtime_suspend;
> > > > >         genpd->domain.ops.runtime_resume =
> > > > > genpd_runtime_resume;
> > > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > > -       genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
> > > > > -       genpd->domain.ops.resume_noirq = genpd_resume_noirq;
> > > > > +
> > > > > +       if (genpd_irq_on(genpd)) {
> > > > > +               genpd->domain.ops.suspend =
> > > > > genpd_suspend_noirq;
> > > > > +               genpd->domain.ops.resume = genpd_resume_noirq;
> > > > > +       } else {
> > > > > +               genpd->domain.ops.suspend_noirq =
> > > > > genpd_suspend_noirq;
> > > > > +               genpd->domain.ops.resume_noirq =
> > > > > genpd_resume_noirq;
> > > >
> > > > As we discussed previously, I am thinking that it may be better
> > > > to
> > > > move to using genpd->domain.ops.suspend_late and
> > > > genpd->domain.ops.resume_early instead.
> > >
> > > Wouldn't that better be a separate patch (on top)? Do you really
> > > want
> > > me to change the current behaviour (default case) to from noirq to
> > > late? Then I'll resend this series with such a patch added.
> >
> > Sorry, I wasn't clear enough, the default behaviour should remain as
> > is.
> >
> > What I meant was, when genpd_irq_on() is true, we should use the
> > genpd->domain.ops.suspend_late and genpd->domain.ops.resume_early.
>
> Testing that shows that this isn't working. I can provide the logs
> later, but suspend fails and I think it makes sense: "suspend_late" is
> simply already too late when i2c (or any needed driver) uses "suspend".

Okay, I see.

The reason why I suggested moving the callbacks to "suspend_late", was
that I was worried that some of the attached devices to genpd could
use "suspend_late" themselves. This is the case for some drivers for
DMA/clock/gpio/pinctrl-controllers, for example. That said, I am
curious to look at the DT files for the platform you are running,
would you mind giving me a pointer?

So, this made me think about this a bit more. In the end, just using
different levels (suspend, suspend_late, suspend_noirq) of callbacks
are just papering over the real *dependency* problem.

What we need for the genpd provider driver, is to be asked to be
suspended under the following conditions:
1. All consumer devices (and child-domains) for its corresponding PM
domain have been suspended.
2. All its supplier devices supplies must remain resumed, until the
genpd provider has been suspended.

Please allow me a few more days to think in more detail about this.

In some way, it looks like we should be able to combine the
information genpd has about its devices and child-domains, use PM
callbacks for the genpd provider driver - so we can rely on the
depency-path the fw_devlinks would give us for its supplier devices.

Kind regards
Uffe
Martin Kepplinger Aug. 25, 2022, 7:06 a.m. UTC | #8
Am Mittwoch, dem 24.08.2022 um 15:30 +0200 schrieb Ulf Hansson:
> On Mon, 22 Aug 2022 at 10:38, Martin Kepplinger
> <martin.kepplinger@puri.sm> wrote:
> > 
> > Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> > > On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> > > <martin.kepplinger@puri.sm> wrote:
> > > > 
> > > > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf Hansson:
> > > > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > 
> > > > > > If for example the power-domains' power-supply node
> > > > > > (regulator)
> > > > > > needs
> > > > > > interrupts to work, the current setup with noirq callbacks
> > > > > > cannot
> > > > > > work; for example a pmic regulator on i2c, when suspending,
> > > > > > usually
> > > > > > already
> > > > > > times out during suspend_noirq:
> > > > > > 
> > > > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > > > 
> > > > > > So fix system suspend and resume for these power-domains by
> > > > > > using
> > > > > > the
> > > > > > "outer" suspend/resume callbacks instead. Tested on the
> > > > > > imx8mq-
> > > > > > librem5 board,
> > > > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > > > possibly
> > > > > > many other
> > > > > > boards too.
> > > > > > 
> > > > > > This is designed so that genpd providers just say "this
> > > > > > genpd
> > > > > > needs
> > > > > > interrupts" (by setting the flag) - without implying an
> > > > > > implementation.
> > > > > > 
> > > > > > Initially system suspend problems had been discussed at
> > > > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > > > which led to discussing the pmic that contains the
> > > > > > regulators
> > > > > > which
> > > > > > serve as power-domain power-supplies:
> > > > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > > > 
> > > > > > Signed-off-by: Martin Kepplinger
> > > > > > <martin.kepplinger@puri.sm>
> > > > > > ---
> > > > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > > > >  include/linux/pm_domain.h   |  5 +++++
> > > > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > > > 
> > > > > > diff --git a/drivers/base/power/domain.c
> > > > > > b/drivers/base/power/domain.c
> > > > > > index 5a2e0232862e..58376752a4de 100644
> > > > > > --- a/drivers/base/power/domain.c
> > > > > > +++ b/drivers/base/power/domain.c
> > > > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > > > genpd_spin_ops = {
> > > > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > > > GENPD_FLAG_CPU_DOMAIN)
> > > > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > > > GENPD_FLAG_IRQ_ON)
> > > > > > 
> > > > > >  static inline bool irq_safe_dev_in_sleep_domain(struct
> > > > > > device
> > > > > > *dev,
> > > > > >                 const struct generic_pm_domain *genpd)
> > > > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > > > generic_pm_domain
> > > > > > *genpd,
> > > > > >         genpd->domain.ops.runtime_suspend =
> > > > > > genpd_runtime_suspend;
> > > > > >         genpd->domain.ops.runtime_resume =
> > > > > > genpd_runtime_resume;
> > > > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > > > -       genpd->domain.ops.suspend_noirq =
> > > > > > genpd_suspend_noirq;
> > > > > > -       genpd->domain.ops.resume_noirq =
> > > > > > genpd_resume_noirq;
> > > > > > +
> > > > > > +       if (genpd_irq_on(genpd)) {
> > > > > > +               genpd->domain.ops.suspend =
> > > > > > genpd_suspend_noirq;
> > > > > > +               genpd->domain.ops.resume =
> > > > > > genpd_resume_noirq;
> > > > > > +       } else {
> > > > > > +               genpd->domain.ops.suspend_noirq =
> > > > > > genpd_suspend_noirq;
> > > > > > +               genpd->domain.ops.resume_noirq =
> > > > > > genpd_resume_noirq;
> > > > > 
> > > > > As we discussed previously, I am thinking that it may be
> > > > > better
> > > > > to
> > > > > move to using genpd->domain.ops.suspend_late and
> > > > > genpd->domain.ops.resume_early instead.
> > > > 
> > > > Wouldn't that better be a separate patch (on top)? Do you
> > > > really
> > > > want
> > > > me to change the current behaviour (default case) to from noirq
> > > > to
> > > > late? Then I'll resend this series with such a patch added.
> > > 
> > > Sorry, I wasn't clear enough, the default behaviour should remain
> > > as
> > > is.
> > > 
> > > What I meant was, when genpd_irq_on() is true, we should use the
> > > genpd->domain.ops.suspend_late and genpd-
> > > >domain.ops.resume_early.
> > 
> > Testing that shows that this isn't working. I can provide the logs
> > later, but suspend fails and I think it makes sense: "suspend_late"
> > is
> > simply already too late when i2c (or any needed driver) uses
> > "suspend".
> 
> Okay, I see.
> 
> The reason why I suggested moving the callbacks to "suspend_late",
> was
> that I was worried that some of the attached devices to genpd could
> use "suspend_late" themselves. This is the case for some drivers for
> DMA/clock/gpio/pinctrl-controllers, for example. That said, I am
> curious to look at the DT files for the platform you are running,
> would you mind giving me a pointer?

I'm running
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
with these (small) patches on top:
https://source.puri.sm/martin.kepplinger/linux-next/-/commits/5.19.3/librem5

> 
> So, this made me think about this a bit more. In the end, just using
> different levels (suspend, suspend_late, suspend_noirq) of callbacks
> are just papering over the real *dependency* problem.

true, it doesn't feel like a stable solution.

> 
> What we need for the genpd provider driver, is to be asked to be
> suspended under the following conditions:
> 1. All consumer devices (and child-domains) for its corresponding PM
> domain have been suspended.
> 2. All its supplier devices supplies must remain resumed, until the
> genpd provider has been suspended.
> 
> Please allow me a few more days to think in more detail about this.

Thanks a lot for thinking about this!

> 
> In some way, it looks like we should be able to combine the
> information genpd has about its devices and child-domains, use PM
> callbacks for the genpd provider driver - so we can rely on the
> depency-path the fw_devlinks would give us for its supplier devices.
> 
> Kind regards
> Uffe

                          martin
Ulf Hansson Sept. 23, 2022, 1:55 p.m. UTC | #9
On Thu, 25 Aug 2022 at 09:06, Martin Kepplinger
<martin.kepplinger@puri.sm> wrote:
>
> Am Mittwoch, dem 24.08.2022 um 15:30 +0200 schrieb Ulf Hansson:
> > On Mon, 22 Aug 2022 at 10:38, Martin Kepplinger
> > <martin.kepplinger@puri.sm> wrote:
> > >
> > > Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> > > > On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> > > > <martin.kepplinger@puri.sm> wrote:
> > > > >
> > > > > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf Hansson:
> > > > > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > >
> > > > > > > If for example the power-domains' power-supply node
> > > > > > > (regulator)
> > > > > > > needs
> > > > > > > interrupts to work, the current setup with noirq callbacks
> > > > > > > cannot
> > > > > > > work; for example a pmic regulator on i2c, when suspending,
> > > > > > > usually
> > > > > > > already
> > > > > > > times out during suspend_noirq:
> > > > > > >
> > > > > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > > > >
> > > > > > > So fix system suspend and resume for these power-domains by
> > > > > > > using
> > > > > > > the
> > > > > > > "outer" suspend/resume callbacks instead. Tested on the
> > > > > > > imx8mq-
> > > > > > > librem5 board,
> > > > > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > > > > possibly
> > > > > > > many other
> > > > > > > boards too.
> > > > > > >
> > > > > > > This is designed so that genpd providers just say "this
> > > > > > > genpd
> > > > > > > needs
> > > > > > > interrupts" (by setting the flag) - without implying an
> > > > > > > implementation.
> > > > > > >
> > > > > > > Initially system suspend problems had been discussed at
> > > > > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > > > > which led to discussing the pmic that contains the
> > > > > > > regulators
> > > > > > > which
> > > > > > > serve as power-domain power-supplies:
> > > > > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > > > >
> > > > > > > Signed-off-by: Martin Kepplinger
> > > > > > > <martin.kepplinger@puri.sm>
> > > > > > > ---
> > > > > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > > > > >  include/linux/pm_domain.h   |  5 +++++
> > > > > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > > > >
> > > > > > > diff --git a/drivers/base/power/domain.c
> > > > > > > b/drivers/base/power/domain.c
> > > > > > > index 5a2e0232862e..58376752a4de 100644
> > > > > > > --- a/drivers/base/power/domain.c
> > > > > > > +++ b/drivers/base/power/domain.c
> > > > > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > > > > genpd_spin_ops = {
> > > > > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > > > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > > > > GENPD_FLAG_CPU_DOMAIN)
> > > > > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > > > > GENPD_FLAG_IRQ_ON)
> > > > > > >
> > > > > > >  static inline bool irq_safe_dev_in_sleep_domain(struct
> > > > > > > device
> > > > > > > *dev,
> > > > > > >                 const struct generic_pm_domain *genpd)
> > > > > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > > > > generic_pm_domain
> > > > > > > *genpd,
> > > > > > >         genpd->domain.ops.runtime_suspend =
> > > > > > > genpd_runtime_suspend;
> > > > > > >         genpd->domain.ops.runtime_resume =
> > > > > > > genpd_runtime_resume;
> > > > > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > > > > -       genpd->domain.ops.suspend_noirq =
> > > > > > > genpd_suspend_noirq;
> > > > > > > -       genpd->domain.ops.resume_noirq =
> > > > > > > genpd_resume_noirq;
> > > > > > > +
> > > > > > > +       if (genpd_irq_on(genpd)) {
> > > > > > > +               genpd->domain.ops.suspend =
> > > > > > > genpd_suspend_noirq;
> > > > > > > +               genpd->domain.ops.resume =
> > > > > > > genpd_resume_noirq;
> > > > > > > +       } else {
> > > > > > > +               genpd->domain.ops.suspend_noirq =
> > > > > > > genpd_suspend_noirq;
> > > > > > > +               genpd->domain.ops.resume_noirq =
> > > > > > > genpd_resume_noirq;
> > > > > >
> > > > > > As we discussed previously, I am thinking that it may be
> > > > > > better
> > > > > > to
> > > > > > move to using genpd->domain.ops.suspend_late and
> > > > > > genpd->domain.ops.resume_early instead.
> > > > >
> > > > > Wouldn't that better be a separate patch (on top)? Do you
> > > > > really
> > > > > want
> > > > > me to change the current behaviour (default case) to from noirq
> > > > > to
> > > > > late? Then I'll resend this series with such a patch added.
> > > >
> > > > Sorry, I wasn't clear enough, the default behaviour should remain
> > > > as
> > > > is.
> > > >
> > > > What I meant was, when genpd_irq_on() is true, we should use the
> > > > genpd->domain.ops.suspend_late and genpd-
> > > > >domain.ops.resume_early.
> > >
> > > Testing that shows that this isn't working. I can provide the logs
> > > later, but suspend fails and I think it makes sense: "suspend_late"
> > > is
> > > simply already too late when i2c (or any needed driver) uses
> > > "suspend".
> >
> > Okay, I see.
> >
> > The reason why I suggested moving the callbacks to "suspend_late",
> > was
> > that I was worried that some of the attached devices to genpd could
> > use "suspend_late" themselves. This is the case for some drivers for
> > DMA/clock/gpio/pinctrl-controllers, for example. That said, I am
> > curious to look at the DT files for the platform you are running,
> > would you mind giving me a pointer?
>
> I'm running
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
> with these (small) patches on top:
> https://source.puri.sm/martin.kepplinger/linux-next/-/commits/5.19.3/librem5

Thanks for sharing the information!

>
> >
> > So, this made me think about this a bit more. In the end, just using
> > different levels (suspend, suspend_late, suspend_noirq) of callbacks
> > are just papering over the real *dependency* problem.
>
> true, it doesn't feel like a stable solution.
>
> >
> > What we need for the genpd provider driver, is to be asked to be
> > suspended under the following conditions:
> > 1. All consumer devices (and child-domains) for its corresponding PM
> > domain have been suspended.
> > 2. All its supplier devices supplies must remain resumed, until the
> > genpd provider has been suspended.
> >
> > Please allow me a few more days to think in more detail about this.
>
> Thanks a lot for thinking about this!

I have made some more thinking, but it's been a busy period for me, so
unfortunately I need some additional time (another week). It seems
like I also need to do some prototyping, to convince myself about the
approach.

So, my apologies for the delay!

Kind regards
Uffe
Martin Kepplinger Sept. 26, 2022, 9:52 a.m. UTC | #10
Am Freitag, dem 23.09.2022 um 15:55 +0200 schrieb Ulf Hansson:
> On Thu, 25 Aug 2022 at 09:06, Martin Kepplinger
> <martin.kepplinger@puri.sm> wrote:
> > 
> > Am Mittwoch, dem 24.08.2022 um 15:30 +0200 schrieb Ulf Hansson:
> > > On Mon, 22 Aug 2022 at 10:38, Martin Kepplinger
> > > <martin.kepplinger@puri.sm> wrote:
> > > > 
> > > > Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> > > > > On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > 
> > > > > > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf
> > > > > > Hansson:
> > > > > > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > > > 
> > > > > > > > If for example the power-domains' power-supply node
> > > > > > > > (regulator)
> > > > > > > > needs
> > > > > > > > interrupts to work, the current setup with noirq
> > > > > > > > callbacks
> > > > > > > > cannot
> > > > > > > > work; for example a pmic regulator on i2c, when
> > > > > > > > suspending,
> > > > > > > > usually
> > > > > > > > already
> > > > > > > > times out during suspend_noirq:
> > > > > > > > 
> > > > > > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > > > > > 
> > > > > > > > So fix system suspend and resume for these power-
> > > > > > > > domains by
> > > > > > > > using
> > > > > > > > the
> > > > > > > > "outer" suspend/resume callbacks instead. Tested on the
> > > > > > > > imx8mq-
> > > > > > > > librem5 board,
> > > > > > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > > > > > possibly
> > > > > > > > many other
> > > > > > > > boards too.
> > > > > > > > 
> > > > > > > > This is designed so that genpd providers just say "this
> > > > > > > > genpd
> > > > > > > > needs
> > > > > > > > interrupts" (by setting the flag) - without implying an
> > > > > > > > implementation.
> > > > > > > > 
> > > > > > > > Initially system suspend problems had been discussed at
> > > > > > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > > > > > which led to discussing the pmic that contains the
> > > > > > > > regulators
> > > > > > > > which
> > > > > > > > serve as power-domain power-supplies:
> > > > > > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > > > > > 
> > > > > > > > Signed-off-by: Martin Kepplinger
> > > > > > > > <martin.kepplinger@puri.sm>
> > > > > > > > ---
> > > > > > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > > > > > >  include/linux/pm_domain.h   |  5 +++++
> > > > > > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > > > > > 
> > > > > > > > diff --git a/drivers/base/power/domain.c
> > > > > > > > b/drivers/base/power/domain.c
> > > > > > > > index 5a2e0232862e..58376752a4de 100644
> > > > > > > > --- a/drivers/base/power/domain.c
> > > > > > > > +++ b/drivers/base/power/domain.c
> > > > > > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > > > > > genpd_spin_ops = {
> > > > > > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > > > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > > > > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > > > > > GENPD_FLAG_CPU_DOMAIN)
> > > > > > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > > > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > > > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > > > > > GENPD_FLAG_IRQ_ON)
> > > > > > > > 
> > > > > > > >  static inline bool irq_safe_dev_in_sleep_domain(struct
> > > > > > > > device
> > > > > > > > *dev,
> > > > > > > >                 const struct generic_pm_domain *genpd)
> > > > > > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > > > > > generic_pm_domain
> > > > > > > > *genpd,
> > > > > > > >         genpd->domain.ops.runtime_suspend =
> > > > > > > > genpd_runtime_suspend;
> > > > > > > >         genpd->domain.ops.runtime_resume =
> > > > > > > > genpd_runtime_resume;
> > > > > > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > > > > > -       genpd->domain.ops.suspend_noirq =
> > > > > > > > genpd_suspend_noirq;
> > > > > > > > -       genpd->domain.ops.resume_noirq =
> > > > > > > > genpd_resume_noirq;
> > > > > > > > +
> > > > > > > > +       if (genpd_irq_on(genpd)) {
> > > > > > > > +               genpd->domain.ops.suspend =
> > > > > > > > genpd_suspend_noirq;
> > > > > > > > +               genpd->domain.ops.resume =
> > > > > > > > genpd_resume_noirq;
> > > > > > > > +       } else {
> > > > > > > > +               genpd->domain.ops.suspend_noirq =
> > > > > > > > genpd_suspend_noirq;
> > > > > > > > +               genpd->domain.ops.resume_noirq =
> > > > > > > > genpd_resume_noirq;
> > > > > > > 
> > > > > > > As we discussed previously, I am thinking that it may be
> > > > > > > better
> > > > > > > to
> > > > > > > move to using genpd->domain.ops.suspend_late and
> > > > > > > genpd->domain.ops.resume_early instead.
> > > > > > 
> > > > > > Wouldn't that better be a separate patch (on top)? Do you
> > > > > > really
> > > > > > want
> > > > > > me to change the current behaviour (default case) to from
> > > > > > noirq
> > > > > > to
> > > > > > late? Then I'll resend this series with such a patch added.
> > > > > 
> > > > > Sorry, I wasn't clear enough, the default behaviour should
> > > > > remain
> > > > > as
> > > > > is.
> > > > > 
> > > > > What I meant was, when genpd_irq_on() is true, we should use
> > > > > the
> > > > > genpd->domain.ops.suspend_late and genpd-
> > > > > > domain.ops.resume_early.
> > > > 
> > > > Testing that shows that this isn't working. I can provide the
> > > > logs
> > > > later, but suspend fails and I think it makes sense:
> > > > "suspend_late"
> > > > is
> > > > simply already too late when i2c (or any needed driver) uses
> > > > "suspend".
> > > 
> > > Okay, I see.
> > > 
> > > The reason why I suggested moving the callbacks to
> > > "suspend_late",
> > > was
> > > that I was worried that some of the attached devices to genpd
> > > could
> > > use "suspend_late" themselves. This is the case for some drivers
> > > for
> > > DMA/clock/gpio/pinctrl-controllers, for example. That said, I am
> > > curious to look at the DT files for the platform you are running,
> > > would you mind giving me a pointer?
> > 
> > I'm running
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
> > with these (small) patches on top:
> > https://source.puri.sm/martin.kepplinger/linux-next/-/commits/5.19.3/librem5
> 
> Thanks for sharing the information!
> 
> > 
> > > 
> > > So, this made me think about this a bit more. In the end, just
> > > using
> > > different levels (suspend, suspend_late, suspend_noirq) of
> > > callbacks
> > > are just papering over the real *dependency* problem.
> > 
> > true, it doesn't feel like a stable solution.
> > 
> > > 
> > > What we need for the genpd provider driver, is to be asked to be
> > > suspended under the following conditions:
> > > 1. All consumer devices (and child-domains) for its corresponding
> > > PM
> > > domain have been suspended.
> > > 2. All its supplier devices supplies must remain resumed, until
> > > the
> > > genpd provider has been suspended.
> > > 
> > > Please allow me a few more days to think in more detail about
> > > this.
> > 
> > Thanks a lot for thinking about this!
> 
> I have made some more thinking, but it's been a busy period for me,
> so
> unfortunately I need some additional time (another week). It seems
> like I also need to do some prototyping, to convince myself about the
> approach.
> 
> So, my apologies for the delay!

to be honest, I'm happy as long as you don't forget about the bug. The
workaround I got (these patches) is solid enough for me to be able to
wait. And I'm happy to always answer specific questions or test a patch
of course.

thanks for the update!

                              martin
Martin Kepplinger June 21, 2023, 6:20 p.m. UTC | #11
Am Freitag, dem 23.09.2022 um 15:55 +0200 schrieb Ulf Hansson:
> On Thu, 25 Aug 2022 at 09:06, Martin Kepplinger
> <martin.kepplinger@puri.sm> wrote:
> > 
> > Am Mittwoch, dem 24.08.2022 um 15:30 +0200 schrieb Ulf Hansson:
> > > On Mon, 22 Aug 2022 at 10:38, Martin Kepplinger
> > > <martin.kepplinger@puri.sm> wrote:
> > > > 
> > > > Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> > > > > On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > 
> > > > > > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf
> > > > > > Hansson:
> > > > > > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > > > 
> > > > > > > > If for example the power-domains' power-supply node
> > > > > > > > (regulator)
> > > > > > > > needs
> > > > > > > > interrupts to work, the current setup with noirq
> > > > > > > > callbacks
> > > > > > > > cannot
> > > > > > > > work; for example a pmic regulator on i2c, when
> > > > > > > > suspending,
> > > > > > > > usually
> > > > > > > > already
> > > > > > > > times out during suspend_noirq:
> > > > > > > > 
> > > > > > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > > > > > 
> > > > > > > > So fix system suspend and resume for these power-
> > > > > > > > domains by
> > > > > > > > using
> > > > > > > > the
> > > > > > > > "outer" suspend/resume callbacks instead. Tested on the
> > > > > > > > imx8mq-
> > > > > > > > librem5 board,
> > > > > > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > > > > > possibly
> > > > > > > > many other
> > > > > > > > boards too.
> > > > > > > > 
> > > > > > > > This is designed so that genpd providers just say "this
> > > > > > > > genpd
> > > > > > > > needs
> > > > > > > > interrupts" (by setting the flag) - without implying an
> > > > > > > > implementation.
> > > > > > > > 
> > > > > > > > Initially system suspend problems had been discussed at
> > > > > > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > > > > > which led to discussing the pmic that contains the
> > > > > > > > regulators
> > > > > > > > which
> > > > > > > > serve as power-domain power-supplies:
> > > > > > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > > > > > 
> > > > > > > > Signed-off-by: Martin Kepplinger
> > > > > > > > <martin.kepplinger@puri.sm>
> > > > > > > > ---
> > > > > > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > > > > > >  include/linux/pm_domain.h   |  5 +++++
> > > > > > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > > > > > 
> > > > > > > > diff --git a/drivers/base/power/domain.c
> > > > > > > > b/drivers/base/power/domain.c
> > > > > > > > index 5a2e0232862e..58376752a4de 100644
> > > > > > > > --- a/drivers/base/power/domain.c
> > > > > > > > +++ b/drivers/base/power/domain.c
> > > > > > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > > > > > genpd_spin_ops = {
> > > > > > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > > > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > > > > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > > > > > GENPD_FLAG_CPU_DOMAIN)
> > > > > > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > > > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > > > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > > > > > GENPD_FLAG_IRQ_ON)
> > > > > > > > 
> > > > > > > >  static inline bool irq_safe_dev_in_sleep_domain(struct
> > > > > > > > device
> > > > > > > > *dev,
> > > > > > > >                 const struct generic_pm_domain *genpd)
> > > > > > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > > > > > generic_pm_domain
> > > > > > > > *genpd,
> > > > > > > >         genpd->domain.ops.runtime_suspend =
> > > > > > > > genpd_runtime_suspend;
> > > > > > > >         genpd->domain.ops.runtime_resume =
> > > > > > > > genpd_runtime_resume;
> > > > > > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > > > > > -       genpd->domain.ops.suspend_noirq =
> > > > > > > > genpd_suspend_noirq;
> > > > > > > > -       genpd->domain.ops.resume_noirq =
> > > > > > > > genpd_resume_noirq;
> > > > > > > > +
> > > > > > > > +       if (genpd_irq_on(genpd)) {
> > > > > > > > +               genpd->domain.ops.suspend =
> > > > > > > > genpd_suspend_noirq;
> > > > > > > > +               genpd->domain.ops.resume =
> > > > > > > > genpd_resume_noirq;
> > > > > > > > +       } else {
> > > > > > > > +               genpd->domain.ops.suspend_noirq =
> > > > > > > > genpd_suspend_noirq;
> > > > > > > > +               genpd->domain.ops.resume_noirq =
> > > > > > > > genpd_resume_noirq;
> > > > > > > 
> > > > > > > As we discussed previously, I am thinking that it may be
> > > > > > > better
> > > > > > > to
> > > > > > > move to using genpd->domain.ops.suspend_late and
> > > > > > > genpd->domain.ops.resume_early instead.
> > > > > > 
> > > > > > Wouldn't that better be a separate patch (on top)? Do you
> > > > > > really
> > > > > > want
> > > > > > me to change the current behaviour (default case) to from
> > > > > > noirq
> > > > > > to
> > > > > > late? Then I'll resend this series with such a patch added.
> > > > > 
> > > > > Sorry, I wasn't clear enough, the default behaviour should
> > > > > remain
> > > > > as
> > > > > is.
> > > > > 
> > > > > What I meant was, when genpd_irq_on() is true, we should use
> > > > > the
> > > > > genpd->domain.ops.suspend_late and genpd-
> > > > > > domain.ops.resume_early.
> > > > 
> > > > Testing that shows that this isn't working. I can provide the
> > > > logs
> > > > later, but suspend fails and I think it makes sense:
> > > > "suspend_late"
> > > > is
> > > > simply already too late when i2c (or any needed driver) uses
> > > > "suspend".
> > > 
> > > Okay, I see.
> > > 
> > > The reason why I suggested moving the callbacks to
> > > "suspend_late",
> > > was
> > > that I was worried that some of the attached devices to genpd
> > > could
> > > use "suspend_late" themselves. This is the case for some drivers
> > > for
> > > DMA/clock/gpio/pinctrl-controllers, for example. That said, I am
> > > curious to look at the DT files for the platform you are running,
> > > would you mind giving me a pointer?
> > 
> > I'm running
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
> > with these (small) patches on top:
> > https://source.puri.sm/martin.kepplinger/linux-next/-/commits/5.19.3/librem5
> 
> Thanks for sharing the information!
> 
> > 
> > > 
> > > So, this made me think about this a bit more. In the end, just
> > > using
> > > different levels (suspend, suspend_late, suspend_noirq) of
> > > callbacks
> > > are just papering over the real *dependency* problem.
> > 
> > true, it doesn't feel like a stable solution.
> > 
> > > 
> > > What we need for the genpd provider driver, is to be asked to be
> > > suspended under the following conditions:
> > > 1. All consumer devices (and child-domains) for its corresponding
> > > PM
> > > domain have been suspended.
> > > 2. All its supplier devices supplies must remain resumed, until
> > > the
> > > genpd provider has been suspended.
> > > 
> > > Please allow me a few more days to think in more detail about
> > > this.
> > 
> > Thanks a lot for thinking about this!
> 
> I have made some more thinking, but it's been a busy period for me,
> so
> unfortunately I need some additional time (another week). It seems
> like I also need to do some prototyping, to convince myself about the
> approach.
> 
> So, my apologies for the delay!
> 
> Kind regards
> Uffe

Hi Ulf and all interested,

Has there been any development regarding this bug? - genpd that needs
interrupts for power-on/off being run in noirq phases - you remember
it? it's been a while :)

Anyway I still run these patches and while it's a reasonable workaround
IMO, I wanted to check whether you are aware of anything that might
solve this. (or maybe it *is* solved and I simply overlooked because my
patches still apply?)

thanks!

                               martin
Ulf Hansson June 26, 2023, 9:50 a.m. UTC | #12
On Wed, 21 Jun 2023 at 20:20, Martin Kepplinger
<martin.kepplinger@puri.sm> wrote:
>
> Am Freitag, dem 23.09.2022 um 15:55 +0200 schrieb Ulf Hansson:
> > On Thu, 25 Aug 2022 at 09:06, Martin Kepplinger
> > <martin.kepplinger@puri.sm> wrote:
> > >
> > > Am Mittwoch, dem 24.08.2022 um 15:30 +0200 schrieb Ulf Hansson:
> > > > On Mon, 22 Aug 2022 at 10:38, Martin Kepplinger
> > > > <martin.kepplinger@puri.sm> wrote:
> > > > >
> > > > > Am Freitag, dem 19.08.2022 um 16:53 +0200 schrieb Ulf Hansson:
> > > > > > On Fri, 19 Aug 2022 at 11:17, Martin Kepplinger
> > > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > >
> > > > > > > Am Dienstag, dem 26.07.2022 um 17:07 +0200 schrieb Ulf
> > > > > > > Hansson:
> > > > > > > > On Tue, 26 Jul 2022 at 10:33, Martin Kepplinger
> > > > > > > > <martin.kepplinger@puri.sm> wrote:
> > > > > > > > >
> > > > > > > > > If for example the power-domains' power-supply node
> > > > > > > > > (regulator)
> > > > > > > > > needs
> > > > > > > > > interrupts to work, the current setup with noirq
> > > > > > > > > callbacks
> > > > > > > > > cannot
> > > > > > > > > work; for example a pmic regulator on i2c, when
> > > > > > > > > suspending,
> > > > > > > > > usually
> > > > > > > > > already
> > > > > > > > > times out during suspend_noirq:
> > > > > > > > >
> > > > > > > > > [   41.024193] buck4: failed to disable: -ETIMEDOUT
> > > > > > > > >
> > > > > > > > > So fix system suspend and resume for these power-
> > > > > > > > > domains by
> > > > > > > > > using
> > > > > > > > > the
> > > > > > > > > "outer" suspend/resume callbacks instead. Tested on the
> > > > > > > > > imx8mq-
> > > > > > > > > librem5 board,
> > > > > > > > > but by looking at the dts, this will fix imx8mq-evk and
> > > > > > > > > possibly
> > > > > > > > > many other
> > > > > > > > > boards too.
> > > > > > > > >
> > > > > > > > > This is designed so that genpd providers just say "this
> > > > > > > > > genpd
> > > > > > > > > needs
> > > > > > > > > interrupts" (by setting the flag) - without implying an
> > > > > > > > > implementation.
> > > > > > > > >
> > > > > > > > > Initially system suspend problems had been discussed at
> > > > > > > > > https://lore.kernel.org/linux-arm-kernel/20211002005954.1367653-8-l.stach@pengutronix.de/
> > > > > > > > > which led to discussing the pmic that contains the
> > > > > > > > > regulators
> > > > > > > > > which
> > > > > > > > > serve as power-domain power-supplies:
> > > > > > > > > https://lore.kernel.org/linux-pm/573166b75e524517782471c2b7f96e03fd93d175.camel@puri.sm/T/
> > > > > > > > >
> > > > > > > > > Signed-off-by: Martin Kepplinger
> > > > > > > > > <martin.kepplinger@puri.sm>
> > > > > > > > > ---
> > > > > > > > >  drivers/base/power/domain.c | 13 +++++++++++--
> > > > > > > > >  include/linux/pm_domain.h   |  5 +++++
> > > > > > > > >  2 files changed, 16 insertions(+), 2 deletions(-)
> > > > > > > > >
> > > > > > > > > diff --git a/drivers/base/power/domain.c
> > > > > > > > > b/drivers/base/power/domain.c
> > > > > > > > > index 5a2e0232862e..58376752a4de 100644
> > > > > > > > > --- a/drivers/base/power/domain.c
> > > > > > > > > +++ b/drivers/base/power/domain.c
> > > > > > > > > @@ -130,6 +130,7 @@ static const struct genpd_lock_ops
> > > > > > > > > genpd_spin_ops = {
> > > > > > > > >  #define genpd_is_active_wakeup(genpd)  (genpd->flags &
> > > > > > > > > GENPD_FLAG_ACTIVE_WAKEUP)
> > > > > > > > >  #define genpd_is_cpu_domain(genpd)     (genpd->flags &
> > > > > > > > > GENPD_FLAG_CPU_DOMAIN)
> > > > > > > > >  #define genpd_is_rpm_always_on(genpd)  (genpd->flags &
> > > > > > > > > GENPD_FLAG_RPM_ALWAYS_ON)
> > > > > > > > > +#define genpd_irq_on(genpd)            (genpd->flags &
> > > > > > > > > GENPD_FLAG_IRQ_ON)
> > > > > > > > >
> > > > > > > > >  static inline bool irq_safe_dev_in_sleep_domain(struct
> > > > > > > > > device
> > > > > > > > > *dev,
> > > > > > > > >                 const struct generic_pm_domain *genpd)
> > > > > > > > > @@ -2065,8 +2066,15 @@ int pm_genpd_init(struct
> > > > > > > > > generic_pm_domain
> > > > > > > > > *genpd,
> > > > > > > > >         genpd->domain.ops.runtime_suspend =
> > > > > > > > > genpd_runtime_suspend;
> > > > > > > > >         genpd->domain.ops.runtime_resume =
> > > > > > > > > genpd_runtime_resume;
> > > > > > > > >         genpd->domain.ops.prepare = genpd_prepare;
> > > > > > > > > -       genpd->domain.ops.suspend_noirq =
> > > > > > > > > genpd_suspend_noirq;
> > > > > > > > > -       genpd->domain.ops.resume_noirq =
> > > > > > > > > genpd_resume_noirq;
> > > > > > > > > +
> > > > > > > > > +       if (genpd_irq_on(genpd)) {
> > > > > > > > > +               genpd->domain.ops.suspend =
> > > > > > > > > genpd_suspend_noirq;
> > > > > > > > > +               genpd->domain.ops.resume =
> > > > > > > > > genpd_resume_noirq;
> > > > > > > > > +       } else {
> > > > > > > > > +               genpd->domain.ops.suspend_noirq =
> > > > > > > > > genpd_suspend_noirq;
> > > > > > > > > +               genpd->domain.ops.resume_noirq =
> > > > > > > > > genpd_resume_noirq;
> > > > > > > >
> > > > > > > > As we discussed previously, I am thinking that it may be
> > > > > > > > better
> > > > > > > > to
> > > > > > > > move to using genpd->domain.ops.suspend_late and
> > > > > > > > genpd->domain.ops.resume_early instead.
> > > > > > >
> > > > > > > Wouldn't that better be a separate patch (on top)? Do you
> > > > > > > really
> > > > > > > want
> > > > > > > me to change the current behaviour (default case) to from
> > > > > > > noirq
> > > > > > > to
> > > > > > > late? Then I'll resend this series with such a patch added.
> > > > > >
> > > > > > Sorry, I wasn't clear enough, the default behaviour should
> > > > > > remain
> > > > > > as
> > > > > > is.
> > > > > >
> > > > > > What I meant was, when genpd_irq_on() is true, we should use
> > > > > > the
> > > > > > genpd->domain.ops.suspend_late and genpd-
> > > > > > > domain.ops.resume_early.
> > > > >
> > > > > Testing that shows that this isn't working. I can provide the
> > > > > logs
> > > > > later, but suspend fails and I think it makes sense:
> > > > > "suspend_late"
> > > > > is
> > > > > simply already too late when i2c (or any needed driver) uses
> > > > > "suspend".
> > > >
> > > > Okay, I see.
> > > >
> > > > The reason why I suggested moving the callbacks to
> > > > "suspend_late",
> > > > was
> > > > that I was worried that some of the attached devices to genpd
> > > > could
> > > > use "suspend_late" themselves. This is the case for some drivers
> > > > for
> > > > DMA/clock/gpio/pinctrl-controllers, for example. That said, I am
> > > > curious to look at the DT files for the platform you are running,
> > > > would you mind giving me a pointer?
> > >
> > > I'm running
> > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
> > > with these (small) patches on top:
> > > https://source.puri.sm/martin.kepplinger/linux-next/-/commits/5.19.3/librem5
> >
> > Thanks for sharing the information!
> >
> > >
> > > >
> > > > So, this made me think about this a bit more. In the end, just
> > > > using
> > > > different levels (suspend, suspend_late, suspend_noirq) of
> > > > callbacks
> > > > are just papering over the real *dependency* problem.
> > >
> > > true, it doesn't feel like a stable solution.
> > >
> > > >
> > > > What we need for the genpd provider driver, is to be asked to be
> > > > suspended under the following conditions:
> > > > 1. All consumer devices (and child-domains) for its corresponding
> > > > PM
> > > > domain have been suspended.
> > > > 2. All its supplier devices supplies must remain resumed, until
> > > > the
> > > > genpd provider has been suspended.
> > > >
> > > > Please allow me a few more days to think in more detail about
> > > > this.
> > >
> > > Thanks a lot for thinking about this!
> >
> > I have made some more thinking, but it's been a busy period for me,
> > so
> > unfortunately I need some additional time (another week). It seems
> > like I also need to do some prototyping, to convince myself about the
> > approach.
> >
> > So, my apologies for the delay!
> >
> > Kind regards
> > Uffe
>
> Hi Ulf and all interested,
>
> Has there been any development regarding this bug? - genpd that needs
> interrupts for power-on/off being run in noirq phases - you remember
> it? it's been a while :)

Yes, sorry for the no-progress on my side. Except for some thinking
and drawing, I don't have an update.

Although, to clarify, I have not forgotten about it. It's in my TODO
list of prioritized things. I just need to complete a couple other
things before I come to this and I will certainly keep you in the loop
if I post something.

>
> Anyway I still run these patches and while it's a reasonable workaround
> IMO, I wanted to check whether you are aware of anything that might
> solve this. (or maybe it *is* solved and I simply overlooked because my
> patches still apply?)

The problem is still there, unfortunately.

Kind regards
Uffe
diff mbox series

Patch

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 5a2e0232862e..58376752a4de 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -130,6 +130,7 @@  static const struct genpd_lock_ops genpd_spin_ops = {
 #define genpd_is_active_wakeup(genpd)	(genpd->flags & GENPD_FLAG_ACTIVE_WAKEUP)
 #define genpd_is_cpu_domain(genpd)	(genpd->flags & GENPD_FLAG_CPU_DOMAIN)
 #define genpd_is_rpm_always_on(genpd)	(genpd->flags & GENPD_FLAG_RPM_ALWAYS_ON)
+#define genpd_irq_on(genpd)		(genpd->flags & GENPD_FLAG_IRQ_ON)
 
 static inline bool irq_safe_dev_in_sleep_domain(struct device *dev,
 		const struct generic_pm_domain *genpd)
@@ -2065,8 +2066,15 @@  int pm_genpd_init(struct generic_pm_domain *genpd,
 	genpd->domain.ops.runtime_suspend = genpd_runtime_suspend;
 	genpd->domain.ops.runtime_resume = genpd_runtime_resume;
 	genpd->domain.ops.prepare = genpd_prepare;
-	genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
-	genpd->domain.ops.resume_noirq = genpd_resume_noirq;
+
+	if (genpd_irq_on(genpd)) {
+		genpd->domain.ops.suspend = genpd_suspend_noirq;
+		genpd->domain.ops.resume = genpd_resume_noirq;
+	} else {
+		genpd->domain.ops.suspend_noirq = genpd_suspend_noirq;
+		genpd->domain.ops.resume_noirq = genpd_resume_noirq;
+	}
+
 	genpd->domain.ops.freeze_noirq = genpd_freeze_noirq;
 	genpd->domain.ops.thaw_noirq = genpd_thaw_noirq;
 	genpd->domain.ops.poweroff_noirq = genpd_poweroff_noirq;
@@ -2769,6 +2777,7 @@  static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev,
 			goto err;
 		dev_gpd_data(dev)->default_pstate = pstate;
 	}
+
 	return 1;
 
 err:
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index ebc351698090..9cdedbc21158 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@ -60,6 +60,10 @@ 
  * GENPD_FLAG_MIN_RESIDENCY:	Enable the genpd governor to consider its
  *				components' next wakeup when determining the
  *				optimal idle state.
+ *
+ * GENPD_FLAG_IRQ_ON:		genpd needs irqs to be able to manage power
+ *				on/off. Use the outer suspend/resume callbacks
+ *				instead of noirq for example.
  */
 #define GENPD_FLAG_PM_CLK	 (1U << 0)
 #define GENPD_FLAG_IRQ_SAFE	 (1U << 1)
@@ -68,6 +72,7 @@ 
 #define GENPD_FLAG_CPU_DOMAIN	 (1U << 4)
 #define GENPD_FLAG_RPM_ALWAYS_ON (1U << 5)
 #define GENPD_FLAG_MIN_RESIDENCY (1U << 6)
+#define GENPD_FLAG_IRQ_ON	 (1U << 7)
 
 enum gpd_status {
 	GENPD_STATE_ON = 0,	/* PM domain is on */