ACPI: PM: s2idle: Always set up EC GPE for system wakeup
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 21 Aug 2019 09:40:19 +0000 (11:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 21 Aug 2019 21:56:05 +0000 (23:56 +0200)
commitb90ff3554aa3e123bb7e6d08789f6fd92d86ddde
tree092b80a53071d6f8f0a6daaa3eec3bad0867c550
parent45dc1576e4575ba621cb6d017faf41531d8c1073
ACPI: PM: s2idle: Always set up EC GPE for system wakeup

Commit 10a08fd65ec1 ("ACPI: PM: Set up EC GPE for system wakeup from
drivers that need it") assumed that the EC GPE would only need to be
set up for system wakeup if either the intel-hid or the intel-vbtn
driver was in use, but that turns out to be incorrect.  In particular,
on ASUS Zenbook UX430UNR/i7-8550U, if the EC GPE is not enabled while
suspended, the system cannot be woken up by opening the lid or
pressing a key, and that machine doesn't use any of the drivers
mentioned above.

For this reason, always set up the EC GPE for system wakeup from
suspend-to-idle by setting and clearing its wake mask in the ACPI
suspend-to-idle callbacks.

Fixes: 10a08fd65ec1 ("ACPI: PM: Set up EC GPE for system wakeup from drivers that need it")
Reported-by: Kristian Klausen <kristian@klausen.dk>
Tested-by: Kristian Klausen <kristian@klausen.dk>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/ec.c
drivers/acpi/sleep.c
drivers/platform/x86/intel-hid.c
drivers/platform/x86/intel-vbtn.c