From nobody Wed Apr 8 18:03:04 2026 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 31AE324503B for ; Tue, 7 Apr 2026 19:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775589646; cv=none; b=cL58ynVA8MFicPFEnd71oVjlfxxs0CLI7s4MfEowr0a2Lp3BPz7U4LKpqTKAQDfXWRNKOBG789lDF+9RYNrWHJ24A0yJ1XalBrj5R583FuhZ/paAUz3Rtf+gQWc1RSeXH6gHHx6MLWs7IoF7AKJ7NmmLXf9gshC0dIzYi0IxUXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775589646; c=relaxed/simple; bh=aESIEwxM0gLMvBgQFVFiv/mzhsgDSflE6QsbWL34NBQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FhwM+Bbrk7zs1TlLStbKTyKo/Fsl9bInQP9T7kDrri42z3xoGNl3BabQVPvLoz6jOYye0TpNw8c1loS3xEfkywM6iprvT3qIjzFLXYDoif+xSDKmMlJH81r89enL5pY5RXT5P6bQ7lsZa80H7hi9I1jkmAJ34w2XRLHZxpo06XA= 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=jgTl2FF1; arc=none smtp.client-ip=209.85.214.181 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="jgTl2FF1" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-2aaf43014d0so37964145ad.2 for ; Tue, 07 Apr 2026 12:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775589643; x=1776194443; 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=0O7DuTZ+D85au3JMLP+CFqFmga9iJn/jwHe9ZeB2Ij0=; b=jgTl2FF1uRkq766OsJdFX0KlWDMap4vzQc5NYQGWvUJw/jNSm2F4pqYegSWb94kYlN r27eD8d91iQAYwrFUGHRsYZDGZ968QDp9FpPi9OZ6/RJloJXaIf5ReMQH4BKcFsWU0FT QSZ3rwkYSq9p/MeYU7/2CiFG1XGzLv/Y3SDvNygrJTgW1KrmkkQKraouuSTEOukj69u+ bNlP0AkphSX9j3waWXqHUw3zpnAWV8Zff6yXngV5nnGMqUoHOWpviR+BeZHqiskyaQwu 5rZK3wArTuVPLc+0Q+eGo6BesL5qxVf0OcUhKLQWS4GRBh4H8ns8shSk3ekhkbYTJSse EVTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775589643; x=1776194443; 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=0O7DuTZ+D85au3JMLP+CFqFmga9iJn/jwHe9ZeB2Ij0=; b=epcreeoWUSyDvGuG8gxznzeqWRDksK9mzVjL+BogbMzufpEsUHnXDslSiV0MVTw7+f 3aeE7v4jtKj7IwvAQ5DduVaO9E8vJjiLmm2copv55sILKZGthDopjBxF3xQpZwHtbJGl RJu+NB2+NMZLyCgVMooh7wg4io/AJmysbKrTWTbeERPe7HMUN8Z60S0BWbbABHVda7My SwWpMuveENAGo+xQ92fooQZ73eZG0VMOfoQb0yw+TlVxslxA9jSqV88iXVsXNDdBhSnZ UysYuxwkTv9lCHrwj336lp9CcQKIbGRsnfduE3fp4p/rzRRqv9lSTzVJInDOYuklwwbM xlCQ== X-Forwarded-Encrypted: i=1; AJvYcCW+D7mRVATmAinCQhXzzSesMgeC470tuZFLF9Wed5QsNTZ7NgbARoFi5vQlugR7Cj21sVBxxsbHEZ8WPvE=@vger.kernel.org X-Gm-Message-State: AOJu0YzgEkPRHychNsmBbJrNoaeevZys7+ZKBukOJYmX1u+qSyyCv+P5 gmqo56fcs8RNHOfGK3V3YvRCJvl0S+DpqZ0go0s8khoDXVe6PeYjtumH X-Gm-Gg: AeBDievaoemOU6l13OyX7P8elooFva4wsGDjGlBPVV3qwdYUbH4U487fo9UAZW5Wwx1 BIk4OHXxsrWgLQzYFCrw98VKHom7zkq3FLQueHlBZYWmk9zeZlaeX7D1EZKIPulZFhJVDyqLWL5 MBDKqd7pDXyAkimVp17wjmPTdp0ATvvTHnQWdqCH7kaAJEFditwV4s3UaG08sOmVR57c7dHZRDI 14VYXYpD5Cjmro8aOXbNSpfbe+0/eNhz8OK2OJt0ZJMOV9U1/AvHjY1UC1P5rii3DjgVweEk7p5 LrLtSOBnYwXdr4LJaLBiesN3Fb1bgC61Rpkg0L9shvUcWTeBgNLc7Y9H7D6XqPLMSnQYXDZiwIm sN0ddzSdW59QGBrw2rv1ZcDbN5wtJRuI3n9etzhbsWB9x0O6mT8OUAL6tf5xSLU250H2h72kkYX HifSPSMr1b+rBJvDs05w0j7k6nqtmOYTuCMQ0G4GNpJbEuu0NJaq/feI2/E/VNklR134OYLAUHQ 7fTXHyCPXbbjgWj9ll9ao2aXmjbKYeKVwr6478uaYY7H3aZFVX1qHrPIcN4/uoG7w== X-Received: by 2002:a17:903:acc:b0:2b2:5042:dd22 with SMTP id d9443c01a7336-2b281935ddamr194221005ad.34.1775589643338; Tue, 07 Apr 2026 12:20:43 -0700 (PDT) Received: from sanjays-pc.govzhome.govindz.co.nz ([139.180.64.234]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b27472d55fsm235782245ad.11.2026.04.07.12.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 12:20:42 -0700 (PDT) From: Sanjay Govind To: Dmitry Torokhov , Vicki Pfau , Nilton Perim Neto , Mario Limonciello , Sanjay Govind , Lode Willems Cc: Antheas Kapenekakis , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7] xpad: Overhaul device data for wireless devices Date: Wed, 8 Apr 2026 07:17:52 +1200 Message-ID: <20260407191753.178576-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 v4: Clear wireless state when processing device prescence change v5: Fix typo, fix some potential race conditions with work scheduling v6: Fix typo, address potential time-of-check time-of-use issues with prese= nce work v7: Explicitly check if the input device has been initialized already when = processing presence changes drivers/input/joystick/xpad.c | 209 ++++++++++++++++++++++++++++++---- 1 file changed, 188 insertions(+), 21 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index bf4accf3f581..018c186f78ef 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_STICK 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,19 +1004,12 @@ static void xpad360_process_packet(struct usb_xpad *= xpad, 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; - - if (xpad->pad_present) { - error =3D xpad_init_input(xpad); - if (error) { - /* complain only, not much else we can do here */ - dev_err(&xpad->dev->dev, - "unable to init device: %d\n", error); - } else { - rcu_assign_pointer(xpad->x360w_dev, xpad->dev); - } - } else { + /* Check if the pad presence has changed */ + if (xpad->pad_present =3D=3D xpad->input_created) + return; + if (xpad->input_created) { RCU_INIT_POINTER(xpad->x360w_dev, NULL); synchronize_rcu(); /* @@ -1000,6 +1017,15 @@ static void xpad_presence_work(struct work_struct *w= ork) * using input device we can get rid of it. */ xpad_deinit_input(xpad); + } else { + error =3D xpad_init_input(xpad); + if (error) { + /* complain only, not much else we can do here */ + dev_err(&xpad->intf->dev, + "unable to init device: %d\n", error); + } else { + rcu_assign_pointer(xpad->x360w_dev, xpad->dev); + } } } =20 @@ -1017,10 +1043,11 @@ static void xpad_presence_work(struct work_struct *= work) * 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; + u16 parsed_vid; =20 /* Presence change */ if (data[0] & 0x08) { @@ -1028,7 +1055,65 @@ 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. + */ + mod_delayed_work(system_percpu_wq, + &xpad->work, msecs_to_jiffies(500)); + } else { + mod_delayed_work(system_percpu_wq, &xpad->work, 0); + } + } + } + + /* Link report */ + if (len >=3D 26 && data[0] =3D=3D 0x00 && data[1] =3D=3D 0x0F) { + xpad->sub_type =3D data[25] & 0x7f; + + /* Decode vendor id from link report */ + parsed_vid =3D ((data[0x16] & 0xf) | data[0x18] << 4) << 8 | data[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 (parsed_vid =3D=3D 1) + parsed_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_vid =3D parsed_vid; + 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 (len >=3D 21 && data[0] =3D=3D 0x00 && data[1] =3D=3D 0x05 && data[5] = =3D=3D 0x12) { + 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 +1339,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 +1580,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; @@ -1892,8 +2002,8 @@ 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); + /* Cancel any pending presence work */ + cancel_delayed_work_sync(&xpad->work); } =20 static int xpad_open(struct input_dev *dev) @@ -1945,6 +2055,11 @@ static void xpad_deinit_input(struct usb_xpad *xpad) { if (xpad->input_created) { xpad->input_created =3D false; + xpad->wireless_vid =3D 0; + xpad->wireless_pid =3D 0; + xpad->wireless_version =3D 0; + xpad->flags =3D 0; + xpad->sub_type =3D 0; xpad_led_disconnect(xpad); input_unregister_device(xpad->dev); } @@ -1965,8 +2080,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_STICK: + 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 +2273,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