From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> Allow the intel-hid driver to wake up the system from suspend-to-idle by configuring its platform device as a wakeup one by default and switching it over to a system wakeup events triggering mode during system suspend transitions. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx> --- This depends on https://patchwork.kernel.org/patch/9685529/ --- drivers/platform/x86/intel-hid.c | 49 ++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 6 deletions(-) Index: linux-pm/drivers/platform/x86/intel-hid.c =================================================================== --- linux-pm.orig/drivers/platform/x86/intel-hid.c +++ linux-pm/drivers/platform/x86/intel-hid.c @@ -23,6 +23,7 @@ #include <linux/platform_device.h> #include <linux/input/sparse-keymap.h> #include <linux/acpi.h> +#include <linux/suspend.h> #include <acpi/acpi_bus.h> MODULE_LICENSE("GPL"); @@ -75,6 +76,7 @@ static const struct key_entry intel_arra struct intel_hid_priv { struct input_dev *input_dev; struct input_dev *array; + bool wakeup_mode; }; static int intel_hid_set_enable(struct device *device, int enable) @@ -118,23 +120,44 @@ static void intel_button_array_enable(st dev_warn(device, "failed to set button capability\n"); } -static int intel_hid_pl_suspend_handler(struct device *device) +static int intel_hid_pm_prepare(struct device *dev) { - intel_hid_set_enable(device, 0); - intel_button_array_enable(device, false); + struct platform_device *device = to_platform_device(dev); + struct intel_hid_priv *priv = dev_get_drvdata(&device->dev); + priv->wakeup_mode = true; return 0; } -static int intel_hid_pl_resume_handler(struct device *device) +static void intel_hid_pm_complete(struct device *dev) +{ + struct platform_device *device = to_platform_device(dev); + struct intel_hid_priv *priv = dev_get_drvdata(&device->dev); + + priv->wakeup_mode = false; +} + +static int intel_hid_pl_suspend_handler(struct device *device) { - intel_hid_set_enable(device, 1); - intel_button_array_enable(device, true); + if (pm_suspend_via_firmware()) { + intel_hid_set_enable(device, 0); + intel_button_array_enable(device, false); + } + return 0; +} +static int intel_hid_pl_resume_handler(struct device *device) +{ + if (pm_resume_via_firmware()) { + intel_hid_set_enable(device, 1); + intel_button_array_enable(device, true); + } return 0; } static const struct dev_pm_ops intel_hid_pl_pm_ops = { + .prepare = intel_hid_pm_prepare, + .complete = intel_hid_pm_complete, .freeze = intel_hid_pl_suspend_handler, .thaw = intel_hid_pl_resume_handler, .restore = intel_hid_pl_resume_handler, @@ -206,6 +229,19 @@ static void notify_handler(acpi_handle h unsigned long long ev_index; acpi_status status; + if (priv->wakeup_mode) { + /* Wake up on 5-button array events only. */ + if (event == 0xc0 || !priv->array) + return; + + if (sparse_keymap_entry_from_scancode(priv->array, event)) + pm_wakeup_hard_event(&device->dev); + else + dev_info(&device->dev, "unknown event 0x%x\n", event); + + return; + } + /* 0xC0 is for HID events, other values are for 5 button array */ if (event != 0xc0) { if (!priv->array || @@ -292,6 +328,7 @@ static int intel_hid_probe(struct platfo "failed to enable HID power button\n"); } + device_init_wakeup(&device->dev, true); return 0; err_remove_notify: -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
