linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* System fails to exit s2idle by a keystroke on my laptop
@ 2020-05-04 17:09 Chris Chiu
  2020-05-06  9:32 ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Chris Chiu @ 2020-05-04 17:09 UTC (permalink / raw)
  To: Rafael J. Wysocki, seth.forshee, Len Brown
  Cc: ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

Hi,
    I have an Intel X5-Z8350 laptop which used to work fine on s2idle
enter/exit with kernel 5.3. After upgrading to kernel 5.4 and later,
the system can still exit s2idle by power button. However, if I try to
wake it up from a keystroke, the system will freeze and then no longer
respond even to the power button. I can only shut it down and power on
again.

    I tried to 'git bisect' to find out which commit causes the
difference, it shows me the commit "ACPI: PM: s2idle: Prevent spurious
SCIs from waking up the system". My laptop can work as usual to exit
s2idle by a keystroke with reverting it on kernel 5.4.

    Then I tried to check whether I can reproduce it on the latest
mainline kernel, the same problem still there. But I can not fix it by
simply reverting. I found the acpi_s2idle_wake() has been refined on
the latest mainline kernel, and I have to make modifications as
follows to make my laptop work.

@@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
                 * regarded as a spurious one.
                 */
                if (!acpi_ec_dispatch_gpe())
-                       return false;
+                       return true;

                /*
                 * Cancel the wakeup and process all pending events in case

    Maybe there's something special on my laptop so a keystroke is
considered as a spurious event on this machine? Don't know if the DSDT
helps or not.
https://gist.github.com/mschiu77/de8af6da78be12cf442853e7747f76ed

    Please let me know if there's anything I can help to address this
problem. Thanks

Chris

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-04 17:09 System fails to exit s2idle by a keystroke on my laptop Chris Chiu
@ 2020-05-06  9:32 ` Rafael J. Wysocki
  2020-05-06 10:19   ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2020-05-06  9:32 UTC (permalink / raw)
  To: Chris Chiu
  Cc: Rafael J. Wysocki, seth.forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Mon, May 4, 2020 at 7:09 PM Chris Chiu <chiu@endlessm.com> wrote:
>
> Hi,
>     I have an Intel X5-Z8350 laptop which used to work fine on s2idle
> enter/exit with kernel 5.3. After upgrading to kernel 5.4 and later,
> the system can still exit s2idle by power button. However, if I try to
> wake it up from a keystroke, the system will freeze and then no longer
> respond even to the power button. I can only shut it down and power on
> again.
>
>     I tried to 'git bisect' to find out which commit causes the
> difference, it shows me the commit "ACPI: PM: s2idle: Prevent spurious
> SCIs from waking up the system". My laptop can work as usual to exit
> s2idle by a keystroke with reverting it on kernel 5.4.
>
>     Then I tried to check whether I can reproduce it on the latest
> mainline kernel, the same problem still there. But I can not fix it by
> simply reverting. I found the acpi_s2idle_wake() has been refined on
> the latest mainline kernel, and I have to make modifications as
> follows to make my laptop work.

Thanks for the report, the issue evidently is EC-related.

> @@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
>                  * regarded as a spurious one.
>                  */
>                 if (!acpi_ec_dispatch_gpe())
> -                       return false;
> +                       return true;

Have you tried commenting out simply removing the if () check and the
following return statement?

If not, can you please try this and see what happens?

>
>                 /*
>                  * Cancel the wakeup and process all pending events in case
>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-06  9:32 ` Rafael J. Wysocki
@ 2020-05-06 10:19   ` Rafael J. Wysocki
  2020-05-07  3:38     ` Chris Chiu
  0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2020-05-06 10:19 UTC (permalink / raw)
  To: Chris Chiu
  Cc: Rafael J. Wysocki, seth.forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Wed, May 6, 2020 at 11:32 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Mon, May 4, 2020 at 7:09 PM Chris Chiu <chiu@endlessm.com> wrote:
> >
> > Hi,
> >     I have an Intel X5-Z8350 laptop which used to work fine on s2idle
> > enter/exit with kernel 5.3. After upgrading to kernel 5.4 and later,
> > the system can still exit s2idle by power button. However, if I try to
> > wake it up from a keystroke, the system will freeze and then no longer
> > respond even to the power button. I can only shut it down and power on
> > again.
> >
> >     I tried to 'git bisect' to find out which commit causes the
> > difference, it shows me the commit "ACPI: PM: s2idle: Prevent spurious
> > SCIs from waking up the system". My laptop can work as usual to exit
> > s2idle by a keystroke with reverting it on kernel 5.4.
> >
> >     Then I tried to check whether I can reproduce it on the latest
> > mainline kernel, the same problem still there. But I can not fix it by
> > simply reverting. I found the acpi_s2idle_wake() has been refined on
> > the latest mainline kernel, and I have to make modifications as
> > follows to make my laptop work.
>
> Thanks for the report, the issue evidently is EC-related.
>
> > @@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
> >                  * regarded as a spurious one.
> >                  */
> >                 if (!acpi_ec_dispatch_gpe())
> > -                       return false;
> > +                       return true;
>
> Have you tried commenting out simply removing the if () check and the
> following return statement?

