Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ccc60f9 authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files

HID: microsoft: fix invalid rdesc for 3k kbd 

Microsoft Digital Media Keyboard 3000 has two interfaces, and the
second one has a report descriptor with a bug. The second collection
says:
05 01 -- global; usage page -- 01 -- Generic Desktop Controls
09 80 -- local; usage -- 80 -- System Control
a1 01 -- main; collection -- 01 -- application

85 03 -- global; report ID -- 03
19 00 -- local; Usage Minimum -- 00
29 ff -- local; Usage Maximum -- ff
15 00 -- global; Logical Minimum -- 0
26 ff 00 -- global; Logical Maximum -- ff
81 00 -- main; input

c0 -- main; End Collection

I.e. it makes us think that there are all kinds of usages of system
control. That the keyboard is a not only a keyboard, but also a
joystick, mouse, gamepad, keypad, etc. The same as for the Wireless
Desktop Receiver, this should be Physical Min/Max. So fix that
appropriately.

References: https://bugzilla.novell.com/show_bug.cgi?id=776834


Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent def7cb8c

drivers/hid/hid-microsoft.c

+13 −5
Original line number Diff line number Diff line
@@ -28,22 +28,30 @@ 
#define MS_RDESC		0x08

#define MS_NOGET		0x10

#define MS_DUPLICATE_USAGES	0x20

#define MS_RDESC_3K		0x40



/*

 * Microsoft Wireless Desktop Receiver (Model 1028) has

 * 'Usage Min/Max' where it ought to have 'Physical Min/Max'

 */

static __u8 *ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	unsigned long quirks = (unsigned long)hid_get_drvdata(hdev);



	/*

	 * Microsoft Wireless Desktop Receiver (Model 1028) has

	 * 'Usage Min/Max' where it ought to have 'Physical Min/Max'

	 */

	if ((quirks & MS_RDESC) && *rsize == 571 && rdesc[557] == 0x19 &&

			rdesc[559] == 0x29) {

		hid_info(hdev, "fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n");

		rdesc[557] = 0x35;

		rdesc[559] = 0x45;

	}

	/* the same as above (s/usage/physical/) */

	if ((quirks & MS_RDESC_3K) && *rsize == 106 &&

			!memcmp((char []){ 0x19, 0x00, 0x29, 0xff },

				&rdesc[94], 4)) {

		rdesc[94] = 0x35;

		rdesc[96] = 0x45;

	}

	return rdesc;

}
@@ -192,7 +200,7 @@ static const struct hid_device_id ms_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),

		.driver_data = MS_PRESENTER },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K),

		.driver_data = MS_ERGONOMY },

		.driver_data = MS_ERGONOMY | MS_RDESC_3K },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0),

		.driver_data = MS_NOGET },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500),