ACPI: EC: Dispatch the EC GPE directly on s2idle wake

rafaeljw · rafaeljw · commit 68e22011856f · 2018-05-25T10:32:13.000+02:00
On platforms where the Low Power S0 Idle _DSM interface is used,
on wakeup from suspend-to-idle, when it is known that the ACPI SCI
has triggered while suspended, dispatch the EC GPE in order to catch
all EC events that may have triggered the wakeup before carrying out
the noirq phase of device resume.

That is needed to handle power button wakeup on some platforms where
the EC goes into a low-power mode during suspend-to-idle and while in
that mode it will discard events after a timeout.  If that timeout is
shorter than the time it takes to complete the noirq resume of
devices, looking for EC events after the latter is too late.

Signed-off-by: Rafael J. Wysocki &lt;rafael.j.wysocki@intel.com&gt;
Reported-by: Zhang Rui &lt;rui.zhang@intel.com&gt;
Tested-by: Wendy Wang &lt;wendy.wang@intel.com&gt;
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
@@ -1034,6 +1034,12 @@ void acpi_ec_unblock_transactions(void)
 		acpi_ec_start(first_ec, true);
 }
 
+void acpi_ec_dispatch_gpe(void)
+{
+	if (first_ec)
+		acpi_dispatch_gpe(NULL, first_ec->gpe);
+}
+
 /* --------------------------------------------------------------------------
                                 Event Management
    -------------------------------------------------------------------------- */
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
@@ -188,6 +188,7 @@ 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_dispatch_gpe(void);
 int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
 			      acpi_handle handle, acpi_ec_query_func func,
 			      void *data);
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
@@ -989,6 +989,13 @@ static void acpi_s2idle_wake(void)
 	    !irqd_is_wakeup_armed(irq_get_irq_data(acpi_sci_irq))) {
 		pm_system_cancel_wakeup();
 		s2idle_wakeup = true;
+		/*
+		 * On some platforms with the LPS0 _DSM device noirq resume
+		 * takes too much time for EC wakeup events to survive, so look
+		 * for them now.
+		 */
+		if (lps0_device_handle)
+			acpi_ec_dispatch_gpe();
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -989,6 +989,13 @@ static void acpi_s2idle_wake(void)`
`989`	`989`	`!irqd_is_wakeup_armed(irq_get_irq_data(acpi_sci_irq))) {`
`990`	`990`	`pm_system_cancel_wakeup();`
`991`	`991`	`s2idle_wakeup = true;`
	`992`	`+ /*`
	`993`	`+ * On some platforms with the LPS0 _DSM device noirq resume`
	`994`	`+ * takes too much time for EC wakeup events to survive, so look`
	`995`	`+ * for them now.`
	`996`	`+ */`
	`997`	`+ if (lps0_device_handle)`
	`998`	`+ acpi_ec_dispatch_gpe();`
`992`	`999`	`}`
`993`	`1000`	`}`
`994`	`1001`