Message ID | 20230307213536.2299487-1-svv@google.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2689332wrd; Tue, 7 Mar 2023 14:09:08 -0800 (PST) X-Google-Smtp-Source: AK7set8YV/6AYlwVEfycayrWHrGrYjuEtBxVyILKu8+hI0113mTPE4EXAiC+n4iNkyQmSSxgmbt1 X-Received: by 2002:a17:907:c284:b0:913:ff28:59bd with SMTP id tk4-20020a170907c28400b00913ff2859bdmr5930255ejc.52.1678226947970; Tue, 07 Mar 2023 14:09:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678226947; cv=none; d=google.com; s=arc-20160816; b=C+aiBLaE/mUxAV/x/2tQnJy4J5qci/E9f5FnFtmQBXy6jfH10QB8J9TZrZaeKLy7XX NH+8aLSeBEvncMOKtZBl7YT6tBGkBVDTj6UKjW5yYBGCg2nVN0vATLkiL0Dbw4oIcUFV TXj0IsZOf4gJqCkF8DrejoCBMFHqeON2uYH2T6/K0MF5FkyTMMbvPo4GlInny1ePQYoG QvyqqFum+Fc9LYENlWIT5wtORDIYaP5NE0FWDuKxcLPzXCrRTr/Rys05psmHLBns40W1 tIDOW70yDvuSKOi7vRL1az33/PRxnLL/mOikm7wGzRHwo2KG/KegygNZKHiSwA0p//ZR /YIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=UBRLflv0ERmYWEGxux8KOqlDY0ttAP+wczhdOTWc7q0=; b=E42xpLb0OgcsOticlVWlZueYBtLmYEHBPmlbar8vqvnwFuxUGE/ezqiO54O+UCAEv3 bbIKuElj5uwvuhS3dPHGQM76pnQxuytuVzdx8UpTJ3XxPzpShDPiOl45+MRHXRgwgbRT IcVE9UsM67ECqIeNu7Rcp5PwcGEmlQeYVp1MT/2eiLIaWXR7yi06jhTYoYfX0peY2Fen 2/D/PYI7i8vJihp0ixFtyH+ZYEAZSo7ik9yxXuQgcmDuDaCZy/2thY1UZQz3gkim8sK2 qj+DtX2EEj7hEas0rFtvngOfKnUrkAED4kmkkV+KP4gqAMgTXQpyRDs4WXLwLYqvJa7T i5Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=h6ePJYur; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e4-20020a170906314400b008ccf9fd2186si10856309eje.867.2023.03.07.14.08.44; Tue, 07 Mar 2023 14:09:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=h6ePJYur; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230037AbjCGVgB (ORCPT <rfc822;toshivichauhan@gmail.com> + 99 others); Tue, 7 Mar 2023 16:36:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229956AbjCGVf7 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 7 Mar 2023 16:35:59 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34A12A8808 for <linux-kernel@vger.kernel.org>; Tue, 7 Mar 2023 13:35:49 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-536c039f859so150658357b3.21 for <linux-kernel@vger.kernel.org>; Tue, 07 Mar 2023 13:35:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678224948; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=UBRLflv0ERmYWEGxux8KOqlDY0ttAP+wczhdOTWc7q0=; b=h6ePJYurdp6mVaZhTcXLSGIV8hbDFCoivfyXcPh2EeTMhPrB8iO8CL8lk5emJrslV2 pKzBWiayBqsS8mEOVZFdHBSYj12D/0YORA8xV8xvBeOt4igBBNkCFStqKkCWa0nOUYuE ts2zPRkBvHy9+dF6i+GUCHQrOzoZYdaa5Va6KIcu67GB2GbWvI72A04YmpWm2juj8S9w PP82f6TvEoOLLQ3RCxcawjj6/L6X8FVFX23WSronerhSVradTU3C3pMc+NZIm8PjWfMC EVSfSeICTXRpw0grj8A5LL4cEcd0mK/pPFOu28fDkv0/tjGpVKm1P9lzf6Qp521CVqy3 Ag0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678224948; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UBRLflv0ERmYWEGxux8KOqlDY0ttAP+wczhdOTWc7q0=; b=nr5dIUVr3f+Vp6SkobkUpW9Lp+oqDhZ4Hnognn0jT6XNjkBB1BO94d/rWHoA+IF1eI JwEw6bFkJVQc0mU0BzS4psa2aQYc+b98IK9XdNaSkIBpF/r+d6rzQ+2lSHwP1CBJVxBM HfEAuRZzxPY4lMnWOl0QB+v4T1SD/8eknafTAVdRuYhKyCxZ992Nr6v+nKRSFtFVoZUf vyTc8doPzMEzFxW7KuD0v9xl5yATVP78Ka9REl+iJvUSudV7NKhvRKlW9ZvwkJ+jGDo4 FawUOt8I9pi7IBg8nWnoz8oXE5ujGF1lYwUXeqN8fd6BMB6G7YXDGGs9Y/tAEnIUa/cN YLZg== X-Gm-Message-State: AO0yUKXzHKAjAQDqD0FAIrZj6JvVyZDPWk2tN0cG23lJaoXr7N/C6mBP mzZiQv+Pvu2fODl97rJbh3xtSXQ= X-Received: from svv.mtv.corp.google.com ([2620:15c:211:202:94a9:c9e2:405f:e3be]) (user=svv job=sendgmr) by 2002:a5b:c84:0:b0:b1a:64ba:9cb5 with SMTP id i4-20020a5b0c84000000b00b1a64ba9cb5mr1766785ybq.1.1678224948418; Tue, 07 Mar 2023 13:35:48 -0800 (PST) Date: Tue, 7 Mar 2023 13:35:36 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.0.rc0.216.gc4246ad0f0-goog Message-ID: <20230307213536.2299487-1-svv@google.com> Subject: [PATCH v2] Add rumble support to latest xbox controllers From: Siarhei Vishniakou <svv@google.com> To: Jiri Kosina <jikos@kernel.org>, Benjamin Tissoires <benjamin.tissoires@redhat.com>, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Siarhei Vishniakou <svv@google.com> Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759748500064744454?= X-GMAIL-MSGID: =?utf-8?q?1759748500064744454?= |
Series |
[v2] Add rumble support to latest xbox controllers
|
|
Commit Message
Siarhei Vishniakou
March 7, 2023, 9:35 p.m. UTC
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.
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.
Signed-off-by: Siarhei Vishniakou <svv@google.com>
Change-Id: I3337a7ab5f40759c85bf67bf0dbe5d4de31ce1ff
---
drivers/hid/hid-ids.h | 6 +++++-
drivers/hid/hid-microsoft.c | 11 ++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
Comments
On Tue, 2023-03-07 at 13:35 -0800, Siarhei Vishniakou wrote: > 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. > > 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. Looks good although I would personally have preferred separate patches for each controller. Reviewed-by: Bastien Nocera <hadess@hadess.net> Would a link to: https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary also be useful to make which model is which clearer in the minds of future readers? Cheers > > Signed-off-by: Siarhei Vishniakou <svv@google.com> > Change-Id: I3337a7ab5f40759c85bf67bf0dbe5d4de31ce1ff > --- > drivers/hid/hid-ids.h | 6 +++++- > drivers/hid/hid-microsoft.c | 11 ++++++++++- > 2 files changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 053853a891c5..c9b75f8ba49a 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -903,7 +903,11 @@ > #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 > #define USB_DEVICE_ID_MS_POWER_COVER 0x07da > #define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de > -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd > +#define > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20 > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13 > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05 > +#define > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22 > #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb > #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 > > diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid- > microsoft.c > index 071fd093a5f4..9345e2bfd56e 100644 > --- a/drivers/hid/hid-microsoft.c > +++ b/drivers/hid/hid-microsoft.c > @@ -446,7 +446,16 @@ static const struct hid_device_id ms_devices[] = > { > .driver_data = MS_PRESENTER }, > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B), > .driver_data = MS_SURFACE_DIAL }, > - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), > + > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708), > + .driver_data = MS_QUIRK_FF }, > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE), > + .driver_data = MS_QUIRK_FF }, > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914), > + .driver_data = MS_QUIRK_FF }, > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797), > + .driver_data = MS_QUIRK_FF }, > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE), > .driver_data = MS_QUIRK_FF }, > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS), > .driver_data = MS_QUIRK_FF },
Thanks Bastien! I can definitely add a link to the wikipedia page. Are you talking about adding the link to the commit message, or to hid-ids.h ? On Wed, Mar 8, 2023 at 2:23 AM Bastien Nocera <hadess@hadess.net> wrote: > > On Tue, 2023-03-07 at 13:35 -0800, Siarhei Vishniakou wrote: > > 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. > > > > 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. > > Looks good although I would personally have preferred separate patches > for each controller. > > Reviewed-by: Bastien Nocera <hadess@hadess.net> > > Would a link to: > https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary > also be useful to make which model is which clearer in the minds of > future readers? > > Cheers > > > > > Signed-off-by: Siarhei Vishniakou <svv@google.com> > > Change-Id: I3337a7ab5f40759c85bf67bf0dbe5d4de31ce1ff > > --- > > drivers/hid/hid-ids.h | 6 +++++- > > drivers/hid/hid-microsoft.c | 11 ++++++++++- > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > > index 053853a891c5..c9b75f8ba49a 100644 > > --- a/drivers/hid/hid-ids.h > > +++ b/drivers/hid/hid-ids.h > > @@ -903,7 +903,11 @@ > > #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 > > #define USB_DEVICE_ID_MS_POWER_COVER 0x07da > > #define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de > > -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd > > +#define > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20 > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13 > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05 > > +#define > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22 > > #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb > > #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 > > > > diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid- > > microsoft.c > > index 071fd093a5f4..9345e2bfd56e 100644 > > --- a/drivers/hid/hid-microsoft.c > > +++ b/drivers/hid/hid-microsoft.c > > @@ -446,7 +446,16 @@ static const struct hid_device_id ms_devices[] = > > { > > .driver_data = MS_PRESENTER }, > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B), > > .driver_data = MS_SURFACE_DIAL }, > > - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), > > + > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708), > > + .driver_data = MS_QUIRK_FF }, > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE), > > + .driver_data = MS_QUIRK_FF }, > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914), > > + .driver_data = MS_QUIRK_FF }, > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797), > > + .driver_data = MS_QUIRK_FF }, > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE), > > .driver_data = MS_QUIRK_FF }, > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS), > > .driver_data = MS_QUIRK_FF }, >
On Wed, 2023-03-08 at 09:55 -0800, Siarhei Vishniakou wrote: > Thanks Bastien! > > I can definitely add a link to the wikipedia page. > > Are you talking about adding the link to the commit message, or to > hid-ids.h ? I think the commit message would be enough so we know which device we're talking about, but now that you mention it, maybe the source code would be a good idea too. As far as I've understood, and Benjamin can correct me, we don't need to have IDs be in hid-ids.h because we don't need to declare them both as a blocklist in the hid core, and then again in the driver itself. My take is that the patches could move the IDs from hid-ids.h to hid- microsoft.c as they're changed. You then wouldn't need the macros, just add a comment for each of variants, and that Wikipedia article can be linked above the whole XBox controller section. What do you think? > > > On Wed, Mar 8, 2023 at 2:23 AM Bastien Nocera <hadess@hadess.net> > wrote: > > > > On Tue, 2023-03-07 at 13:35 -0800, Siarhei Vishniakou wrote: > > > 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. > > > > > > 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. > > > > Looks good although I would personally have preferred separate > > patches > > for each controller. > > > > Reviewed-by: Bastien Nocera <hadess@hadess.net> > > > > Would a link to: > > https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary > > also be useful to make which model is which clearer in the minds of > > future readers? > > > > Cheers > > > > > > > > Signed-off-by: Siarhei Vishniakou <svv@google.com> > > > Change-Id: I3337a7ab5f40759c85bf67bf0dbe5d4de31ce1ff > > > --- > > > drivers/hid/hid-ids.h | 6 +++++- > > > drivers/hid/hid-microsoft.c | 11 ++++++++++- > > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > > > index 053853a891c5..c9b75f8ba49a 100644 > > > --- a/drivers/hid/hid-ids.h > > > +++ b/drivers/hid/hid-ids.h > > > @@ -903,7 +903,11 @@ > > > #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 > > > #define USB_DEVICE_ID_MS_POWER_COVER 0x07da > > > #define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de > > > -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd > > > +#define > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20 > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13 > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05 > > > +#define > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22 > > > #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb > > > #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 > > > > > > diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid- > > > microsoft.c > > > index 071fd093a5f4..9345e2bfd56e 100644 > > > --- a/drivers/hid/hid-microsoft.c > > > +++ b/drivers/hid/hid-microsoft.c > > > @@ -446,7 +446,16 @@ static const struct hid_device_id > > > ms_devices[] = > > > { > > > .driver_data = MS_PRESENTER }, > > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B), > > > .driver_data = MS_SURFACE_DIAL }, > > > - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), > > > + > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708), > > > + .driver_data = MS_QUIRK_FF }, > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE), > > > + .driver_data = MS_QUIRK_FF }, > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914), > > > + .driver_data = MS_QUIRK_FF }, > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797), > > > + .driver_data = MS_QUIRK_FF }, > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE), > > > .driver_data = MS_QUIRK_FF }, > > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS), > > > .driver_data = MS_QUIRK_FF }, > >
On Wed, Mar 8, 2023 at 7:54 PM Bastien Nocera <hadess@hadess.net> wrote: > > On Wed, 2023-03-08 at 09:55 -0800, Siarhei Vishniakou wrote: > > Thanks Bastien! > > > > I can definitely add a link to the wikipedia page. > > > > Are you talking about adding the link to the commit message, or to > > hid-ids.h ? > > I think the commit message would be enough so we know which device > we're talking about, but now that you mention it, maybe the source code > would be a good idea too. Agree, adding the link in the source would be fine. > > As far as I've understood, and Benjamin can correct me, we don't need > to have IDs be in hid-ids.h because we don't need to declare them both > as a blocklist in the hid core, and then again in the driver itself. We don't need to have the blocklist anymore, but using hid-ids.h is still used, and sometimes has the benefit of raising eyebrows when you add support for a new device and realize that it was already defined. So keeping the list around is not so much of a bad thing. > > My take is that the patches could move the IDs from hid-ids.h to hid- > microsoft.c as they're changed. You then wouldn't need the macros, just > add a comment for each of variants, and that Wikipedia article can be > linked above the whole XBox controller section. We are definitely in the bikeshedding phase, but I would leave the code as it is in this patch :) One more comment below: > > What do you think? > > > > > > > On Wed, Mar 8, 2023 at 2:23 AM Bastien Nocera <hadess@hadess.net> > > wrote: > > > > > > On Tue, 2023-03-07 at 13:35 -0800, Siarhei Vishniakou wrote: > > > > 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. > > > > > > > > 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. > > > > > > Looks good although I would personally have preferred separate > > > patches > > > for each controller. > > > > > > Reviewed-by: Bastien Nocera <hadess@hadess.net> > > > > > > Would a link to: > > > https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary > > > also be useful to make which model is which clearer in the minds of > > > future readers? > > > > > > Cheers > > > > > > > > > > > Signed-off-by: Siarhei Vishniakou <svv@google.com> > > > > Change-Id: I3337a7ab5f40759c85bf67bf0dbe5d4de31ce1ff That change-id should be dropped, it has no meaning to us. Cheers, Benjamin > > > > --- > > > > drivers/hid/hid-ids.h | 6 +++++- > > > > drivers/hid/hid-microsoft.c | 11 ++++++++++- > > > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > > > > index 053853a891c5..c9b75f8ba49a 100644 > > > > --- a/drivers/hid/hid-ids.h > > > > +++ b/drivers/hid/hid-ids.h > > > > @@ -903,7 +903,11 @@ > > > > #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 > > > > #define USB_DEVICE_ID_MS_POWER_COVER 0x07da > > > > #define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de > > > > -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd > > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd > > > > +#define > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20 > > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13 > > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05 > > > > +#define > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22 > > > > #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb > > > > #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 > > > > > > > > diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid- > > > > microsoft.c > > > > index 071fd093a5f4..9345e2bfd56e 100644 > > > > --- a/drivers/hid/hid-microsoft.c > > > > +++ b/drivers/hid/hid-microsoft.c > > > > @@ -446,7 +446,16 @@ static const struct hid_device_id > > > > ms_devices[] = > > > > { > > > > .driver_data = MS_PRESENTER }, > > > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B), > > > > .driver_data = MS_SURFACE_DIAL }, > > > > - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), > > > > + > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708), > > > > + .driver_data = MS_QUIRK_FF }, > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE), > > > > + .driver_data = MS_QUIRK_FF }, > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914), > > > > + .driver_data = MS_QUIRK_FF }, > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797), > > > > + .driver_data = MS_QUIRK_FF }, > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE), > > > > .driver_data = MS_QUIRK_FF }, > > > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS), > > > > .driver_data = MS_QUIRK_FF }, > > > >
Thanks folks, I uploaded a v3 patch with the following changes: 1. Added link to wikipedia 2. Removed Change-Id from commit message 3. Added Bastien's 'Reviewed-by'. On Thu, Mar 9, 2023 at 6:56 AM Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > On Wed, Mar 8, 2023 at 7:54 PM Bastien Nocera <hadess@hadess.net> wrote: > > > > On Wed, 2023-03-08 at 09:55 -0800, Siarhei Vishniakou wrote: > > > Thanks Bastien! > > > > > > I can definitely add a link to the wikipedia page. > > > > > > Are you talking about adding the link to the commit message, or to > > > hid-ids.h ? > > > > I think the commit message would be enough so we know which device > > we're talking about, but now that you mention it, maybe the source code > > would be a good idea too. > > Agree, adding the link in the source would be fine. > > > > > As far as I've understood, and Benjamin can correct me, we don't need > > to have IDs be in hid-ids.h because we don't need to declare them both > > as a blocklist in the hid core, and then again in the driver itself. > > We don't need to have the blocklist anymore, but using hid-ids.h is > still used, and sometimes has the benefit of raising eyebrows when you > add support for a new device and realize that it was already defined. > So keeping the list around is not so much of a bad thing. > > > > > My take is that the patches could move the IDs from hid-ids.h to hid- > > microsoft.c as they're changed. You then wouldn't need the macros, just > > add a comment for each of variants, and that Wikipedia article can be > > linked above the whole XBox controller section. > > We are definitely in the bikeshedding phase, but I would leave the > code as it is in this patch :) > > One more comment below: > > > > > What do you think? > > > > > > > > > > > On Wed, Mar 8, 2023 at 2:23 AM Bastien Nocera <hadess@hadess.net> > > > wrote: > > > > > > > > On Tue, 2023-03-07 at 13:35 -0800, Siarhei Vishniakou wrote: > > > > > 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. > > > > > > > > > > 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. > > > > > > > > Looks good although I would personally have preferred separate > > > > patches > > > > for each controller. > > > > > > > > Reviewed-by: Bastien Nocera <hadess@hadess.net> > > > > > > > > Would a link to: > > > > https://en.wikipedia.org/wiki/Xbox_Wireless_Controller#Summary > > > > also be useful to make which model is which clearer in the minds of > > > > future readers? > > > > > > > > Cheers > > > > > > > > > > > > > > Signed-off-by: Siarhei Vishniakou <svv@google.com> > > > > > Change-Id: I3337a7ab5f40759c85bf67bf0dbe5d4de31ce1ff > > That change-id should be dropped, it has no meaning to us. > > Cheers, > Benjamin > > > > > > --- > > > > > drivers/hid/hid-ids.h | 6 +++++- > > > > > drivers/hid/hid-microsoft.c | 11 ++++++++++- > > > > > 2 files changed, 15 insertions(+), 2 deletions(-) > > > > > > > > > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > > > > > index 053853a891c5..c9b75f8ba49a 100644 > > > > > --- a/drivers/hid/hid-ids.h > > > > > +++ b/drivers/hid/hid-ids.h > > > > > @@ -903,7 +903,11 @@ > > > > > #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 > > > > > #define USB_DEVICE_ID_MS_POWER_COVER 0x07da > > > > > #define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de > > > > > -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd > > > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd > > > > > +#define > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20 > > > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13 > > > > > +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05 > > > > > +#define > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22 > > > > > #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb > > > > > #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 > > > > > > > > > > diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid- > > > > > microsoft.c > > > > > index 071fd093a5f4..9345e2bfd56e 100644 > > > > > --- a/drivers/hid/hid-microsoft.c > > > > > +++ b/drivers/hid/hid-microsoft.c > > > > > @@ -446,7 +446,16 @@ static const struct hid_device_id > > > > > ms_devices[] = > > > > > { > > > > > .driver_data = MS_PRESENTER }, > > > > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B), > > > > > .driver_data = MS_SURFACE_DIAL }, > > > > > - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), > > > > > + > > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708), > > > > > + .driver_data = MS_QUIRK_FF }, > > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE), > > > > > + .driver_data = MS_QUIRK_FF }, > > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914), > > > > > + .driver_data = MS_QUIRK_FF }, > > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797), > > > > > + .driver_data = MS_QUIRK_FF }, > > > > > + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE), > > > > > .driver_data = MS_QUIRK_FF }, > > > > > { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, > > > > > USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS), > > > > > .driver_data = MS_QUIRK_FF }, > > > > > > >
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 053853a891c5..c9b75f8ba49a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -903,7 +903,11 @@ #define USB_DEVICE_ID_MS_TYPE_COVER_2 0x07a9 #define USB_DEVICE_ID_MS_POWER_COVER 0x07da #define USB_DEVICE_ID_MS_SURFACE3_COVER 0x07de -#define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708 0x02fd +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE 0x0b20 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914 0x0b13 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797 0x0b05 +#define USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE 0x0b22 #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 071fd093a5f4..9345e2bfd56e 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -446,7 +446,16 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_PRESENTER }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, 0x091B), .driver_data = MS_SURFACE_DIAL }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER), + + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708), + .driver_data = MS_QUIRK_FF }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1708_BLE), + .driver_data = MS_QUIRK_FF }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1914), + .driver_data = MS_QUIRK_FF }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797), + .driver_data = MS_QUIRK_FF }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_XBOX_CONTROLLER_MODEL_1797_BLE), .driver_data = MS_QUIRK_FF }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS), .driver_data = MS_QUIRK_FF },