HID: logitech-hidpp: Hard-code HID++ 1.0 fast scroll support

HID++ 1.0 devices only export whether Fast Scrolling is enabled, not
whether they are capable of it. Reinstate the original quirks for the 3
supported mice so fast scrolling works again on those devices.

Fixes: 908d325e1665 ("HID: logitech-hidpp: Detect hi-res scrolling support")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216903
Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Link: https://lore.kernel.org/r/20230116130937.391441-1-hadess@hadess.net

diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index abf2c95e4d0b0003095e04099f68300d3eb3b6e0..fa026e9107c5abed83c46c13de5e5a65a9a39a46 100644 (file)
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -77,6 +77,7 @@ MODULE_PARM_DESC(disable_tap_to_click,
 #define HIDPP_QUIRK_HIDPP_WHEELS               BIT(26)
 #define HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS     BIT(27)
 #define HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS BIT(28)
+#define HIDPP_QUIRK_HI_RES_SCROLL_1P0          BIT(29)
 
 /* These are just aliases for now */
 #define HIDPP_QUIRK_KBD_SCROLL_WHEEL HIDPP_QUIRK_HIDPP_WHEELS
@@ -3472,14 +3473,8 @@ static int hidpp_initialize_hires_scroll(struct hidpp_device *hidpp)
                        hid_dbg(hidpp->hid_dev, "Detected HID++ 2.0 hi-res scrolling\n");
                }
        } else {
-               struct hidpp_report response;
-
-               ret = hidpp_send_rap_command_sync(hidpp,
-                                                 REPORT_ID_HIDPP_SHORT,
-                                                 HIDPP_GET_REGISTER,
-                                                 HIDPP_ENABLE_FAST_SCROLL,
-                                                 NULL, 0, &response);
-               if (!ret) {
+               /* We cannot detect fast scrolling support on HID++ 1.0 devices */
+               if (hidpp->quirks & HIDPP_QUIRK_HI_RES_SCROLL_1P0) {
                        hidpp->capabilities |= HIDPP_CAPABILITY_HIDPP10_FAST_SCROLL;
                        hid_dbg(hidpp->hid_dev, "Detected HID++ 1.0 fast scroll\n");
                }
@@ -4296,9 +4291,15 @@ static const struct hid_device_id hidpp_devices[] = {
          HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
                USB_DEVICE_ID_LOGITECH_T651),
          .driver_data = HIDPP_QUIRK_CLASS_WTP },
+       { /* Mouse Logitech Anywhere MX */
+         LDJ_DEVICE(0x1017), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 },
        { /* Mouse logitech M560 */
          LDJ_DEVICE(0x402d),
          .driver_data = HIDPP_QUIRK_DELAYED_INIT | HIDPP_QUIRK_CLASS_M560 },
+       { /* Mouse Logitech M705 (firmware RQM17) */
+         LDJ_DEVICE(0x101b), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 },
+       { /* Mouse Logitech Performance MX */
+         LDJ_DEVICE(0x101a), .driver_data = HIDPP_QUIRK_HI_RES_SCROLL_1P0 },
        { /* Keyboard logitech K400 */
          LDJ_DEVICE(0x4024),
          .driver_data = HIDPP_QUIRK_CLASS_K400 },