ACPI: PM: Set up EC GPE for system wakeup from drivers that need it

The EC GPE needs to be set up for system wakeup only if there is a
driver depending on it, either intel-hid or intel-vbtn, bound to a
button device that is expected to wake up the system from sleep (such
as the power button on some Dell systems, like the XPS13 9360).  It
doesn't need to be set up for waking up the system from sleep in any
other cases and whether or not it is expected to wake up the system
from sleep doesn't depend on whether or not the LPS0 device is
present in the ACPI namespace.

For this reason, rearrange the ACPI suspend-to-idle code to make the
drivers depending on the EC GPE wakeup take care of setting it up and
decouple that from the LPS0 device handling.

While at it, make intel-hid and intel-vbtn prepare for system wakeup
only if they are allowed to wake up the system from sleep by user
space (via sysfs).

[Note that acpi_ec_mark_gpe_for_wake() and acpi_ec_set_gpe_wake_mask()
 are there to prevent the EC GPE from being disabled by the
 acpi_enable_all_wakeup_gpes() call in acpi_s2idle_prepare(), so on
 systems with either intel-hid or intel-vbtn this change doesn't
 affect any interactions with the hardware or platform firmware.]

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

2 files changed, 32 insertions, 8 deletions

diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index bc0d55a59015..e51c72b92cbd 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -253,9 +253,12 @@ static void intel_button_array_enable(struct device *device, bool enable)
 
 static int intel_hid_pm_prepare(struct device *device)
 {
-        struct intel_hid_priv *priv = dev_get_drvdata(device);
+        if (device_may_wakeup(device)) {
+                struct intel_hid_priv *priv = dev_get_drvdata(device);
 
-        priv->wakeup_mode = true;
+                priv->wakeup_mode = true;
+                acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
+        }
         return 0;
 }
 
@@ -270,9 +273,12 @@ static int intel_hid_pl_suspend_handler(struct device *device)
 
 static int intel_hid_pl_resume_handler(struct device *device)
 {
-        struct intel_hid_priv *priv = dev_get_drvdata(device);
+        if (device_may_wakeup(device)) {
+                struct intel_hid_priv *priv = dev_get_drvdata(device);
 
-        priv->wakeup_mode = false;
+                acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
+                priv->wakeup_mode = false;
+        }
         if (pm_resume_via_firmware()) {
                 intel_hid_set_enable(device, true);
                 intel_button_array_enable(device, true);
@@ -491,6 +497,12 @@ static int intel_hid_probe(struct platform_device *device)
         }
 
         device_init_wakeup(&device->dev, true);
+        /*
+         * In order for system wakeup to work, the EC GPE has to be marked as
+         * a wakeup one, so do that here (this setting will persist, but it has
+         * no effect until the wakeup mask is set for the EC GPE).
+         */
+        acpi_ec_mark_gpe_for_wake();
         return 0;
 
 err_remove_notify:
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index a0d0cecff55f..ab84e1bbdedd 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -176,6 +176,12 @@ static int intel_vbtn_probe(struct platform_device *device)
                 return -EBUSY;
 
         device_init_wakeup(&device->dev, true);
+        /*
+         * In order for system wakeup to work, the EC GPE has to be marked as
+         * a wakeup one, so do that here (this setting will persist, but it has
+         * no effect until the wakeup mask is set for the EC GPE).
+         */
+        acpi_ec_mark_gpe_for_wake();
         return 0;
 }
 
@@ -195,17 +201,23 @@ static int intel_vbtn_remove(struct platform_device *device)
 
 static int intel_vbtn_pm_prepare(struct device *dev)
 {
-        struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
+        if (device_may_wakeup(dev)) {
+                struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
 
-        priv->wakeup_mode = true;
+                priv->wakeup_mode = true;
+                acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
+        }
         return 0;
 }
 
 static int intel_vbtn_pm_resume(struct device *dev)
 {
-        struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
+        if (device_may_wakeup(dev)) {
+                struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
 
-        priv->wakeup_mode = false;
+                acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
+                priv->wakeup_mode = false;
+        }
         return 0;
 }