Skip to content

Commit f555472

Browse files
vishniakouJiri Kosina
authored andcommitted
HID: microsoft: Add rumble support to latest xbox controllers
Currently, rumble is only supported via bluetooth on a single xbox controller, called 'model 1708'. On the back of the device, it's named 'wireless controller for xbox one'. However, in 2021, Microsoft released a firmware update for this controller. As part of this update, the HID descriptor of the device changed. The product ID was also changed from 0x02fd to 0x0b20. On this controller, rumble was supported via hid-microsoft, which matched against the old product id (0x02fd). As a result, the firmware update broke rumble support on this controller. See: https://news.xbox.com/en-us/2021/09/08/xbox-controller-firmware-update-rolling-out-to-insiders-starting-today/ The hid-microsoft driver actually supports rumble on the new firmware, as well. So simply adding new product id is sufficient to bring back this support. After discussing further with the xbox team, it was pointed out that another xbox controller, xbox elite series 2, can be supported in a similar way. Add rumble support for all of these devices in this patch. Two of the devices have received firmware updates that caused their product id's to change. Both old and new firmware versions of these devices were tested. The tested controllers are: 1. 'wireless controller for xbox one', model 1708 2. 'xbox wireless controller', model 1914. This is also sometimes referred to as 'xbox series S|X'. 3. 'elite series 2', model 1797. The tested configurations are: 1. model 1708, pid 0x02fd (old firmware) 2. model 1708, pid 0x0b20 (new firmware) 3. model 1914, pid 0x0b13 4. model 1797, pid 0x0b05 (old firmware) 5. model 1797, pid 0x0b22 (new firmware) I verified rumble support on both bluetooth and usb. Reviewed-by: Bastien Nocera <[email protected]> Signed-off-by: Siarhei Vishniakou <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
1 parent 7c28afd commit f555472

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

drivers/hid/hid-ids.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,15 @@
934934
#define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9
935935
#define USB_DEVICE_ID_MS_POWER_COVER 0x07da
936936
#define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de
937-
#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd
937+
/*
938+
* For a description of the Xbox controller models, refer to:
939+
* https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary
940+
*/
941+
#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd
942+
#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20
943+
#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13
944+
#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05
945+
#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22
938946
#define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb
939947
#define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0
940948
#define USB_DEVICE_ID_MS_MOUSE_0783 0x0783

drivers/hid/hid-microsoft.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,16 @@ static const struct hid_device_id ms_devices[] = {
446446
.driver_data = MS_PRESENTER },
447447
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B),
448448
.driver_data = MS_SURFACE_DIAL },
449-
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER),
449+
450+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708),
451+
.driver_data = MS_QUIRK_FF },
452+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE),
453+
.driver_data = MS_QUIRK_FF },
454+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914),
455+
.driver_data = MS_QUIRK_FF },
456+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797),
457+
.driver_data = MS_QUIRK_FF },
458+
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE),
450459
.driver_data = MS_QUIRK_FF },
451460
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS),
452461
.driver_data = MS_QUIRK_FF },

0 commit comments

Comments
 (0)