Scratch that.

Instead, please try doing

acpi_ec_dispatch_gpe()

instead of the if () and the following return statement.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-06 10:19   ` Rafael J. Wysocki
@ 2020-05-07  3:38     ` Chris Chiu
  2020-05-07 18:05       ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Chris Chiu @ 2020-05-07  3:38 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Rafael J. Wysocki, Seth Forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Wed, May 6, 2020 at 6:19 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
> On Wed, May 6, 2020 at 11:32 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
> >
> >
> > Thanks for the report, the issue evidently is EC-related.
> >
> > > @@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
> > >                  * regarded as a spurious one.
> > >                  */
> > >                 if (!acpi_ec_dispatch_gpe())
> > > -                       return false;
> > > +                       return true;
> >
> > Have you tried commenting out simply removing the if () check and the
> > following return statement?
>
> Scratch that.
>
> Instead, please try doing
>
> acpi_ec_dispatch_gpe()
>
> instead of the if () and the following return statement.

Yes. I verified with the modification you suggested on my laptop. It's
working OK.
I can wake from a keystroke w/o problem.

@ -1024,8 +1024,7 @@ static bool acpi_s2idle_wake(void)
                 * If the EC GPE status bit has not been set, the wakeup is
                 * regarded as a spurious one.
                 */
-               if (!acpi_ec_dispatch_gpe())
-                       return false;
+               acpi_ec_dispatch_gpe();

                /*
                 * Cancel the wakeup and process all pending events in case

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-07  3:38     ` Chris Chiu
@ 2020-05-07 18:05       ` Rafael J. Wysocki
  2020-05-08  8:22         ` Chris Chiu
  0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2020-05-07 18:05 UTC (permalink / raw)
  To: Chris Chiu
  Cc: Rafael J. Wysocki, Seth Forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Thursday, May 7, 2020 5:38:11 AM CEST Chris Chiu wrote:
> On Wed, May 6, 2020 at 6:19 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
> >
> > On Wed, May 6, 2020 at 11:32 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
> > >
> > >
> > > Thanks for the report, the issue evidently is EC-related.
> > >
> > > > @@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
> > > >                  * regarded as a spurious one.
> > > >                  */
> > > >                 if (!acpi_ec_dispatch_gpe())
> > > > -                       return false;
> > > > +                       return true;
> > >
> > > Have you tried commenting out simply removing the if () check and the
> > > following return statement?
> >
> > Scratch that.
> >
> > Instead, please try doing
> >
> > acpi_ec_dispatch_gpe()
> >
> > instead of the if () and the following return statement.
> 
> Yes. I verified with the modification you suggested on my laptop. It's
> working OK.
> I can wake from a keystroke w/o problem.
> 
> @ -1024,8 +1024,7 @@ static bool acpi_s2idle_wake(void)
>                  * If the EC GPE status bit has not been set, the wakeup is
>                  * regarded as a spurious one.
>                  */
> -               if (!acpi_ec_dispatch_gpe())
> -                       return false;
> +               acpi_ec_dispatch_gpe();
> 
>                 /*
>                  * Cancel the wakeup and process all pending events in case
> 

OK, great, thanks for the confirmation!

Does the appended patch work for you then?

It should be functionally equivalent to the above change if I didn't mess it up.


---
 drivers/acpi/ec.c       |   23 ++++++++++++++---------
 drivers/acpi/internal.h |    1 -
 drivers/acpi/sleep.c    |   14 ++------------
 3 files changed, 16 insertions(+), 22 deletions(-)

Index: linux-pm/drivers/acpi/sleep.c
===================================================================
--- linux-pm.orig/drivers/acpi/sleep.c
+++ linux-pm/drivers/acpi/sleep.c
@@ -1013,21 +1013,11 @@ static bool acpi_s2idle_wake(void)
 		if (acpi_check_wakeup_handlers())
 			return true;
 
-		/*
-		 * If the status bit is set for any enabled GPE other than the
-		 * EC one, the wakeup is regarded as a genuine one.
-		 */
-		if (acpi_ec_other_gpes_active())
+		/* Check non-EC GPE wakeups and dispatch the EC GPE. */
+		if (acpi_ec_dispatch_gpe())
 			return true;
 
 		/*
-		 * If the EC GPE status bit has not been set, the wakeup is
-		 * regarded as a spurious one.
-		 */
-		if (!acpi_ec_dispatch_gpe())
-			return false;
-
-		/*
 		 * Cancel the wakeup and process all pending events in case
 		 * there are any wakeup ones in there.
 		 *
Index: linux-pm/drivers/acpi/ec.c
===================================================================
--- linux-pm.orig/drivers/acpi/ec.c
+++ linux-pm/drivers/acpi/ec.c
@@ -1994,23 +1994,28 @@ void acpi_ec_set_gpe_wake_mask(u8 action
 		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
 }
 
-bool acpi_ec_other_gpes_active(void)
-{
-	return acpi_any_gpe_status_set(first_ec ? first_ec->gpe : U32_MAX);
-}
-
 bool acpi_ec_dispatch_gpe(void)
 {
 	u32 ret;
 
 	if (!first_ec)
-		return false;
+		return acpi_any_gpe_status_set(U32_MAX);
 
+	/*
+	 * Report wakeup if the status bit is set for any enabled GPE other
+	 * than the EC one.
+	 */
+	if (acpi_any_gpe_status_set(first_ec->gpe))
+		return true;
+
+	/*
+	 * Dispatch the EC GPE in-band, but do not report wakeup in any case
+	 * to allow the caller to process events properly after that.
+	 */
 	ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
