Commit 53e0d8ec authored Nov 15, 2018 by Vitaly Kuznetsov Committed by Greg Kroah-Hartman Dec 21, 2018

Input: hyper-v - fix wakeup from suspend-to-idle



[ Upstream commit 10f91c73cc41ceead210a905dbd196398e99c7d2 ]

It makes little sense but still possible to put Hyper-V guests into
suspend-to-idle state. To wake them up two wakeup sources were registered
in the past: hyperv-keyboard and hid-hyperv. However, since
commit eed4d47e ("ACPI / sleep: Ignore spurious SCI wakeups from
suspend-to-idle") pm_wakeup_event() from these devices is ignored. Switch
to pm_wakeup_hard_event() API as these devices are actually the only
possible way to wakeup Hyper-V guests.

Fixes: eed4d47e (ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle)
Reviewed-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent ff7d99c4

drivers/hid/hid-hyperv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,7 @@ static void mousevsc_on_receive(struct hv_device *device,
		hid_input_report(input_dev->hid_device, HID_INPUT_REPORT,
		input_dev->input_buf, len, 1);

		pm_wakeup_event(&input_dev->device->device, 0);
		pm_wakeup_hard_event(&input_dev->device->device);

		break;
		default:

drivers/input/serio/hyperv-keyboard.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev,
		* state because the Enter-UP can trigger a wakeup at once.
		*/
		if (!(info & IS_BREAK))
		pm_wakeup_event(&hv_dev->device, 0);
		pm_wakeup_hard_event(&hv_dev->device);

		break;