[SRU][B/OEM][PATCH 0/1] Fix boot hang on ThinkPad 11e 3rd

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[SRU][B/OEM][PATCH 0/1] Fix boot hang on ThinkPad 11e 3rd

Aaron Ma
BugLink: https://bugs.launchpad.net/bugs/1804604

[Impact]
ThinkPad 11e 3rd boot hang in systemd loading.

[Fix]
When boot case acpi_lpss_resume() get called without a
corresponding acpi_lpss_suspend() having been called.
Thus force setting the flag during boot.

[Test Case]
Tested on Thinkpad 11e 3rd.
Booting successfully.

[Regression Potential]
Low, upstream fix cherry-picked.

Cosmic already got this fix on 4.18.0-9.10.

Zhang Rui (1):
  ACPI / LPSS: Force LPSS quirks on boot

 drivers/acpi/acpi_lpss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/1] ACPI / LPSS: Force LPSS quirks on boot

Aaron Ma
From: Zhang Rui <[hidden email]>

BugLink: https://bugs.launchpad.net/bugs/1804604

Commit 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume
from hibernation) bypasses lpss quirks for S3 and S4, by setting a flag
for S3/S4 in acpi_lpss_suspend(), and check that flag in
acpi_lpss_resume().

But this overlooks the boot case where acpi_lpss_resume() may get called
without a corresponding acpi_lpss_suspend() having been called.

Thus force setting the flag during boot.

Fixes: 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation)
Link: https://bugzilla.kernel.org/show_bug.cgi?id=200989
Reported-and-tested-by: William Lieurance <[hidden email]>
Signed-off-by: Zhang Rui <[hidden email]>
Cc: 4.15+ <[hidden email]> # 4.15+: 12864ff8545f (ACPI / LPSS: Avoid ...)
Signed-off-by: Rafael J. Wysocki <[hidden email]>
(cherry picked from commit f11fc4bc669b8622510c1039499f5a9d24248fec)
Signed-off-by: Aaron Ma <[hidden email]>
---
 drivers/acpi/acpi_lpss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 8e37c2317e27..08b2ceb68066 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -736,7 +736,7 @@ static void acpi_lpss_dismiss(struct device *dev)
 #define LPSS_GPIODEF0_DMA_LLP BIT(13)
 
 static DEFINE_MUTEX(lpss_iosf_mutex);
-static bool lpss_iosf_d3_entered;
+static bool lpss_iosf_d3_entered = true;
 
 static void lpss_iosf_enter_d3_state(void)
 {
--
2.17.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH 1/1] ACPI / LPSS: Force LPSS quirks on boot

Khaled Elmously
On 2018-11-22 16:18:07 , Aaron Ma wrote:

> From: Zhang Rui <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1804604
>
> Commit 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume
> from hibernation) bypasses lpss quirks for S3 and S4, by setting a flag
> for S3/S4 in acpi_lpss_suspend(), and check that flag in
> acpi_lpss_resume().
>
> But this overlooks the boot case where acpi_lpss_resume() may get called
> without a corresponding acpi_lpss_suspend() having been called.
>
> Thus force setting the flag during boot.
>
> Fixes: 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation)
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=200989
> Reported-and-tested-by: William Lieurance <[hidden email]>
> Signed-off-by: Zhang Rui <[hidden email]>
> Cc: 4.15+ <[hidden email]> # 4.15+: 12864ff8545f (ACPI / LPSS: Avoid ...)
> Signed-off-by: Rafael J. Wysocki <[hidden email]>
> (cherry picked from commit f11fc4bc669b8622510c1039499f5a9d24248fec)
> Signed-off-by: Aaron Ma <[hidden email]>
> ---
>  drivers/acpi/acpi_lpss.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 8e37c2317e27..08b2ceb68066 100644
> --- a/drivers/acpi/acpi_lpss.c
> +++ b/drivers/acpi/acpi_lpss.c
> @@ -736,7 +736,7 @@ static void acpi_lpss_dismiss(struct device *dev)
>  #define LPSS_GPIODEF0_DMA_LLP BIT(13)
>  
>  static DEFINE_MUTEX(lpss_iosf_mutex);
> -static bool lpss_iosf_d3_entered;
> +static bool lpss_iosf_d3_entered = true;
>  
>  static void lpss_iosf_enter_d3_state(void)
>  {

Acked-by: Khalid Elmously <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH 1/1] ACPI / LPSS: Force LPSS quirks on boot

Anthony Wong-2
In reply to this post by Aaron Ma
On Thu, Nov 22, 2018 at 04:18:07PM +0800, Aaron Ma wrote:

