Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <CAB4CAwdqo7=MvyG_PE+PGVfeA17AHF5i5JucgaKqqMX6mjArbQ@mail.gmail.com>
In-Reply-To: <CAB4CAwdqo7=MvyG_PE+PGVfeA17AHF5i5JucgaKqqMX6mjArbQ@mail.gmail.com>
From:   "Rafael J. Wysocki" <rafael@kernel.org>
Date:   Wed, 6 May 2020 11:32:07 +0200
Message-ID: <CAJZ5v0gZH61ui04Howzif-_Xc3-X9GyAx7FgZ=ZS2X=4KotEng@mail.gmail.com>
Subject: Re: System fails to exit s2idle by a keystroke on my laptop
To:     Chris Chiu <chiu@endlessm.com>
Cc:     "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        seth.forshee@canonical.com, Len Brown <lenb@kernel.org>,
        ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
        Linux Kernel <linux-kernel@vger.kernel.org>,
        Linux Upstreaming Team <linux@endlessm.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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
>