6.1-stable patches

added patches:
	hid-logitech-disable-hi-res-scrolling-on-usb.patch

diff --git a/queue-6.1/hid-logitech-disable-hi-res-scrolling-on-usb.patch b/queue-6.1/hid-logitech-disable-hi-res-scrolling-on-usb.patch
new file mode 100644 (file)
index 0000000..aaada97
--- /dev/null
+++ b/queue-6.1/hid-logitech-disable-hi-res-scrolling-on-usb.patch
@@ -0,0 +1,43 @@
+From 690eb7dec72ae52d1d710d14a451844b4d0f4f19 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 3 Feb 2023 11:18:00 +0100
+Subject: HID: logitech: Disable hi-res scrolling on USB
+
+From: Bastien Nocera <hadess@hadess.net>
+
+commit 690eb7dec72ae52d1d710d14a451844b4d0f4f19 upstream.
+
+On some Logitech mice, such as the G903, and possibly the G403, the HID
+events are generated on a different interface to the HID++ one.
+
+If we enable hi-res through the HID++ interface, the HID interface
+wouldn't know anything about it, and handle the events as if they were
+regular scroll events, making the mouse unusable.
+
+Disable hi-res scrolling on those devices until we implement scroll
+events through HID++.
+
+Signed-off-by: Bastien Nocera <hadess@hadess.net>
+Tested-by: Tobias Klausmann <klausman@schwarzvogel.de>
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=216885
+Fixes: 908d325e1665 ("HID: logitech-hidpp: Detect hi-res scrolling support")
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/20230203101800.139380-1-hadess@hadess.net
+Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/hid/hid-logitech-hidpp.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/hid/hid-logitech-hidpp.c
++++ b/drivers/hid/hid-logitech-hidpp.c
+@@ -3978,7 +3978,8 @@ static void hidpp_connect_event(struct h
+       }
+ 
+       hidpp_initialize_battery(hidpp);
+-      hidpp_initialize_hires_scroll(hidpp);
++      if (!hid_is_usb(hidpp->hid_dev))
++              hidpp_initialize_hires_scroll(hidpp);
+ 
+       /* forward current battery state */
+       if (hidpp->capabilities & HIDPP_CAPABILITY_HIDPP10_BATTERY) {

diff --git a/queue-6.1/series b/queue-6.1/series
index 5f710c15a94c6cc31dd480d1566f2bd54bd8c8fd..c13cd041506ff22f3ac03eb6fca8a4fef94b77a9 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -12,3 +12,4 @@ revert-pci-aspm-refactor-l1-pm-substates-control-register-programming.patch
 tracing-fix-poll-and-select-do-not-work-on-per_cpu-trace_pipe-and-trace_pipe_raw.patch
 of-address-return-an-error-when-no-valid-dma-ranges-are-found.patch
 can-j1939-do-not-wait-250-ms-if-the-same-addr-was-already-claimed.patch
+hid-logitech-disable-hi-res-scrolling-on-usb.patch