From patchwork Wed Feb 22 01:39:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Wu X-Patchwork-Id: 13148584 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 100F9C636D7 for ; Wed, 22 Feb 2023 01:39:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229820AbjBVBjD (ORCPT ); Tue, 21 Feb 2023 20:39:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229581AbjBVBjC (ORCPT ); Tue, 21 Feb 2023 20:39:02 -0500 Received: from out28-221.mail.aliyun.com (out28-221.mail.aliyun.com [115.124.28.221]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72A7F199DF; Tue, 21 Feb 2023 17:39:00 -0800 (PST) X-Alimail-AntiSpam: AC=CONTINUE;BC=0.08688394|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_regular_dialog|0.00408143-0.000507876-0.995411;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047207;MF=michael@allwinnertech.com;NM=1;PH=DS;RN=5;RT=5;SR=0;TI=SMTPD_---.RTE644q_1677029937; Received: from SunxiBot.allwinnertech.com(mailfrom:michael@allwinnertech.com fp:SMTPD_---.RTE644q_1677029937) by smtp.aliyun-inc.com; Wed, 22 Feb 2023 09:38:57 +0800 From: Michael Wu To: jikos@kernel.org, benjamin.tissoires@redhat.com Cc: linux-usb@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] HID: usbhid: enable remote wakeup for mice Date: Wed, 22 Feb 2023 09:39:44 +0800 Message-Id: <20230222013944.31095-1-michael@allwinnertech.com> X-Mailer: git-send-email 2.29.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This patch fixes a problem that USB mouse can't wake up the device that enters standby. At present, the kernel only checks whether certain USB manufacturers support wake-up, which will easily cause inconvenience to the development work of other manufacturers and add unnecessary work to the maintenance of kernel. The USB protocol supports judging whether a usb supports the wake-up function, so it should be more reasonable to add a wake-up source by directly checking the settings from the USB protocol. There was a similar issue on the keyboard before, which was fixed by this patch (3d61510f4eca), but now the problem happened on the mouse. This patch uses a similar idea to fix this problem. Signed-off-by: Michael Wu --- drivers/hid/usbhid/hid-core.c | 8 ++++++++ drivers/hid/usbhid/usbmouse.c | 1 + 2 files changed, 9 insertions(+) diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index be4c731aaa65..d3a6755cca09 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1189,6 +1189,14 @@ static int usbhid_start(struct hid_device *hid) device_set_wakeup_enable(&dev->dev, 1); } + /** + * NOTE: enable remote wakeup by default for all mouse devices + * supporting the boot protocol. + */ + if (interface->desc.bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT && + interface->desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE) + device_set_wakeup_enable(&dev->dev, 1); + mutex_unlock(&usbhid->mutex); return 0; diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index 3fd93c2e4f4a..2fbc3f49e420 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c @@ -188,6 +188,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i goto fail3; usb_set_intfdata(intf, mouse); + device_set_wakeup_enable(&dev->dev, 1); return 0; fail3: