From f6d910a89a2391e5ce1f275d205023880a33d3f8 Mon Sep 17 00:00:00 2001

From: Ankit Patel <anpatel@nvidia.com>

Date: Tue, 22 Nov 2022 15:35:20 +0800

Subject: [PATCH] HID: usbhid: Add ALWAYS_POLL quirk for some mice

Git-commit: f6d910a89a2391e5ce1f275d205023880a33d3f8

References: git-fixes

Patch-mainline: v6.1

Some additional USB mouse devices are needing ALWAYS_POLL quirk without

which they disconnect and reconnect every 60s.

Add below devices to the known quirk list.

CHERRY    VID 0x046a, PID 0x000c

MICROSOFT VID 0x045e, PID 0x0783

PRIMAX    VID 0x0461, PID 0x4e2a

Signed-off-by: Ankit Patel <anpatel@nvidia.com>

Signed-off-by: Haotien Hsu <haotienh@nvidia.com>

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/hid/hid-ids.h    | 3 +++

 drivers/hid/hid-quirks.c | 3 +++

 2 files changed, 6 insertions(+)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h

index b3dfe8d9e556..8f58c3c1bec3 100644

--- a/drivers/hid/hid-ids.h

+++ b/drivers/hid/hid-ids.h

@@ -274,6 +274,7 @@

 #define USB_DEVICE_ID_CH_AXIS_295	0x001c

 #define USB_VENDOR_ID_CHERRY		0x046a

+#define USB_DEVICE_ID_CHERRY_MOUSE_000C	0x000c

 #define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023

 #define USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR	0x0027

@@ -917,6 +918,7 @@

 #define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER	0x02fd

 #define USB_DEVICE_ID_MS_PIXART_MOUSE    0x00cb

 #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS      0x02e0

+#define USB_DEVICE_ID_MS_MOUSE_0783      0x0783

 #define USB_VENDOR_ID_MOJO		0x8282

 #define USB_DEVICE_ID_RETRO_ADAPTER	0x3201

@@ -1382,6 +1384,7 @@

 #define USB_VENDOR_ID_PRIMAX	0x0461

 #define USB_DEVICE_ID_PRIMAX_MOUSE_4D22	0x4d22

+#define USB_DEVICE_ID_PRIMAX_MOUSE_4E2A	0x4e2a

 #define USB_DEVICE_ID_PRIMAX_KEYBOARD	0x4e05

 #define USB_DEVICE_ID_PRIMAX_REZEL	0x4e72

 #define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F	0x4d0f

diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c

index 50e1c717fc0a..0e9702c7f7d6 100644

--- a/drivers/hid/hid-quirks.c

+++ b/drivers/hid/hid-quirks.c

@@ -54,6 +54,7 @@ static const struct hid_device_id hid_quirks[] = {

 	{ HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE), HID_QUIRK_NOGET },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_PEDALS), HID_QUIRK_NOGET },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_CH, USB_DEVICE_ID_CH_PRO_THROTTLE), HID_QUIRK_NOGET },

+	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_MOUSE_000C), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB), HID_QUIRK_NO_INIT_REPORTS },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K65RGB_RAPIDFIRE), HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_K70RGB), HID_QUIRK_NO_INIT_REPORTS },

@@ -122,6 +123,7 @@ static const struct hid_device_id hid_quirks[] = {

 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK), HID_QUIRK_MULTI_INPUT },

+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_MOUSE_0783), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PIXART_MOUSE), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), HID_QUIRK_NO_INIT_REPORTS },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE3_COVER), HID_QUIRK_NO_INIT_REPORTS },

@@ -146,6 +148,7 @@ static const struct hid_device_id hid_quirks[] = {

 	{ HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN), HID_QUIRK_NO_INIT_REPORTS },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4D22), HID_QUIRK_ALWAYS_POLL },

+	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4E2A), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D65), HID_QUIRK_ALWAYS_POLL },

 	{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22), HID_QUIRK_ALWAYS_POLL },

-- 

2.35.3