Re: [PATCH][RFC] ACPI / PM: Fix incorrect wakeup irq setting before suspend-to-idle

From: Rafael J. Wysocki
Date: Fri Sep 25 2015 - 09:28:39 EST


On Friday, September 25, 2015 06:42:41 AM Chen, Yu C wrote:
> Hi,Rafael, thanks a lot for your review, will resend v2 version.
>
> > -----Original Message-----
> > From: Rafael J. Wysocki [mailto:rjw@xxxxxxxxxxxxx]
> > Sent: Friday, September 25, 2015 9:24 AM
> > To: Chen, Yu C
> > Cc: Wysocki, Rafael J; jiang.liu@xxxxxxxxxxxxxxx; Zhang, Rui; Brown, Len; linux-
> > kernel@xxxxxxxxxxxxxxx; linux-pm@xxxxxxxxxxxxxxx
> > Subject: Re: [PATCH][RFC] ACPI / PM: Fix incorrect wakeup irq setting before
> > suspend-to-idle
> >
> > On Monday, August 10, 2015 10:11:26 AM Chen Yu wrote:
> > > Signed-off-by: Chen Yu <yu.c.chen@xxxxxxxxx>
> >
> > That would only really matter if GPE devices were used, but I've never seen a
> > system using them in practice, so this is more of a theoretical issue.
> >
> I haven't encountered this problem, just find this suspicious
> when I was doing some other debugging.

In fact what I said was incorrect. You might encounter this problem if the
ACPI interrupt has been remapped and not when GPE devices are used.

> > > ---
> > > drivers/acpi/osl.c | 5 ++++-
> > > drivers/acpi/sleep.c | 20 ++++++++++++++++++-- drivers/acpi/sleep.h
> > > | 5 +++++
> > > 3 files changed, 27 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index
> > > 3b8963f..8e1420a 100644
> > > --- a/drivers/acpi/osl.c
> > > +++ b/drivers/acpi/osl.c
> > > @@ -850,7 +851,9 @@ acpi_os_install_interrupt_handler(u32 gsi,
> > acpi_osd_handler handler,
> > > gsi);
> > > return AE_OK;
> > > }
> > > -
> > > +#ifdef CONFIG_SUSPEND
> > > + set_wake_irq_freeze(irq);
> > > +#endif
> >
> > Please don't use #ifdefs in function bodies. You can use IS_ENABLED() for
> > that.
> >
> OK, will do.

Alternatively, you can define an empty static inline stub of set_wake_irq_freeze()
for CONFIG_SUSPEND and avoid using IS_ENABLED() even.

But I'd rather define a global acpi_irq variable, store irq in it and access it
directly from acpi_freeze_prepare(). And it doesn't have to depend on CONFIG_SUSPEND
as it is just the IRQ number actually used by ACPI.

BTW, I wonder if there are other places using acpi_gbl_FADT.sci_interrupt directly
which they shouldn't do?

> > > acpi_irq_handler = handler;
> > > acpi_irq_context = context;
> > > if (request_irq(irq, acpi_irq, IRQF_SHARED, "acpi", acpi_irq)) {
> > > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index
> > > 2f0d4db..9e7b54e 100644
> > > --- a/drivers/acpi/sleep.c
> > > +++ b/drivers/acpi/sleep.c
> > > @@ -620,6 +620,22 @@ static const struct platform_suspend_ops
> > acpi_suspend_ops_old = {
> > > .end = acpi_pm_end,
> > > .recover = acpi_pm_finish,
> > > };
> > > +static int wake_irq_freeze = -EINVAL;
> >
> > There may be more than one of these in theory.
> >
> Oh, do you mean the naming for this variable is un-suitable? OK, I'll change it to
> acpi_freeze_wake_irq

No. What I mean is that in theory there may be multiple ACPI interrupts.

But you need not care about this case because of the

if (gsi != acpi_gbl_FADT.sci_interrupt)
return AE_BAD_PARAMETER;

check in acpi_os_install_interrupt_handler().

Thanks,
Rafael

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/