github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ACPI support fixes for 6.19-rc6

Browse Source 
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)
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEcM8Aw/RY0dgsiRUR7l+9nS/U47UFAmlqWf4SHHJqd0Byand5
 c29ja2kubmV0AAoJEO5fvZ0v1OO1af0H/3MSxrRFbG1F+e+yYNRGVfEW8pLCoDts
 sjHpB4PDLPsp1mnobzEdyqmhaTxsf4vvmZzS63GNIMt3tl0G28o5baTQP55fKpYM
 zdcyF42yG1HiZnfHRYf8aPirTFQ98ztNRKYltlg6RV36CYC1BW7U7/YqZuw3KUd0
 DMF0voYvA0mYa7XwpdoERgAtGkXcKYUBSUdu/FjExnDkk+ZgQM3lrCHEvuiFqscF
 ld4MmHg9b18sWfPXUcb56jTW90zVpIYu6VVa7wWyL93JoGDpBnvPeagwqbhP+VMx
 Z/ea5ADoDO1OXtszm5C7UGVGrgLdiATkho8y6cw/R9iqsU2lx7KhZ4I=
 =ZulU
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2026-01-16 11:03:17 -08:00
commit e547d4f733
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/acpi/x86/s2idle.c
View File

@ -28,6 +28,10 @@ static bool sleep_no_lps0 __read_mostly;
module_param(sleep_no_lps0, bool, 0644);
MODULE_PARM_DESC(sleep_no_lps0, "Do not use the special LPS0 device interface");
static bool check_lps0_constraints __read_mostly;
module_param(check_lps0_constraints, bool, 0644);
MODULE_PARM_DESC(check_lps0_constraints, "Check LPS0 device constraints");
static const struct acpi_device_id lps0_device_ids[] = {
{"PNP0D80", },
{"", },
@ -515,7 +519,8 @@ static struct acpi_scan_handler lps0_handler = {
static int acpi_s2idle_begin_lps0(void)
{
if (pm_debug_messages_on && !lpi_constraints_table) {
if (lps0_device_handle && !sleep_no_lps0 && check_lps0_constraints &&
!lpi_constraints_table) {
if (acpi_s2idle_vendor_amd())
lpi_device_get_constraints_amd();
else
@ -539,7 +544,7 @@ static int acpi_s2idle_prepare_late_lps0(void)
if (!lps0_device_handle || sleep_no_lps0)
return 0;
if (pm_debug_messages_on)
if (check_lps0_constraints)
lpi_check_constraints();
/* Screen off */