Skip to contentSkip to conversation

ACPI: PM: s2idle: Use LPS0 idle if ACPI_FADT_LOW_POWER_S0 is unset

PATCH In review Rafael J. Wysocki 2 participants 2 messages Jul 13, 2022 ACPI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ACPI: PM: s2idle: Use LPS0 idle if ACPI_FADT_LOW_POWER_S0 is unset

From: Rafael J. Wysocki <[email protected]>

If the PNP0D80 device is present and its _DSM appears to be valid, there is no reason to avoid using it even if ACPI_FADT_LOW_POWER_S0 is unset in the FADT, because suspend-to-idle may be the only way to suspend the system if S3 is not supported by the platform, so do not return early from lps0_device_attach() in that case.

However, still check ACPI_FADT_LOW_POWER_S0 when deciding whether or not suspend-to-idle should be the default system suspend method.

---
 drivers/acpi/x86/s2idle.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/acpi/x86/s2idle.c +5 -6
Index: linux-pm/drivers/acpi/x86/s2idle.c
===================================================================
@@ -369,9 +369,6 @@ static int lps0_device_attach(struct acp
 	if (lps0_device_handle)
 		return 0;
 
-	if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
-		return 0;
-
 	if (acpi_s2idle_vendor_amd()) {
 		/* AMD0004, AMD0005, AMDI0005:
 		 * - Should use rev_id 0x0
@@ -421,10 +418,12 @@ static int lps0_device_attach(struct acp
 		lpi_device_get_constraints();
 
 	/*
-	 * Use suspend-to-idle by default if the default suspend mode was not
-	 * set from the command line.
+	 * Use suspend-to-idle by default if ACPI_FADT_LOW_POWER_S0 is set in
+	 * the FADT and the default suspend mode was not set from the command
+	 * line.
 	 */
-	if (mem_sleep_default > PM_SUSPEND_MEM && !acpi_sleep_default_s3)
+	if ((acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) &&
+	    mem_sleep_default > PM_SUSPEND_MEM && !acpi_sleep_default_s3)
 		mem_sleep_current = PM_SUSPEND_TO_IDLE;
 
 	/*
Reviewed-by on v1 1/1
#1 lore raw

[Public]

Quoted 19 lines

-----Original Message-----
From: Rafael J. Wysocki <[email protected]>
Sent: Wednesday, July 13, 2022 13:51
To: Linux ACPI <[email protected]>
Cc: LKML <[email protected]>; Linux PM <linux- [email protected]>; Srinivas Pandruvada <[email protected]>; Zhang Rui <[email protected]>; Limonciello, Mario <[email protected]>
Subject: [PATCH] ACPI: PM: s2idle: Use LPS0 idle if ACPI_FADT_LOW_POWER_S0 is unset

From: Rafael J. Wysocki <[email protected]>

If the PNP0D80 device is present and its _DSM appears to be valid, there is no reason to avoid using it even if ACPI_FADT_LOW_POWER_S0 is unset in the FADT, because suspend-to-idle may be the only way to suspend the system if S3 is not supported by the platform, so do not return early from lps0_device_attach() in that case.

Quoted 5 lines

However, still check ACPI_FADT_LOW_POWER_S0 when deciding whether or not suspend-to-idle should be the default system suspend method.

---

Quoted 41 lines
 drivers/acpi/x86/s2idle.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Index: linux-pm/drivers/acpi/x86/s2idle.c
==========================================================
=========

drivers/acpi/x86/s2idle.c +0 -4
@@ -369,9 +369,6 @@ static int lps0_device_attach(struct acp
 	if (lps0_device_handle)
 		return 0;
 
-	if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))
-		return 0;
-
 	if (acpi_s2idle_vendor_amd()) {
 		/* AMD0004, AMD0005, AMDI0005:
 		 * - Should use rev_id 0x0
@@ -421,10 +418,12 @@ static int lps0_device_attach(struct acp
 		lpi_device_get_constraints();
 
 	/*
-	 * Use suspend-to-idle by default if the default suspend mode was

not

drivers/acpi/x86/s2idle.c +1 -1
-	 * set from the command line.
+	 * Use suspend-to-idle by default if ACPI_FADT_LOW_POWER_S0 is

set in

drivers/acpi/x86/s2idle.c +1 -0
+	 * the FADT and the default suspend mode was not set from the

command

drivers/acpi/x86/s2idle.c +1 -1
+	 * line.
 	 */
-	if (mem_sleep_default > PM_SUSPEND_MEM &&

!acpi_sleep_default_s3)

drivers/acpi/x86/s2idle.c +2 -0
+	if ((acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) &&
+	    mem_sleep_default > PM_SUSPEND_MEM &&

!acpi_sleep_default_s3)

drivers/acpi/x86/s2idle.c +0 -0
 		mem_sleep_current = PM_SUSPEND_TO_IDLE;
 
 	/*