@@ -251,6 +251,8 @@ static inline bool force_storage_d3(void)
}
#endif
+extern bool acpi_wait_for_irq_handled;
+
/*--------------------------------------------------------------------------
Device properties
-------------------------------------------------------------------------- */
@@ -42,6 +42,8 @@
#define _COMPONENT ACPI_OS_SERVICES
ACPI_MODULE_NAME("osl");
+#define ACPI_WAIT_FOR_RESUME_GPE_IRQ_MS 10
+
struct acpi_os_dpc {
acpi_osd_exec_callback function;
void *context;
@@ -69,6 +71,8 @@ static struct workqueue_struct *kacpi_hotplug_wq;
static bool acpi_os_initialized;
unsigned int acpi_sci_irq = INVALID_ACPI_IRQ;
bool acpi_permanent_mmap = false;
+bool acpi_wait_for_irq_handled;
+static DECLARE_WAIT_QUEUE_HEAD(acpi_irq_after_suspend_wait);
/*
* This list of permanent mappings is for memory that may be accessed from
@@ -549,6 +553,10 @@ static irqreturn_t acpi_irq(int irq, void *dev_id)
handled = (*acpi_irq_handler) (acpi_irq_context);
if (handled) {
+ if (acpi_wait_for_irq_handled && acpi_s2idle_wakeup()) {
+ acpi_wait_for_irq_handled = false;
+ wake_up(&acpi_irq_after_suspend_wait);
+ }
acpi_irq_handled++;
return IRQ_HANDLED;
} else {
@@ -1768,3 +1776,13 @@ acpi_status acpi_os_enter_sleep(u8 sleep_state,
reg_a_value, reg_b_value);
return status;
}
+
+int acpi_wait_for_resume_gpe_irq(void)
+{
+ int wait_ms = msecs_to_jiffies(ACPI_WAIT_FOR_RESUME_GPE_IRQ_MS);
+ int timeout = wait_event_timeout(acpi_irq_after_suspend_wait,
+ !acpi_wait_for_irq_handled,
+ wait_ms);
+ return timeout;
+}
+EXPORT_SYMBOL(acpi_wait_for_resume_gpe_irq);
@@ -765,6 +765,7 @@ bool acpi_s2idle_wake(void)
* SCI-related wakeup and dispatch the EC GPE.
*/
if (acpi_ec_dispatch_gpe()) {
+ acpi_wait_for_irq_handled = true;
pm_pr_dbg("ACPI non-EC GPE wakeup\n");
return true;
}
@@ -793,6 +794,7 @@ bool acpi_s2idle_wake(void)
void acpi_s2idle_restore(void)
{
+ int timeout;
/*
* Drain pending events before restoring the working-state configuration
* of GPEs.
@@ -801,6 +803,12 @@ void acpi_s2idle_restore(void)
acpi_ec_flush_work(); /* flush the EC driver's workqueues */
acpi_os_wait_events_complete(); /* synchronize Notify handling */
+ if (acpi_any_gpe_status_set(first_ec->gpe)) {
+ timeout = acpi_wait_for_resume_gpe_irq();
+ if (timeout == 0)
+ pr_warn("Failed to wait for ACPI interrupt after resume");
+ }
+
s2idle_wakeup = false;
acpi_enable_all_runtime_gpes();
@@ -1474,4 +1474,6 @@ static inline void acpi_device_notify(struct device *dev) { }
static inline void acpi_device_notify_remove(struct device *dev) { }
#endif
+int acpi_wait_for_resume_gpe_irq(void);
+
#endif /*_LINUX_ACPI_H*/
On the wake-up, the ACPI GPE that are marked as a wakeup source are turned off. Before turning off, the kernel waits for the currently processing IRQ to finish and assumes that this is an ACPI interrupt that triggered wake-up. In the case the first interrupt after wake-up is not an ACPI interrupt, this might cause the ACPI GPE not to be processed because it will be disabled. The patch makes sure that an ACPI interrupt is processed before disabling GPE that are wakeup sources. This patch fix the issue that is seen on low-end Chromebooks with two cores CPU when HPET IRQ is triggered while resuming the device and is processed before the ACPI GPE interrupt on the same CPU core. Signed-off-by: Marek Maslanka <mm@semihalf.com> --- Changes in v2: - Reduce wait time for first interrupt after the resume to 10ms - Wait for the first interrupt after the resume only if resume was caused by GPE interrupt. drivers/acpi/internal.h | 2 ++ drivers/acpi/osl.c | 18 ++++++++++++++++++ drivers/acpi/sleep.c | 8 ++++++++ include/linux/acpi.h | 2 ++ 4 files changed, 30 insertions(+)