From nobody Tue Apr 7 10:37:52 2026 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60FC95733E for ; Tue, 7 Apr 2026 06:59:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775545184; cv=none; b=o0uzaNBrBi2ytylD/5CciuNHFOfTLTyGz6VAHdXdJLyX8GV9cU4eCgaP4So/Rcb9Fty9EYPxU9+CSOkBhbv7OkR9r73emav5bxa90Jo7z3ahh3AJDeOoc/WOHC6h72MX6hEeHtSIz3NYXAB0lJx81X01F04K45n0xYP1uDNqGOw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775545184; c=relaxed/simple; bh=VzmxE1QFhQSLAdGbqYtre80ldADwx5PQfuj64jNcGG0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=s5MRNagd7B7N+ZSd8yjPRS4gdVag1sgnpX4ZbdnwLhV7iMX1bi0lXOJuv34Smmr92eIK7tq1RSz88oJ7Qnlnbvm8bN0MejJokQsR2y9y5me1L7e/+w5dnGg3vuQfJ9NdiCiCwkmw3YSILWGYlUOI2gfSK277siqP9fGjmfR88k4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=r9Cs8JoE; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="r9Cs8JoE" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ad9516a653so23359875ad.0 for ; Mon, 06 Apr 2026 23:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775545179; x=1776149979; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=luTBe574fJaIli+cXVaMHg3qhOHP9a6MUJzfWGUyjmc=; b=r9Cs8JoE72aYWm8yygCUpHjIVqnX/hqAZ9tOXY0L+T+3jM0SiYi7Sx1CfHFkO+J/Du BZGP7874ZAiqokEMNsrwdQLnMkczQ5gZBw76q3krQdZzUhGLsK1/wh/QjXIkbau1s4dP cXI19NDODnMbvLdn5xQc9A0XCc44Ea09+TooQgcGsBMOXquqOWy4YHitsuGoaNOWLb6j z545qT1IvjACzU7j4DvjZuV245gzMOUdw4QiC1KYdREswXRsn+LEyLBhLF8AiqnKnpN5 Q901U9/I2dSAajTG0dQIuSe4bcV9sVJie7Kvp8M5ucsIkqxCx6AihOWQuzntZKdqPQWL q6RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775545179; x=1776149979; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=luTBe574fJaIli+cXVaMHg3qhOHP9a6MUJzfWGUyjmc=; b=WwGXty2lIoM0q+/c3Ah8v+Itis8yTOtOq3e+IWjECeacNu7Xm2T3GkdHsYAJ+4cDxh 8u/YGfDdjGyv6VYyrZJTM+4ziWJVOYP13v317BrdbAIT5JcbEqExBazToBWtYo1AjRaE 9fAyFMpZ+J5ZjxIBMqyr3A9/F/F2jN5UxlQr8UJzHkKnsTa0SKo62bR69KF25YW7IhCr 4228Oed85IVwKAaW4o6b/gL+QOhHpJ0/x7t4umpvvMZr6Csrc9ZciaMLJmovk0l0SbNp L+KofeyRGm3DLlxBaU2cJd5OLmHyW66UF10bEhxP2oZyeHedXOBftaTBRw7NJpeqn4nP 4psQ== X-Forwarded-Encrypted: i=1; AJvYcCVigDvj0xXeUC9CL/30UykvjRm4864ed6kbUD6uP0Ovyd3MP0BKZ1HDO0X4uGoq3ApDc1BpBQpypMqFvcM=@vger.kernel.org X-Gm-Message-State: AOJu0YxLOkyjWf3zKdSR+2HzD1sdmsE1lvxJqTwGeGkIddpa3S3SLsbq r3XkIskzW8HmF6D2tXv9q5BpmjAkO2ny/H0a/5NdwqFl5k6eg5b+D/AcjV2NqvhS X-Gm-Gg: AeBDietOkHJnMXg9GA5ax6fSwDrcctNfQu3t1N3SaoUSN3x6gRsRPFOYFGq1Dok0BXr 1yDW6BdPUg+EVMMA+aszXolS2AvjNKQqy6TkaMxWznw6fXz2XB0rnJdp6wWr2oxl5uWCiMvK35T J+CLRhPI1iL9z2nuZOQ3S+1PFjSooyZYuhVrgEicVJBqTkbvVpTHWvr3P0qFPXDZaFYQ+leozY+ UgcrNeZbeGrqvScugc/c2XfEWKoJoC6LWOFE6sFBx5LrJADeeNxC7yFhCW90J5oXaelHDdkY8XC JJkYi6N8oEg0GrIvVr5x8AjOiTxG//yw+0lVkHNlAAEeP47fTy1agPDGP1yAMPF0/jn0+jYUnfQ VeJY436WEx4RYA6fbNAyKOif6b/fnFvNK7Oh310sScdUySi2j9j2boB9eHnj3aUWuHM0BumRvK6 HfgNWKsGMjpnWxUBzPQxvhrMYkkp021HYyiJaDSYbgP3bHUtPN9jpi8MbA8HnWlTeqwD5b3N+wn 1lmBihfrphXTHCIfvCyS8PUYhZW08GT6zCeF8oWp92JwOd7FxiYisnQPyXvAo28tA== X-Received: by 2002:a17:903:40cc:b0:2b2:9f9f:fe6b with SMTP id d9443c01a7336-2b29f9fff92mr80948015ad.40.1775545179479; Mon, 06 Apr 2026 23:59:39 -0700 (PDT) Received: from sanjays-pc.govzhome.govindz.co.nz ([139.180.64.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b274f8867csm165860985ad.54.2026.04.06.23.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 23:59:38 -0700 (PDT) From: Sanjay Govind To: Dmitry Torokhov , Vicki Pfau , Sanjay Govind , Mario Limonciello , Nilton Perim Neto , Kees Cook Cc: Antheas Kapenekakis , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] xpad: Overhaul device data for wireless devices Date: Tue, 7 Apr 2026 18:57:39 +1200 Message-ID: <20260407065740.2035240-3-sanjay.govind9@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Xbox 360 wireless controllers expose information in the link and capabilities reports. Extract and use the vendor id for wireless controllers, and use the subtype to build a nicer device name and product id. Some xbox 360 controllers put a vid and pid into the stick capability data, so check if this was done, and pull the vid, pid and revision from there. Signed-off-by: Sanjay Govind --- v2: Delay marking device as present until after capabilities or timeout v3: Fix issues when receiving incorrect or missing link and capabilities re= ports drivers/input/joystick/xpad.c | 174 ++++++++++++++++++++++++++++++++-- 1 file changed, 165 insertions(+), 9 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index bf4accf3f581..18c355aff80f 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -68,6 +68,7 @@ #include #include #include +#include #include #include =20 @@ -94,6 +95,22 @@ #define XTYPE_XBOXONE 3 #define XTYPE_UNKNOWN 4 =20 +#define FLAG_FORCE_FEEDBACK 0x01 + +#define SUBTYPE_GAMEPAD 0x01 +#define SUBTYPE_WHEEL 0x02 +#define SUBTYPE_ARCADE_STICK 0x03 +#define SUBTYPE_FLIGHT_SICK 0x04 +#define SUBTYPE_DANCE_PAD 0x05 +#define SUBTYPE_GUITAR 0x06 +#define SUBTYPE_GUITAR_ALTERNATE 0x07 +#define SUBTYPE_DRUM_KIT 0x08 +#define SUBTYPE_GUITAR_BASS 0x0B +#define SUBTYPE_RB_KEYBOARD 0x0F +#define SUBTYPE_ARCADE_PAD 0x13 +#define SUBTYPE_TURNTABLE 0x17 +#define SUBTYPE_PRO_GUITAR 0x19 + /* Send power-off packet to xpad360w after holding the mode button for thi= s many * seconds */ @@ -795,8 +812,13 @@ struct usb_xpad { int xtype; /* type of xbox device */ int packet_type; /* type of the extended packet */ int pad_nr; /* the order x360 pads were attached */ + u8 sub_type; + u16 flags; + u16 wireless_vid; + u16 wireless_pid; + u16 wireless_version; const char *name; /* name of the device */ - struct work_struct work; /* init/remove device from callback */ + struct delayed_work work; /* init/remove device from callback */ time64_t mode_btn_down_ts; bool delay_init; /* init packets should be delayed */ bool delayed_init_done; @@ -807,6 +829,8 @@ static void xpad_deinit_input(struct usb_xpad *xpad); static int xpad_start_input(struct usb_xpad *xpad); static void xpadone_ack_mode_report(struct usb_xpad *xpad, u8 seq_num); static void xpad360w_poweroff_controller(struct usb_xpad *xpad); +static int xpad_inquiry_pad_capabilities(struct usb_xpad *xpad); + =20 /* * xpad_process_packet @@ -980,7 +1004,7 @@ static void xpad360_process_packet(struct usb_xpad *xp= ad, struct input_dev *dev, =20 static void xpad_presence_work(struct work_struct *work) { - struct usb_xpad *xpad =3D container_of(work, struct usb_xpad, work); + struct usb_xpad *xpad =3D container_of(work, struct usb_xpad, work.work); int error; =20 if (xpad->pad_present) { @@ -1017,7 +1041,7 @@ static void xpad_presence_work(struct work_struct *wo= rk) * 01.1 - Pad state (Bytes 4+) valid * */ -static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsign= ed char *data) +static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsign= ed char *data, u32 len) { struct input_dev *dev; bool present; @@ -1028,7 +1052,62 @@ static void xpad360w_process_packet(struct usb_xpad = *xpad, u16 cmd, unsigned cha =20 if (xpad->pad_present !=3D present) { xpad->pad_present =3D present; - schedule_work(&xpad->work); + if (present) { + /* + * Delay marking device as present, so we can make sure + * we have received all the information from the capabilities + * report. Some devices don't send one, so the delay + * guarantees that these devices are still initialized. + */ + schedule_delayed_work(&xpad->work, msecs_to_jiffies(500)); + } else { + schedule_delayed_work(&xpad->work, 0); + } + } + } + + /* Link report */ + if (data[0] =3D=3D 0x00 && data[1] =3D=3D 0x0F && len >=3D 26) { + xpad->sub_type =3D data[25] & 0x7f; + + /* Decode vendor id from link report */ + xpad->wireless_vid =3D ((data[0x16] & 0xf) | data[0x18] << 4) << 8 | dat= a[0x17]; + + /* + * If the link report doesn't provide a proper vid, it sets the vid to 1. + * In that case we zero out wireless_vid, so that we fall back to the vid + * from the receiver instead. + */ + if (xpad->wireless_vid =3D=3D 1) + xpad->wireless_vid =3D 0; + /* + * x360w controllers on windows put the subtype into the product + * for wheels and gamepads, but it makes sense to do it for all + * subtypes. This will be used if the capabilities report + * doesn't provide us with a product id later. + */ + xpad->wireless_pid =3D 0x02a0 + xpad->sub_type; + xpad->wireless_version =3D 0; + + if ((data[25] & 0x80) !=3D 0) + xpad->flags |=3D FLAG_FORCE_FEEDBACK; + + xpad_inquiry_pad_capabilities(xpad); + } + + /* Capabilities report */ + if (data[0] =3D=3D 0x00 && data[1] =3D=3D 0x05 && data[5] =3D=3D 0x12 && = len >=3D 20) { + xpad->flags |=3D data[20]; + /* + * A bunch of vendors started putting vids and pids + * into capabilities data because they can't be + * retrieved by xinput easliy. + * Not all of them do though, so check the vids match + * before extracting that info. + */ + if (get_unaligned_le16(data + 10) =3D=3D xpad->wireless_vid) { + xpad->wireless_pid =3D get_unaligned_le16(data + 12); + xpad->wireless_version =3D get_unaligned_le16(data + 14); } } =20 @@ -1254,7 +1333,7 @@ static void xpad_irq_in(struct urb *urb) xpad360_process_packet(xpad, xpad->dev, 0, xpad->idata); break; case XTYPE_XBOX360W: - xpad360w_process_packet(xpad, 0, xpad->idata); + xpad360w_process_packet(xpad, 0, xpad->idata, urb->actual_length); break; case XTYPE_XBOXONE: xpadone_process_packet(xpad, 0, xpad->idata, urb->actual_length); @@ -1495,6 +1574,31 @@ static int xpad_inquiry_pad_presence(struct usb_xpad= *xpad) return xpad_try_sending_next_out_packet(xpad); } =20 +static int xpad_inquiry_pad_capabilities(struct usb_xpad *xpad) +{ + struct xpad_output_packet *packet =3D + &xpad->out_packets[XPAD_OUT_CMD_IDX]; + + guard(spinlock_irqsave)(&xpad->odata_lock); + + packet->data[0] =3D 0x00; + packet->data[1] =3D 0x00; + packet->data[2] =3D 0x02; + packet->data[3] =3D 0x80; + packet->data[4] =3D 0x00; + packet->data[5] =3D 0x00; + packet->data[6] =3D 0x00; + packet->data[7] =3D 0x00; + packet->data[8] =3D 0x00; + packet->data[9] =3D 0x00; + packet->data[10] =3D 0x00; + packet->data[11] =3D 0x00; + packet->len =3D 12; + packet->pending =3D true; + + return xpad_try_sending_next_out_packet(xpad); +} + static int xpad_start_xbox_one(struct usb_xpad *xpad) { int error; @@ -1893,7 +1997,7 @@ static void xpad360w_stop_input(struct usb_xpad *xpad) usb_kill_urb(xpad->irq_in); =20 /* Make sure we are done with presence work if it was scheduled */ - flush_work(&xpad->work); + flush_delayed_work(&xpad->work); } =20 static int xpad_open(struct input_dev *dev) @@ -1965,8 +2069,60 @@ static int xpad_init_input(struct usb_xpad *xpad) usb_to_input_id(xpad->udev, &input_dev->id); =20 if (xpad->xtype =3D=3D XTYPE_XBOX360W) { - /* x360w controllers and the receiver have different ids */ - input_dev->id.product =3D 0x02a1; + if (xpad->wireless_vid) + input_dev->id.vendor =3D xpad->wireless_vid; + if (xpad->wireless_pid) + input_dev->id.product =3D xpad->wireless_pid; + else + /* Default product id for x360w controllers */ + input_dev->id.product =3D 0x02a1; + if (xpad->wireless_version) + input_dev->id.version =3D xpad->wireless_version; + switch (xpad->sub_type) { + case SUBTYPE_GAMEPAD: + input_dev->name =3D "Xbox 360 Wireless Controller"; + break; + case SUBTYPE_WHEEL: + input_dev->name =3D "Xbox 360 Wireless Wheel"; + break; + case SUBTYPE_ARCADE_STICK: + input_dev->name =3D "Xbox 360 Wireless Arcade Stick"; + break; + case SUBTYPE_FLIGHT_SICK: + input_dev->name =3D "Xbox 360 Wireless Flight Stick"; + break; + case SUBTYPE_DANCE_PAD: + input_dev->name =3D "Xbox 360 Wireless Dance Pad"; + break; + case SUBTYPE_GUITAR: + input_dev->name =3D "Xbox 360 Wireless Guitar"; + break; + case SUBTYPE_GUITAR_ALTERNATE: + input_dev->name =3D "Xbox 360 Wireless Alternate Guitar"; + break; + case SUBTYPE_GUITAR_BASS: + input_dev->name =3D "Xbox 360 Wireless Bass Guitar"; + break; + case SUBTYPE_DRUM_KIT: + /* Vendors used force feedback flag to differentiate these */ + if (xpad->flags & FLAG_FORCE_FEEDBACK) + input_dev->name =3D "Xbox 360 Wireless Guitar Hero Drum Kit"; + else + input_dev->name =3D "Xbox 360 Wireless Rock Band Drum Kit"; + break; + case SUBTYPE_RB_KEYBOARD: + input_dev->name =3D "Xbox 360 Wireless Rock Band Keyboard"; + break; + case SUBTYPE_ARCADE_PAD: + input_dev->name =3D "Xbox 360 Wireless Arcade Pad"; + break; + case SUBTYPE_TURNTABLE: + input_dev->name =3D "Xbox 360 Wireless DJ Hero Turntable"; + break; + case SUBTYPE_PRO_GUITAR: + input_dev->name =3D "Xbox 360 Wireless Rock Band Pro Guitar"; + break; + } } =20 input_dev->dev.parent =3D &xpad->intf->dev; @@ -2106,7 +2262,7 @@ static int xpad_probe(struct usb_interface *intf, con= st struct usb_device_id *id xpad->delay_init =3D true; =20 xpad->packet_type =3D PKT_XB; - INIT_WORK(&xpad->work, xpad_presence_work); + INIT_DELAYED_WORK(&xpad->work, xpad_presence_work); =20 if (xpad->xtype =3D=3D XTYPE_UNKNOWN) { if (intf->cur_altsetting->desc.bInterfaceClass =3D=3D USB_CLASS_VENDOR_S= PEC) { --=20 2.53.0