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

ACPI: EC / PM: Disable non-wakeup GPEs for suspend-to-idle 

There are systems in which non-wakeup GPEs fire during the "noirq"
suspend stage of suspending devices and that effectively prevents the
system that tries to suspend to idle from entering any low-power
state at all.  If the offending GPE fires regularly and often enough,
the system appears to be suspended, but in fact it is in a tight loop
over "noirq" suspend and "noirq" resume of devices all the time.

To prevent that from happening, disable all non-wakeup GPEs except
for the EC GPE for suspend-to-idle (the EC GPE is special, because
on some systems it has to be enabled for power button wakeup events
to be generated as expected).

Fixes: 147a7d9d (ACPI / PM: Do not reconfigure GPEs for suspend-to-idle)
Link: https://bugzilla.kernel.org/show_bug.cgi?id=201987


Reported-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Tested-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7566ec39

drivers/acpi/ec.c

+12 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,18 @@ void acpi_ec_unblock_transactions(void) 
		acpi_ec_start(first_ec, true);

}



void acpi_ec_mark_gpe_for_wake(void)

{

	if (first_ec && !ec_no_wakeup)

		acpi_mark_gpe_for_wake(NULL, first_ec->gpe);

}



void acpi_ec_set_gpe_wake_mask(u8 action)

{

	if (first_ec && !ec_no_wakeup)

		acpi_set_gpe_wake_mask(NULL, first_ec->gpe, action);

}



void acpi_ec_dispatch_gpe(void)

{

	if (first_ec)

drivers/acpi/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ int acpi_ec_ecdt_probe(void); 
int acpi_ec_dsdt_probe(void);

void acpi_ec_block_transactions(void);

void acpi_ec_unblock_transactions(void);

void acpi_ec_mark_gpe_for_wake(void);

void acpi_ec_set_gpe_wake_mask(u8 action);

void acpi_ec_dispatch_gpe(void);

int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,

			      acpi_handle handle, acpi_ec_query_func func,

drivers/acpi/sleep.c

+11 −0
Original line number Diff line number Diff line
@@ -940,6 +940,8 @@ static int lps0_device_attach(struct acpi_device *adev, 


		acpi_handle_debug(adev->handle, "_DSM function mask: 0x%x\n",

				  bitmask);



		acpi_ec_mark_gpe_for_wake();

	} else {

		acpi_handle_debug(adev->handle,

				  "_DSM function 0 evaluation failed\n");
@@ -968,11 +970,16 @@ static int acpi_s2idle_prepare(void) 
	if (lps0_device_handle) {

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_OFF);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_ENTRY);



		acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);

	}



	if (acpi_sci_irq_valid())

		enable_irq_wake(acpi_sci_irq);



	/* Change the configuration of GPEs to avoid spurious wakeup. */

	acpi_enable_all_wakeup_gpes();

	acpi_os_wait_events_complete();

	return 0;

}
@@ -1017,10 +1024,14 @@ static void acpi_s2idle_sync(void) 


static void acpi_s2idle_restore(void)

{

	acpi_enable_all_runtime_gpes();



	if (acpi_sci_irq_valid())

		disable_irq_wake(acpi_sci_irq);



	if (lps0_device_handle) {

		acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);



		acpi_sleep_run_lps0_dsm(ACPI_LPS0_EXIT);

		acpi_sleep_run_lps0_dsm(ACPI_LPS0_SCREEN_ON);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE