Skip to content

Commit 68301ef

Browse files
committed
ACPI: PM: s2idle: Evaluate all Low-Power S0 Idle _DSM functions
Commit 0732372 ("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. Fixes: 0732372 ("ACPI: PM: s2idle: Enable Low-Power S0 Idle MSFT UUID for non-AMD systems") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218750 Reported-and-tested-by: Mark Pearson <[email protected]> Suggested-by: Mario Limonciello <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Reviewed-by: Mario Limonciello <[email protected]>
1 parent ed30a4a commit 68301ef

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/acpi/x86/s2idle.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,16 +492,14 @@ static int lps0_device_attach(struct acpi_device *adev,
492492
unsigned int func_mask;
493493

494494
/*
495-
* Avoid evaluating the same _DSM function for two
496-
* different UUIDs and prioritize the MSFT one.
495+
* Log a message if the _DSM function sets for two
496+
* different UUIDs overlap.
497497
*/
498498
func_mask = lps0_dsm_func_mask & lps0_dsm_func_mask_microsoft;
499-
if (func_mask) {
499+
if (func_mask)
500500
acpi_handle_info(adev->handle,
501501
"Duplicate LPS0 _DSM functions (mask: 0x%x)\n",
502502
func_mask);
503-
lps0_dsm_func_mask &= ~func_mask;
504-
}
505503
}
506504
}
507505

0 commit comments

Comments
 (0)