ACPI: PM: s2idle: Evaluate all Low-Power S0 Idle _DSM functions
PATCH 1/1 ACPI: PM: s2idle: Evaluate all Low-Power S0 Idle _DSM functions
From: Rafael J. Wysocki <[email protected]>
Commit 073237281a50 ("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems") attempted to avoid evaluating the same Low- Power S0 Idle _DSM functions for different UUIDs, but that turns out to be a mistake, because some systems in the field are adversely affected by it.
Address this by allowing all Low-Power S0 Idle _DSM functions to be evaluated, but still print the message regarding duplication of Low- Power S0 Idle _DSM function sets for different UUIDs.
--- drivers/acpi/x86/s2idle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/acpi/x86/s2idle.c +3 -5
@@ -492,16 +492,14 @@ static int lps0_device_attach(struct acpunsigned int func_mask;/* -* Avoid evaluating the same _DSM function for two -* different UUIDs and prioritize the MSFT one. +* Log a message if the _DSM function sets for two +* different UUIDs overlap. */ func_mask = lps0_dsm_func_mask & lps0_dsm_func_mask_microsoft; -if (func_mask) { +if (func_mask)acpi_handle_info (adev->handle,"Duplicate LPS0 _DSM functions (mask: 0x%x)\n" , func_mask); - lps0_dsm_func_mask &= ~func_mask; - } } }
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
073237281a50("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems") attempted to avoid evaluating the same Low- Power S0 Idle_DSMfunctions for different UUIDs, but that turns out to be a mistake, because some systems in the field are adversely affected by it.
Quoted 8 lines
Address this by allowing all Low-Power S0 Idle
_DSMfunctions to be evaluated, but still print the message regarding duplication of Low- Power S0 Idle_DSMfunction sets for different UUIDs.Fixes 073237281a50 ("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems")Reported-and-tested-by Mark Pearson <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Ah glad to hear that my idea worked. FWIW we saw the same type of issue on some AMD systems when we first introduced the MSFT UUID.
Quoted 31 lines
--- drivers/acpi/x86/s2idle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)Index:
linux-pm/drivers/acpi/x86/s2idle.c
===================================================================drivers/acpi/x86/s2idle.c +3
-5@@ -492,16 +492,14 @@ static int lps0_device_attach(struct acpunsigned int func_mask;/* -* Avoid evaluating the same _DSM function for two -* different UUIDs and prioritize the MSFT one. +* Log a message if the _DSM function sets for two +* different UUIDs overlap. */ func_mask = lps0_dsm_func_mask & lps0_dsm_func_mask_microsoft; -if (func_mask) { +if (func_mask)acpi_handle_info (adev->handle,"Duplicate LPS0 _DSM functions (mask: 0x%x)\n" , func_mask); - lps0_dsm_func_mask &= ~func_mask; - } } }
Rafael J. Wysocki
maintainerQuoted 14 lines · Mario Limonciello
Quoted 12 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
073237281a50("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems") attempted to avoid evaluating the same Low- Power S0 Idle_DSMfunctions for different UUIDs, but that turns out to be a mistake, because some systems in the field are adversely affected by it.Address this by allowing all Low-Power S0 Idle
_DSMfunctions to be evaluated, but still print the message regarding duplication of Low- Power S0 Idle_DSMfunction sets for different UUIDs.
Quoted 6 lines
Quoted 4 lines
Fixes 073237281a50 ("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems")Reported-and-tested-by Mark Pearson <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>Ah glad to hear that my idea worked.
We've arrived at the same solution independently, I've only looked at the BZ when the patch was ready to send.
Quoted 4 lines
FWIW we saw the same type of issue
on some AMD systems when we first introduced the MSFT UUID.Suggested-by Mario Limonciello <[email protected]>
But sure.
Quoted 1 line
Reviewed-by Mario Limonciello <[email protected]>
Thanks!
Quoted 32 lines
Quoted 31 lines
--- drivers/acpi/x86/s2idle.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)Index:
linux-pm/drivers/acpi/x86/s2idle.c
===================================================================drivers/acpi/x86/s2idle.c +3
-5@@ -492,16 +492,14 @@ static int lps0_device_attach(struct acpunsigned int func_mask;/* -* Avoid evaluating the same _DSM function for two -* different UUIDs and prioritize the MSFT one. +* Log a message if the _DSM function sets for two +* different UUIDs overlap. */ func_mask = lps0_dsm_func_mask & lps0_dsm_func_mask_microsoft; -if (func_mask) { +if (func_mask)acpi_handle_info (adev->handle,"Duplicate LPS0 _DSM functions (mask: 0x%x)\n" , func_mask); - lps0_dsm_func_mask &= ~func_mask; - } } }
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
073237281a50("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems") attempted to avoid evaluating the same Low- Power S0 Idle_DSMfunctions for different UUIDs, but that turns out to be a mistake, because some systems in the field are adversely affected by it.
Quoted 8 lines
Address this by allowing all Low-Power S0 Idle
_DSMfunctions to be evaluated, but still print the message regarding duplication of Low- Power S0 Idle_DSMfunction sets for different UUIDs.Fixes 073237281a50 ("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems")Reported-and-tested-by Mark Pearson <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
FYI, I can confirm that this fixes the regression on my Thinkpad P1 Gen 6.