Commit fa54d366 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix two mistakes in new code.

  Specifics:

   - Prevent confusing messages from being printed if the PRMT table is
     not present or there are no PRM modules (Aubrey Li).

   - Fix the handling of suspend-to-idle entry and exit in the case when
     the Microsoft UUID is used with the Low-Power S0 Idle _DSM
     interface (Mario Limonciello)"

* tag 'acpi-5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: s2idle: Invert Microsoft UUID entry and exit
  ACPI: PRM: Deal with table not present or no module found
parents cae68764 0f09f4c4

drivers/acpi/prmt.c

+6 −0
Original line number Diff line number Diff line
@@ -292,6 +292,12 @@ void __init init_prmt(void) 
	int mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) +

					  sizeof (struct acpi_table_prmt_header),

					  0, acpi_parse_prmt, 0);

	/*

	 * Return immediately if PRMT table is not present or no PRM module found.

	 */

	if (mc <= 0)

		return;



	pr_info("PRM: found %u modules\n", mc);



	status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,

drivers/acpi/x86/s2idle.c

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ int acpi_s2idle_prepare_late(void) 
	if (lps0_dsm_func_mask_microsoft > 0) {

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);
@@ -479,7 +479,7 @@ void acpi_s2idle_restore_early(void) 
	if (lps0_dsm_func_mask_microsoft > 0) {

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_ENTRY,

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_MS_EXIT,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON,

				lps0_dsm_func_mask_microsoft, lps0_dsm_guid_microsoft);