> From: Zhang Rui <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1804604
>
> Commit 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume
> from hibernation) bypasses lpss quirks for S3 and S4, by setting a flag
> for S3/S4 in acpi_lpss_suspend(), and check that flag in
> acpi_lpss_resume().
>
> But this overlooks the boot case where acpi_lpss_resume() may get called
> without a corresponding acpi_lpss_suspend() having been called.
>
> Thus force setting the flag during boot.
>
> Fixes: 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation)
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=200989
> Reported-and-tested-by: William Lieurance <[hidden email]>
> Signed-off-by: Zhang Rui <[hidden email]>
> Cc: 4.15+ <[hidden email]> # 4.15+: 12864ff8545f (ACPI / LPSS: Avoid ...)
> Signed-off-by: Rafael J. Wysocki <[hidden email]>
> (cherry picked from commit f11fc4bc669b8622510c1039499f5a9d24248fec)
> Signed-off-by: Aaron Ma <[hidden email]>
> ---
>  drivers/acpi/acpi_lpss.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 8e37c2317e27..08b2ceb68066 100644
> --- a/drivers/acpi/acpi_lpss.c
> +++ b/drivers/acpi/acpi_lpss.c
> @@ -736,7 +736,7 @@ static void acpi_lpss_dismiss(struct device *dev)
>  #define LPSS_GPIODEF0_DMA_LLP BIT(13)
>  
>  static DEFINE_MUTEX(lpss_iosf_mutex);
> -static bool lpss_iosf_d3_entered;
> +static bool lpss_iosf_d3_entered = true;
>  
>  static void lpss_iosf_enter_d3_state(void)
>  {
> --
> 2.17.1

Acked-by: Anthony Wong <[hidden email]>


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED[OEM-B]: [SRU][B/OEM][PATCH 0/1] Fix boot hang on ThinkPad 11e 3rd

AceLan Kao
In reply to this post by Aaron Ma
Applied on oem kernel 4.15.0-1029.34

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [SRU][B/OEM][PATCH 0/1] Fix boot hang on ThinkPad 11e 3rd

Aaron Ma
In reply to this post by Aaron Ma
Hi Kleber:

This SRU is missed, could you apply it to Bionic?

Regards,
Aaron

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [SRU][B/OEM][PATCH 0/1] Fix boot hang on ThinkPad 11e 3rd

Kleber Souza
On 1/22/19 10:39 AM, Aaron Ma wrote:
> Hi Kleber:
>
> This SRU is missed, could you apply it to Bionic?
>
> Regards,
> Aaron

Hi Aaron,

Sorry about that. We failed to spot that "B/OEM" were meant for
bionic/linux and bionic/linux-oem.

I will add it to my list of patches to be applied for the next SRU
cycle. I will not apply it now though since we are still in the
beginning of this cycle, so better keep the branch clean in case we need
to re-spin.


Thanks,
Kleber



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED[B]: [PATCH 1/1] ACPI / LPSS: Force LPSS quirks on boot

Stefan Bader-2
In reply to this post by Aaron Ma
On 22.11.18 09:18, Aaron Ma wrote:

> From: Zhang Rui <[hidden email]>
>
> BugLink: https://bugs.launchpad.net/bugs/1804604
>
> Commit 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume
> from hibernation) bypasses lpss quirks for S3 and S4, by setting a flag
> for S3/S4 in acpi_lpss_suspend(), and check that flag in
> acpi_lpss_resume().
>
> But this overlooks the boot case where acpi_lpss_resume() may get called
> without a corresponding acpi_lpss_suspend() having been called.
>
> Thus force setting the flag during boot.
>
> Fixes: 12864ff8545f (ACPI / LPSS: Avoid PM quirks on suspend and resume from hibernation)
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=200989
> Reported-and-tested-by: William Lieurance <[hidden email]>
> Signed-off-by: Zhang Rui <[hidden email]>
> Cc: 4.15+ <[hidden email]> # 4.15+: 12864ff8545f (ACPI / LPSS: Avoid ...)
> Signed-off-by: Rafael J. Wysocki <[hidden email]>
> (cherry picked from commit f11fc4bc669b8622510c1039499f5a9d24248fec)
> Signed-off-by: Aaron Ma <[hidden email]>
> ---
>  drivers/acpi/acpi_lpss.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
> index 8e37c2317e27..08b2ceb68066 100644
> --- a/drivers/acpi/acpi_lpss.c
> +++ b/drivers/acpi/acpi_lpss.c
> @@ -736,7 +736,7 @@ static void acpi_lpss_dismiss(struct device *dev)
>  #define LPSS_GPIODEF0_DMA_LLP BIT(13)
>  
>  static DEFINE_MUTEX(lpss_iosf_mutex);
> -static bool lpss_iosf_d3_entered;
> +static bool lpss_iosf_d3_entered = true;
>  
>  static void lpss_iosf_enter_d3_state(void)
>  {
>
Applied to bionic/master-next. Thanks.

-Stefan


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team

signature.asc (849 bytes) Download Attachment