Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57044031 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI / PM: Make it possible to ignore the system sleep blacklist 



The ACPI code supporting system transitions to sleep states uses
an internal blacklist to apply special handling to some machines
reported to behave incorrectly in some ways.

However, some entries of that blacklist cover problematic as well as
non-problematic systems, so give the users of the latter a chance to
ignore the blacklist and run their systems in the default way by
adding acpi_sleep=nobl to the kernel command line.

For example, that allows the users of Dell XPS13 9360 systems not
affected by the issue that caused the blacklist entry for this
machine to be added by commit 71630b7a (ACPI / PM: Blacklist Low
Power S0 Idle _DSM for Dell XPS13 9360) to use suspend-to-idle with
the Low Power S0 Idle _DSM interface which in principle should be
more energy-efficient than S3 on them.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent db68daff

Documentation/admin-guide/kernel-parameters.txt

+4 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ 


	acpi_sleep=	[HW,ACPI] Sleep options

			Format: { s3_bios, s3_mode, s3_beep, s4_nohwsig,

				  old_ordering, nonvs, sci_force_enable }

				  old_ordering, nonvs, sci_force_enable, nobl }

			See Documentation/power/video.txt for information on

			s3_bios and s3_mode.

			s3_beep is for debugging; it makes the PC's speaker beep
@@ -239,6 +239,9 @@ 
			sci_force_enable causes the kernel to set SCI_EN directly

			on resume from S1/S3 (which is against the ACPI spec,

			but some broken systems don't work without it).

			nobl causes the internal blacklist of systems known to

			behave incorrectly in some ways with respect to system

			suspend and resume to be ignored (use wisely).



	acpi_use_timer_override [HW,ACPI]

			Use timer override. For some broken Nvidia NF5 boards

arch/x86/kernel/acpi/sleep.c

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ static int __init acpi_sleep_setup(char *str) 
			acpi_nvs_nosave_s3();

		if (strncmp(str, "old_ordering", 12) == 0)

			acpi_old_suspend_ordering();

		if (strncmp(str, "nobl", 4) == 0)

			acpi_sleep_no_blacklist();

		str = strchr(str, ',');

		if (str != NULL)

			str += strspn(str, ", \t");

drivers/acpi/sleep.c

+10 −0
Original line number Diff line number Diff line
@@ -367,10 +367,20 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { 
	{},

};



static bool ignore_blacklist;



void __init acpi_sleep_no_blacklist(void)

{

	ignore_blacklist = true;

}



static void __init acpi_sleep_dmi_check(void)

{

	int year;



	if (ignore_blacklist)

		return;



	if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) && year >= 2012)

		acpi_nvs_nosave_s3();

include/linux/acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ void __init acpi_no_s4_hw_signature(void); 
void __init acpi_old_suspend_ordering(void);

void __init acpi_nvs_nosave(void);

void __init acpi_nvs_nosave_s3(void);

void __init acpi_sleep_no_blacklist(void);

#endif /* CONFIG_PM_SLEEP */



struct acpi_osc_context {