Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'acpi-6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"Add checks missed by a previous recent update to the ACPI
suspend-to-idle code and add a debug module parameter to it
to work around a platform firmware issue exposed by that
update (Rafael Wysocki)"
* tag 'acpi-6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: PM: s2idle: Add module parameter for LPS0 constraints checking
ACPI: PM: s2idle: Add missing checks to acpi_s2idle_begin_lps0()
+7
-2
+7
-2
drivers/acpi/x86/s2idle.c
+7
-2
drivers/acpi/x86/s2idle.c
···
28
28
module_param(sleep_no_lps0, bool, 0644);
29
29
MODULE_PARM_DESC(sleep_no_lps0, "Do not use the special LPS0 device interface");
30
30
31
+
static bool check_lps0_constraints __read_mostly;
32
+
module_param(check_lps0_constraints, bool, 0644);
33
+
MODULE_PARM_DESC(check_lps0_constraints, "Check LPS0 device constraints");
34
+
31
35
static const struct acpi_device_id lps0_device_ids[] = {
32
36
{"PNP0D80", },
33
37
{"", },
···
519
515
520
516
static int acpi_s2idle_begin_lps0(void)
521
517
{
522
-
if (pm_debug_messages_on && !lpi_constraints_table) {
518
+
if (lps0_device_handle && !sleep_no_lps0 && check_lps0_constraints &&
519
+
!lpi_constraints_table) {
523
520
if (acpi_s2idle_vendor_amd())
524
521
lpi_device_get_constraints_amd();
525
522
else
···
544
539
if (!lps0_device_handle || sleep_no_lps0)
545
540
return 0;
546
541
547
-
if (pm_debug_messages_on)
542
+
if (check_lps0_constraints)
548
543
lpi_check_constraints();
549
544
550
545
/* Screen off */