aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/button.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-26 17:23:03 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-05-05 16:54:28 -0400
commiteed4d47efe9508b855b09754cf6de4325d8a2f0d (patch)
treea5116bd74fa697a1601dff6db711022e82a55fde /drivers/acpi/button.c
parent8a537ece3d946227e4afa81eae0e43fa47439c7d (diff)
ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle
The ACPI SCI (System Control Interrupt) is set up as a wakeup IRQ during suspend-to-idle transitions and, consequently, any events signaled through it wake up the system from that state. However, on some systems some of the events signaled via the ACPI SCI while suspended to idle should not cause the system to wake up. In fact, quite often they should just be discarded. Arguably, systems should not resume entirely on such events, but in order to decide which events really should cause the system to resume and which are spurious, it is necessary to resume up to the point when ACPI SCIs are actually handled and processed, which is after executing dpm_resume_noirq() in the system resume path. For this reasons, add a loop around freeze_enter() in which the platforms can process events signaled via multiplexed IRQ lines like the ACPI SCI and add suspend-to-idle hooks that can be used for this purpose to struct platform_freeze_ops. In the ACPI case, the ->wake hook is used for checking if the SCI has triggered while suspended and deferring the interrupt-induced system wakeup until the events signaled through it are actually processed sufficiently to decide whether or not the system should resume. In turn, the ->sync hook allows all of the relevant event queues to be flushed so as to prevent events from being missed due to race conditions. In addition to that, some ACPI code processing wakeup events needs to be modified to use the "hard" version of wakeup triggers, so that it will cause a system resume to happen on device-induced wakeup events even if the "soft" mechanism to prevent the system from suspending is not enabled (that also helps to catch device-induced wakeup events occurring during suspend transitions in progress). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/button.c')
-rw-r--r--drivers/acpi/button.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 668137e4a069..b7c2a06963d6 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -216,7 +216,7 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state)
216 } 216 }
217 217
218 if (state) 218 if (state)
219 pm_wakeup_event(&device->dev, 0); 219 pm_wakeup_hard_event(&device->dev);
220 220
221 ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device); 221 ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);
222 if (ret == NOTIFY_DONE) 222 if (ret == NOTIFY_DONE)
@@ -398,7 +398,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
398 } else { 398 } else {
399 int keycode; 399 int keycode;
400 400
401 pm_wakeup_event(&device->dev, 0); 401 pm_wakeup_hard_event(&device->dev);
402 if (button->suspended) 402 if (button->suspended)
403 break; 403 break;
404 404
@@ -530,6 +530,7 @@ static int acpi_button_add(struct acpi_device *device)
530 lid_device = device; 530 lid_device = device;
531 } 531 }
532 532
533 device_init_wakeup(&device->dev, true);
533 printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device)); 534 printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
534 return 0; 535 return 0;
535 536