-	if (ret == ACPI_INTERRUPT_HANDLED) {
+	if (ret == ACPI_INTERRUPT_HANDLED)
 		pm_pr_dbg("EC GPE dispatched\n");
-		return true;
-	}
+
 	return false;
 }
 #endif /* CONFIG_PM_SLEEP */
Index: linux-pm/drivers/acpi/internal.h
===================================================================
--- linux-pm.orig/drivers/acpi/internal.h
+++ linux-pm/drivers/acpi/internal.h
@@ -202,7 +202,6 @@ void acpi_ec_remove_query_handler(struct
 
 #ifdef CONFIG_PM_SLEEP
 void acpi_ec_flush_work(void);
-bool acpi_ec_other_gpes_active(void);
 bool acpi_ec_dispatch_gpe(void);
 #endif
 




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-07 18:05       ` Rafael J. Wysocki
@ 2020-05-08  8:22         ` Chris Chiu
  2020-05-08 16:50           ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Chris Chiu @ 2020-05-08  8:22 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Rafael J. Wysocki, Seth Forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Fri, May 8, 2020 at 2:05 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> On Thursday, May 7, 2020 5:38:11 AM CEST Chris Chiu wrote:
> > On Wed, May 6, 2020 at 6:19 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
> > >
> > > On Wed, May 6, 2020 at 11:32 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
> > > >
> > > >
> > > > Thanks for the report, the issue evidently is EC-related.
> > > >
> > > > > @@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
> > > > >                  * regarded as a spurious one.
> > > > >                  */
> > > > >                 if (!acpi_ec_dispatch_gpe())
> > > > > -                       return false;
> > > > > +                       return true;
> > > >
> > > > Have you tried commenting out simply removing the if () check and the
> > > > following return statement?
> > >
> > > Scratch that.
> > >
> > > Instead, please try doing
> > >
> > > acpi_ec_dispatch_gpe()
> > >
> > > instead of the if () and the following return statement.
> >
> > Yes. I verified with the modification you suggested on my laptop. It's
> > working OK.
> > I can wake from a keystroke w/o problem.
> >
> > @ -1024,8 +1024,7 @@ static bool acpi_s2idle_wake(void)
> >                  * If the EC GPE status bit has not been set, the wakeup is
> >                  * regarded as a spurious one.
> >                  */
> > -               if (!acpi_ec_dispatch_gpe())
> > -                       return false;
> > +               acpi_ec_dispatch_gpe();
> >
> >                 /*
> >                  * Cancel the wakeup and process all pending events in case
> >
>
> OK, great, thanks for the confirmation!
>
> Does the appended patch work for you then?
>
> It should be functionally equivalent to the above change if I didn't mess it up.
>
>
> ---
>  drivers/acpi/ec.c       |   23 ++++++++++++++---------
>  drivers/acpi/internal.h |    1 -
>  drivers/acpi/sleep.c    |   14 ++------------
>  3 files changed, 16 insertions(+), 22 deletions(-)
>
> Index: linux-pm/drivers/acpi/sleep.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/sleep.c
> +++ linux-pm/drivers/acpi/sleep.c
> @@ -1013,21 +1013,11 @@ static bool acpi_s2idle_wake(void)
>                 if (acpi_check_wakeup_handlers())
>                         return true;
>
> -               /*
> -                * If the status bit is set for any enabled GPE other than the
> -                * EC one, the wakeup is regarded as a genuine one.
> -                */
> -               if (acpi_ec_other_gpes_active())
> +               /* Check non-EC GPE wakeups and dispatch the EC GPE. */
> +               if (acpi_ec_dispatch_gpe())
>                         return true;
>
>                 /*
> -                * If the EC GPE status bit has not been set, the wakeup is
> -                * regarded as a spurious one.
> -                */
> -               if (!acpi_ec_dispatch_gpe())
> -                       return false;
> -
> -               /*
>                  * Cancel the wakeup and process all pending events in case
>                  * there are any wakeup ones in there.
>                  *
> Index: linux-pm/drivers/acpi/ec.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/ec.c
> +++ linux-pm/drivers/acpi/ec.c
> @@ -1994,23 +1994,28 @@ void acpi_ec_set_gpe_wake_mask(u8 action
>                 acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
>  }
>
> -bool acpi_ec_other_gpes_active(void)
> -{
> -       return acpi_any_gpe_status_set(first_ec ? first_ec->gpe : U32_MAX);
> -}
> -
>  bool acpi_ec_dispatch_gpe(void)
>  {
>         u32 ret;
>
>         if (!first_ec)
> -               return false;
> +               return acpi_any_gpe_status_set(U32_MAX);
>
> +       /*
> +        * Report wakeup if the status bit is set for any enabled GPE other
> +        * than the EC one.
> +        */
> +       if (acpi_any_gpe_status_set(first_ec->gpe))
> +               return true;
> +
> +       /*
> +        * Dispatch the EC GPE in-band, but do not report wakeup in any case
> +        * to allow the caller to process events properly after that.
> +        */
>         ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
> -       if (ret == ACPI_INTERRUPT_HANDLED) {
> +       if (ret == ACPI_INTERRUPT_HANDLED)
>                 pm_pr_dbg("EC GPE dispatched\n");
> -               return true;
> -       }
> +
>         return false;
>  }
>  #endif /* CONFIG_PM_SLEEP */
> Index: linux-pm/drivers/acpi/internal.h
> ===================================================================
> --- linux-pm.orig/drivers/acpi/internal.h
> +++ linux-pm/drivers/acpi/internal.h
> @@ -202,7 +202,6 @@ void acpi_ec_remove_query_handler(struct
>
>  #ifdef CONFIG_PM_SLEEP
>  void acpi_ec_flush_work(void);
> -bool acpi_ec_other_gpes_active(void);
>  bool acpi_ec_dispatch_gpe(void);
>  #endif
>
>

Hi Rafael,
    Thanks for your patch. I tried it on my laptop and it's also
working fine. Wake up by keystroke/power button/lid open all work as
expected. Thanks.

Chris

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-08  8:22         ` Chris Chiu
@ 2020-05-08 16:50           ` Rafael J. Wysocki
  2020-05-11  6:54             ` Chris Chiu
  0 siblings, 1 reply; 9+ messages in thread
From: Rafael J. Wysocki @ 2020-05-08 16:50 UTC (permalink / raw)
  To: Chris Chiu
  Cc: Rafael J. Wysocki, Seth Forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Friday, May 8, 2020 10:22:09 AM CEST Chris Chiu wrote:
> On Fri, May 8, 2020 at 2:05 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> >
> > On Thursday, May 7, 2020 5:38:11 AM CEST Chris Chiu wrote:
> > > On Wed, May 6, 2020 at 6:19 PM Rafael J. Wysocki <rafael@kernel.org> wrote:
> > > >
> > > > On Wed, May 6, 2020 at 11:32 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
> > > > >
> > > > >
> > > > > Thanks for the report, the issue evidently is EC-related.
> > > > >
> > > > > > @@ -1024,7 +1024,7 @@ static bool acpi_s2idle_wake(void)
> > > > > >                  * regarded as a spurious one.
> > > > > >                  */
> > > > > >                 if (!acpi_ec_dispatch_gpe())
> > > > > > -                       return false;
> > > > > > +                       return true;
> > > > >
> > > > > Have you tried commenting out simply removing the if () check and the
> > > > > following return statement?
> > > >
> > > > Scratch that.
> > > >
> > > > Instead, please try doing
> > > >
> > > > acpi_ec_dispatch_gpe()
> > > >
> > > > instead of the if () and the following return statement.
> > >
> > > Yes. I verified with the modification you suggested on my laptop. It's
> > > working OK.
> > > I can wake from a keystroke w/o problem.
> > >
> > > @ -1024,8 +1024,7 @@ static bool acpi_s2idle_wake(void)
> > >                  * If the EC GPE status bit has not been set, the wakeup is
> > >                  * regarded as a spurious one.
> > >                  */
> > > -               if (!acpi_ec_dispatch_gpe())
> > > -                       return false;
> > > +               acpi_ec_dispatch_gpe();
> > >
> > >                 /*
> > >                  * Cancel the wakeup and process all pending events in case
> > >
> >
> > OK, great, thanks for the confirmation!
> >
> > Does the appended patch work for you then?
> >
> > It should be functionally equivalent to the above change if I didn't mess it up.
> >
> >
> > ---
> >  drivers/acpi/ec.c       |   23 ++++++++++++++---------
> >  drivers/acpi/internal.h |    1 -
> >  drivers/acpi/sleep.c    |   14 ++------------
> >  3 files changed, 16 insertions(+), 22 deletions(-)
> >
> > Index: linux-pm/drivers/acpi/sleep.c
> > ===================================================================
> > --- linux-pm.orig/drivers/acpi/sleep.c
> > +++ linux-pm/drivers/acpi/sleep.c
> > @@ -1013,21 +1013,11 @@ static bool acpi_s2idle_wake(void)
> >                 if (acpi_check_wakeup_handlers())
> >                         return true;
> >
> > -               /*
> > -                * If the status bit is set for any enabled GPE other than the
> > -                * EC one, the wakeup is regarded as a genuine one.
> > -                */
> > -               if (acpi_ec_other_gpes_active())
> > +               /* Check non-EC GPE wakeups and dispatch the EC GPE. */
> > +               if (acpi_ec_dispatch_gpe())
> >                         return true;
> >
> >                 /*
> > -                * If the EC GPE status bit has not been set, the wakeup is
> > -                * regarded as a spurious one.
> > -                */
> > -               if (!acpi_ec_dispatch_gpe())
> > -                       return false;
> > -
> > -               /*
> >                  * Cancel the wakeup and process all pending events in case
> >                  * there are any wakeup ones in there.
> >                  *
> > Index: linux-pm/drivers/acpi/ec.c
> > ===================================================================
> > --- linux-pm.orig/drivers/acpi/ec.c
> > +++ linux-pm/drivers/acpi/ec.c
> > @@ -1994,23 +1994,28 @@ void acpi_ec_set_gpe_wake_mask(u8 action
> >                 acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
> >  }
> >
> > -bool acpi_ec_other_gpes_active(void)
> > -{
> > -       return acpi_any_gpe_status_set(first_ec ? first_ec->gpe : U32_MAX);
> > -}
> > -
> >  bool acpi_ec_dispatch_gpe(void)
> >  {
> >         u32 ret;
> >
> >         if (!first_ec)
> > -               return false;
> > +               return acpi_any_gpe_status_set(U32_MAX);
> >
> > +       /*
> > +        * Report wakeup if the status bit is set for any enabled GPE other
> > +        * than the EC one.
> > +        */
> > +       if (acpi_any_gpe_status_set(first_ec->gpe))
> > +               return true;
> > +
> > +       /*
> > +        * Dispatch the EC GPE in-band, but do not report wakeup in any case
> > +        * to allow the caller to process events properly after that.
> > +        */
> >         ret = acpi_dispatch_gpe(NULL, first_ec->gpe);
> > -       if (ret == ACPI_INTERRUPT_HANDLED) {
> > +       if (ret == ACPI_INTERRUPT_HANDLED)
> >                 pm_pr_dbg("EC GPE dispatched\n");
> > -               return true;
> > -       }
> > +
> >         return false;
> >  }
> >  #endif /* CONFIG_PM_SLEEP */
> > Index: linux-pm/drivers/acpi/internal.h
> > ===================================================================
> > --- linux-pm.orig/drivers/acpi/internal.h
> > +++ linux-pm/drivers/acpi/internal.h
> > @@ -202,7 +202,6 @@ void acpi_ec_remove_query_handler(struct
> >
> >  #ifdef CONFIG_PM_SLEEP
> >  void acpi_ec_flush_work(void);
> > -bool acpi_ec_other_gpes_active(void);
> >  bool acpi_ec_dispatch_gpe(void);
> >  #endif
> >
> >
> 
> Hi Rafael,
>     Thanks for your patch. I tried it on my laptop and it's also
> working fine. Wake up by keystroke/power button/lid open all work as
> expected. Thanks.

Thanks for the confirmation!

Please also verify the final version of the patch available from

https://patchwork.kernel.org/patch/11537215/

Of course, it will only make a difference if the ec_no_wakeup switch is set
on your system (either as a result of blacklisting or via the kernel command
line).

Thanks!




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-08 16:50           ` Rafael J. Wysocki
@ 2020-05-11  6:54             ` Chris Chiu
  2020-05-11  8:10               ` Rafael J. Wysocki
  0 siblings, 1 reply; 9+ messages in thread
From: Chris Chiu @ 2020-05-11  6:54 UTC (permalink / raw)
  To: Rafael J. Wysocki
  Cc: Rafael J. Wysocki, Seth Forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Sat, May 9, 2020 at 12:50 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
>
> On Friday, May 8, 2020 10:22:09 AM CEST Chris Chiu wrote:
> > On Fri, May 8, 2020 at 2:05 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> >
> > Hi Rafael,
> >     Thanks for your patch. I tried it on my laptop and it's also
> > working fine. Wake up by keystroke/power button/lid open all work as
> > expected. Thanks.
>
> Thanks for the confirmation!
>
> Please also verify the final version of the patch available from
>
> https://patchwork.kernel.org/patch/11537215/
>
> Of course, it will only make a difference if the ec_no_wakeup switch is set
> on your system (either as a result of blacklisting or via the kernel command
> line).
>
> Thanks!
>
>
>

Thanks. Rafael. I've tested it on my laptop and it's still working well.

Chris

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: System fails to exit s2idle by a keystroke on my laptop
  2020-05-11  6:54             ` Chris Chiu
@ 2020-05-11  8:10               ` Rafael J. Wysocki
  0 siblings, 0 replies; 9+ messages in thread
From: Rafael J. Wysocki @ 2020-05-11  8:10 UTC (permalink / raw)
  To: Chris Chiu
  Cc: Rafael J. Wysocki, Rafael J. Wysocki, Seth Forshee, Len Brown,
	ACPI Devel Maling List, Linux Kernel, Linux Upstreaming Team

On Mon, May 11, 2020 at 8:54 AM Chris Chiu <chiu@endlessm.com> wrote:
>
> On Sat, May 9, 2020 at 12:50 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> >
> > On Friday, May 8, 2020 10:22:09 AM CEST Chris Chiu wrote:
> > > On Fri, May 8, 2020 at 2:05 AM Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> > >
> > > Hi Rafael,
> > >     Thanks for your patch. I tried it on my laptop and it's also
> > > working fine. Wake up by keystroke/power button/lid open all work as
> > > expected. Thanks.
> >
> > Thanks for the confirmation!
> >
> > Please also verify the final version of the patch available from
> >
> > https://patchwork.kernel.org/patch/11537215/
> >
> > Of course, it will only make a difference if the ec_no_wakeup switch is set
> > on your system (either as a result of blacklisting or via the kernel command
> > line).
> >
> > Thanks!
> >
> >
> >
>
> Thanks. Rafael. I've tested it on my laptop and it's still working well.

Thanks!

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-05-11  8:10 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-04 17:09 System fails to exit s2idle by a keystroke on my laptop Chris Chiu
2020-05-06  9:32 ` Rafael J. Wysocki
2020-05-06 10:19   ` Rafael J. Wysocki
2020-05-07  3:38     ` Chris Chiu
2020-05-07 18:05       ` Rafael J. Wysocki
2020-05-08  8:22         ` Chris Chiu
2020-05-08 16:50           ` Rafael J. Wysocki
2020-05-11  6:54             ` Chris Chiu
2020-05-11  8:10               ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).