Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v3 0/8] PM / ACPI: sleep: Additional changes related to
 suspend-to-idle
To:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc:     Linux ACPI <linux-acpi@vger.kernel.org>,
        Linux PM <linux-pm@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Zhang Rui <rui.zhang@intel.com>,
        Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Mario Limonciello <mario.limonciello@dell.com>,
        Kai-Heng Feng <kai.heng.feng@canonical.com>
References: <5997740.FPbUVk04hV@kreacher>
 <cfe7952f-b80f-8c92-af1a-3adeffb22ce7@klausen.dk>
 <CAJZ5v0hGYpvyo_8qZTkVUuSHZxogksjvHJgWD54yRbPiJRVodQ@mail.gmail.com>
 <5499590.X6jXHfmChQ@kreacher>
From:   Kristian Klausen <kristian@klausen.dk>
Message-ID: <5924084c-cd89-c213-5926-9f303dcd3b39@klausen.dk>
Date:   Wed, 21 Aug 2019 00:47:32 +0200
MIME-Version: 1.0
In-Reply-To: <5499590.X6jXHfmChQ@kreacher>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 20.08.2019 23.38, Rafael J. Wysocki wrote:
> On Tuesday, August 20, 2019 3:29:48 PM CEST Rafael J. Wysocki wrote:
>> On Tue, Aug 20, 2019 at 3:10 PM Kristian Klausen <kristian@klausen.dk> wrote:
>>> On 19.08.2019 22.41, Rafael J. Wysocki wrote:
>>>> On Mon, Aug 19, 2019 at 5:47 PM Kristian Klausen <kristian@klausen.dk> wrote:
>>>>> On 19.08.2019 11.05, Rafael J. Wysocki wrote:
>>>>>> On Monday, August 19, 2019 9:59:02 AM CEST Rafael J. Wysocki wrote:
>>>>>>> On Fri, Aug 16, 2019 at 10:26 PM Kristian Klausen <kristian@klausen.dk> wrote:
>>>>>>>> On 02.08.2019 12.33, Rafael J. Wysocki wrote:
>>>>>>>>> Hi All,
>>>>>>>>>
>>>>>>>>>>> On top of the "Simplify the suspend-to-idle control flow" patch series
>>>>>>>>>>> posted previously:
>>>>>>>>>>>
>>>>>>>>>>> https://lore.kernel.org/lkml/71085220.z6FKkvYQPX@kreacher/
>>>>>>>>>>>
>>>>>>>>>>> sanitize the suspend-to-idle flow even further.
>>>>>>>>>>>
>>>>>>>>>>> First off, decouple EC wakeup from the LPS0 _DSM processing (patch 1).
>>>>>>>>>>>
>>>>>>>>>>> Next, reorder the code to invoke LPS0 _DSM Functions 5 and 6 in the
>>>>>>>>>>> specification-compliant order with respect to suspending and resuming
>>>>>>>>>>> devices (patch 2).
>>>>>>>>>>>
>>>>>>>>>>> Finally, rearrange lps0_device_attach() (patch 3) and add a command line
>>>>>>>>>>> switch to prevent the LPS0 _DSM from being used.
>>>>>>>>>> The v2 is because I found a (minor) bug in patch 1, decided to use a module
>>>>>>>>>> parameter instead of a kernel command line option in patch 4.  Also, there
>>>>>>>>>> are 4 new patches:
>>>>>>>>>>
>>>>>>>>>> Patch 5: Switch the EC over to polling during "noirq" suspend and back
>>>>>>>>>> during "noirq" resume.
>>>>>>>>>>
>>>>>>>>>> Patch 6: Eliminate acpi_sleep_no_ec_events().
>>>>>>>>>>
>>>>>>>>>> Patch 7: Consolidate some EC code depending on PM_SLEEP.
>>>>>>>>>>
>>>>>>>>>> Patch 8: Add EC GPE dispatching debug message.
>>>>>>>>> The v3 is just a rearranged v2 so as to move the post sensitive patch (previous patch 2)
>>>>>>>>> to the end of the series.   [After applying the full series the code is the same as before.]
>>>>>>>>>
>>>>>>>>> For easier testing, the series (along with some previous patches depended on by it)
>>>>>>>>> is available in the pm-s2idle-testing branch of the linux-pm.git tree at kernel.org:
>>>>>>>>>
>>>>>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/log/?h=pm-s2idle-testing
>>>>>>>> It was just testing this patch series(461fc1caed55), to see if it would
>>>>>>>> fix my charging issue
>>>>>>>> (https://bugzilla.kernel.org/show_bug.cgi?id=201307), which it didn't.
>>>>>>> It is unlikely to help in that case.
>>>>> Do you have any idea what the issue could be?
>>>> Basically, there are two possibilities: either the OS is expected to
>>>> handle the AC/battery switching events, or the platform firmware
>>>> should take care of them.  In the former case, the EC should generate
>>>> events to be handled by the OS and in the latter one there needs to be
>>>> a way to let the platform firmware that it needs to take care of those
>>>> events going forward.
>>>>
>>>> In either case there may be a platform-specific action to be carried
>>>> out during suspend and resume to set this up as expected which may be
>>>> missing.
>>> Thanks for the explanation. I don't think I have the expertise to solve
>>> the issue, but at least now I'm one step closer.
>>>>>>>> I did however notice that my laptop (ASUS Zenbook UX430UNR/i7-8550U)
>>>>>>>> won't wake when opening the lid or pressing a key, the only way to wake
>>>>>>>> the laptop is pressing the power button.
>>>>>>>>
>>>>>>>> I also tested mainline (5.3.0-rc4 b7e7c85dc7b0) and 5.2.8 and the laptop
>>>>>>>> wakes without issue when the lid is opened or a key is presed.
>>>>>>>>> Please refer to the changelogs for details.
>>>>>>> Thanks for your report.
>>>>>>>
>>>>>>> I seem to see a similar issue with respect to the lid on one of my
>>>>>>> test machines, looking into it right now.
>>>>>> Well, my lid issue seems to be unrelated as it doesn't result from any patches in the
>>>>>> series in question.
>>>>>>
>>>>>> First off, please clone 5.3-rc5 from kernel.org and double check if the issue is not
>>>>>> present in that one.
>>>>>>
>>>>>> If that's not the case, merge the pm-s2idle-rework branch from my tree on top of it
>>>>>> and retest.
>>>>>>
>>>>>> If you still see the issue then, apply the appended patch (on top of the pm-s2idle-reqork
>>>>>> branch ) and, after starting the kernel, do
>>>>>>
>>>>>> # echo 1 > /sys/power/pm_debug_messages
>>>>>>
>>>>>> suspend the system and try to wake it up through all of the ways that stopped working.
>>>>>>
>>>>>> Then, wake it up with the power button, save the output of dmesg and send it to me.
>>>>>>
>>>>>> Thanks!
>>>>> With 5.3-rc5 the laptops wakes up without any issue when pressing a key
>>>>> or opening the lid.
>>>>> With v5.3-rc5+pm-s2idle-testing I can only wake the laptop by pressing
>>>>> the power button.
>>>> OK, thanks for verifying.
>>>>
>>>> So it is unclear to me how the series can cause an issue like that to appear.
>>>>
>>>>> dmesg with pm_debug_messages=1 and your patch:
>>>>> [   55.646109] PM: suspend entry (s2idle)
>>>>> [   55.698559] Filesystems sync: 0.052 seconds
>>>>> [   55.698561] PM: Preparing system for sleep (s2idle)
>>>>> [   55.700661] Freezing user space processes ... (elapsed 0.210 seconds)
>>>>> done.
>>>>> [   55.911494] OOM killer disabled.
>>>>> [   55.911495] Freezing remaining freezable tasks ... (elapsed 0.001
>>>>> seconds) done.
>>>>> [   55.913192] PM: Suspending system (s2idle)
>>>>> [   55.913195] printk: Suspending console(s) (use no_console_suspend to
>>>>> debug)
>>>>> [   55.914778] [drm] CT: disabled
>>>>> [   55.916057] wlan0: deauthenticating from 64:70:02:a5:fd:02 by local
>>>>> choice (Reason: 3=DEAUTH_LEAVING)
>>>>> [   56.045634] sd 2:0:0:0: [sda] Synchronizing SCSI cache
>>>>> [   56.046650] sd 2:0:0:0: [sda] Stopping disk
>>>>> [   56.287622] PM: suspend of devices complete after 371.285 msecs
>>>>> [   56.287627] PM: start suspend of devices complete after 373.684 msecs
>>>>> [   56.307155] PM: late suspend of devices complete after 19.477 msecs
>>>>> [   56.312479] ACPI: EC: interrupt blocked
>>>>> [   56.352761] PM: noirq suspend of devices complete after 45.205 msecs
>>>>> [   56.352770] ACPI: \_PR_.PR00: LPI: Device not power manageable
>>>>> [   56.352774] ACPI: \_PR_.PR01: LPI: Device not power manageable
>>>>> [   56.352776] ACPI: \_PR_.PR02: LPI: Device not power manageable
>>>>> [   56.352779] ACPI: \_PR_.PR03: LPI: Device not power manageable
>>>>> [   56.352782] ACPI: \_PR_.PR04: LPI: Device not power manageable
>>>>> [   56.352785] ACPI: \_PR_.PR05: LPI: Device not power manageable
>>>>> [   56.352788] ACPI: \_PR_.PR06: LPI: Device not power manageable
>>>>> [   56.352790] ACPI: \_PR_.PR07: LPI: Device not power manageable
>>>>> [   56.352793] ACPI: \_SB_.PCI0.GFX0: LPI: Device not power manageable
>>>>> [   56.352800] ACPI: \_SB_.PCI0.RP06.PXSX: LPI: Device not power manageable
>>>>> [   56.357057] PM: suspend-to-idle
>>>>> [   69.338656] PM: Timekeeping suspended for 12.178 seconds
>>>>> [   69.338701] PM: irq_pm_check_wakeup: IRQ 9
>>>>> [   69.338704] PM: IRQ wakeup: IRQ 9
>>>> This clearly is the power button event causing the system to wake up.
>>>> The other actions, whatever they were, didn't cause any interrupts to
>>>> be triggered.
>>>>
>>>> I suspect that the issue is related to the EC, so please try to revert commit
>>>>
>>>> fcd0a04267ac ACPI: PM: s2idle: Switch EC over to polling during "noirq" suspend
>>>>
>>>> and see if that makes any difference (should revert cleanly).
>>>>
>>>> If that doesn't make any difference, please also try to revert commits
>>>> (on top of the above revert)
>>>>
>>>> 11f26633cccb PM: suspend: Fix platform_suspend_prepare_noirq()
>>>> ac9eafbe930a ACPI: PM: s2idle: Execute LPS0 _DSM functions with
>>>> suspended devices
>>>>
>>>> (in this order) and retest.
>>> Reverting the following commits, didn't fix the issue:
>>> fcd0a04267ac ACPI: PM: s2idle: Switch EC over to polling during "noirq"
>>> suspend
>>> 6e86633a791f ACPI: PM: s2idle: Eliminate acpi_sleep_no_ec_events()
>>> 11f26633cccb PM: suspend: Fix platform_suspend_prepare_noirq()
>>> ac9eafbe930a ACPI: PM: s2idle: Execute LPS0 _DSM functions with
>>> suspended devices
>>>
>>> I didn't bother reverting all the commits, so I did a checkout of:
>>> b605c44c30b5 PM: sleep: Drop dpm_noirq_begin() and dpm_noirq_end()
>>> and everything works, then I did a checkout of:
>>> 10a08fd65ec1 ACPI: PM: Set up EC GPE for system wakeup from drivers that
>>> need it
>>> and the laptop won't wake when opening the lid or pressing a key.
>>>
>>> So 10a08fd65ec1 must be the culprit.
>> Good job, thanks!
>>
>> The assumption in there was that the EC GPE would not need to be set
>> up for wakeup unless it is needed either by the intel-hid or by the
>> intel-vbtn driver.  On your platform it needs to be set up for wakeup
>> even though neither of these drivers is in use.
>>
>> Let me cut a fix patch and get back to you when it's ready.
> The appended patch should help, so please apply it (on top of
> v5.3-rc5+pm-s2idle-testing) and test.
It works, pressing a key or opening the lid the laptop wakes instantly.
Thanks!
>
> ---
>   drivers/acpi/ec.c                 |    1 -
>   drivers/acpi/sleep.c              |   15 +++++++++++++--
>   drivers/platform/x86/intel-hid.c  |    5 +----
>   drivers/platform/x86/intel-vbtn.c |    5 +----
>   4 files changed, 15 insertions(+), 11 deletions(-)
>
> Index: linux-pm/drivers/acpi/sleep.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/sleep.c
> +++ linux-pm/drivers/acpi/sleep.c
> @@ -938,6 +938,13 @@ static int lps0_device_attach(struct acp
>   	if (mem_sleep_default > PM_SUSPEND_MEM && !acpi_sleep_default_s3)
>   		mem_sleep_current = PM_SUSPEND_TO_IDLE;
>   
> +	/*
> +	 * Some LPS0 systems, like ASUS Zenbook UX430UNR/i7-8550U, require the
> +	 * EC GPE to be enabled while suspended for certain wakeup devices to
> +	 * work, so mark it as wakeup-capable.
> +	 */
> +	acpi_ec_mark_gpe_for_wake();
> +
>   	return 0;
>   }
>   
> @@ -954,8 +961,10 @@ static int acpi_s2idle_begin(void)
>   
>   static int acpi_s2idle_prepare(void)
>   {
> -	if (acpi_sci_irq_valid())
> +	if (acpi_sci_irq_valid()) {
>   		enable_irq_wake(acpi_sci_irq);
> +		acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
> +	}
>   
>   	acpi_enable_wakeup_devices(ACPI_STATE_S0);
>   
> @@ -1034,8 +1043,10 @@ static void acpi_s2idle_restore(void)
>   
>   	acpi_disable_wakeup_devices(ACPI_STATE_S0);
>   
> -	if (acpi_sci_irq_valid())
> +	if (acpi_sci_irq_valid()) {
> +		acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
>   		disable_irq_wake(acpi_sci_irq);
> +	}
>   }
>   
>   static void acpi_s2idle_end(void)
> Index: linux-pm/drivers/platform/x86/intel-hid.c
> ===================================================================
> --- linux-pm.orig/drivers/platform/x86/intel-hid.c
> +++ linux-pm/drivers/platform/x86/intel-hid.c
> @@ -257,7 +257,6 @@ static int intel_hid_pm_prepare(struct d
>   		struct intel_hid_priv *priv = dev_get_drvdata(device);
>   
>   		priv->wakeup_mode = true;
> -		acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
>   	}
>   	return 0;
>   }
> @@ -266,10 +265,8 @@ static void intel_hid_pm_complete(struct
>   {
>   	struct intel_hid_priv *priv = dev_get_drvdata(device);
>   
> -	if (priv->wakeup_mode) {
> -		acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
> +	if (priv->wakeup_mode)
>   		priv->wakeup_mode = false;
> -	}
>   }
>   
>   static int intel_hid_pl_suspend_handler(struct device *device)
> Index: linux-pm/drivers/platform/x86/intel-vbtn.c
> ===================================================================
> --- linux-pm.orig/drivers/platform/x86/intel-vbtn.c
> +++ linux-pm/drivers/platform/x86/intel-vbtn.c
> @@ -205,7 +205,6 @@ static int intel_vbtn_pm_prepare(struct
>   		struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
>   
>   		priv->wakeup_mode = true;
> -		acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
>   	}
>   	return 0;
>   }
> @@ -214,10 +213,8 @@ static void intel_vbtn_pm_complete(struc
>   {
>   	struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
>   
> -	if (priv->wakeup_mode) {
> -		acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
> +	if (priv->wakeup_mode)
>   		priv->wakeup_mode = false;
> -	}
>   }
>   
>   static int intel_vbtn_pm_resume(struct device *dev)
> Index: linux-pm/drivers/acpi/ec.c
> ===================================================================
> --- linux-pm.orig/drivers/acpi/ec.c
> +++ linux-pm/drivers/acpi/ec.c
> @@ -1970,7 +1970,6 @@ void acpi_ec_set_gpe_wake_mask(u8 action
>   	if (pm_suspend_no_platform() && first_ec && !ec_no_wakeup)
>   		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);
>   }
> -EXPORT_SYMBOL_GPL(acpi_ec_set_gpe_wake_mask);
>   
>   bool acpi_ec_dispatch_gpe(void)
>   {
>
>
>