From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 4E46F244675 for ; Tue, 7 Apr 2026 18:24:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775586288; cv=none; b=aK1ObKa9jzaTR3lZWqby5iOVdl7Gw/AOgTbQx+ibN2QaIEQvsZM7Lb5Ak34yvLpPXmQP8+czxYWAYBaC4hLzXGvhfiO3ARDxThQX9HPakOOtP7GRT2uASbVgOAEIOYV9Tqi7RrNlHjunYVoN/OFwtYV91pQyJIKT7lRrJwD0N2Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775586288; c=relaxed/simple; bh=EIMxTr8g8vgkzicLd9lgLZ7A1brpKbrYYbsdUofXoyM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Hdc3/Fn/LL/cFXgAnne77E1KtljFhZiAtB7uWefngRLMiz6W5lOjRWJcui5AUgsGOmy+yP4nn7eT45rlrtQTX49UC8ddFreWfgb2ZxOcJTbq35HqkYHOJx/yawrqAEhmN4FHBhvust66AAId+F1Nae7XOeS5XGwu0CANABrcxBo= 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=EaGBrOYE; arc=none smtp.client-ip=209.85.210.169 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="EaGBrOYE" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-82cd5c07f93so2355227b3a.1 for ; Tue, 07 Apr 2026 11:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775586285; x=1776191085; 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=6BciVAhV3TqcU2aLTyJ6aAzolhJEmsHsiy3M3MrUiMo=; b=EaGBrOYE7rx5OgJe/+6ehgZXHcZQDcBbdfjV9Tki1lfRumhm/n2YwAMBqjxkpCyBq9 L/8s0H7Q/1SWo9n3RwlgLaXSTH4o6WyG35XYJth4/PirKdf38x0+q+ynb/alP75fmx9t QrP15AA6vEwRnFCVx6QmmquOPh03jSsRZ31pLVR/nD9SuJTvIZ3DCv1zHmIvRf7880ti Dh6S1ghXtIfi/evjLJ2zysVlXq3+rKzb8qgVDHbMKZAXPIlc/mwIPEYU56GMVuVwTXe4 1OcbKufS7LsCNAsIHjMxBa2BcWmVvrX02FFuhitGEzGmamBlHqG/uY8dUhtSZZtEiw5Y egHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775586285; x=1776191085; 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=6BciVAhV3TqcU2aLTyJ6aAzolhJEmsHsiy3M3MrUiMo=; b=X5Xq6IZIOdv/8Z5Jdo2UZmCUul35KH4sbAseBfsbMryzjAZOCPsSRbJoNSAjQq7+pe kBwIUBtw+vixi9MP1aIvfI2liKtwPd2SIkfVREShsDAlbDKxbo5Gqgkn9LB1S4lTLZTb okVFMqhmQuUc49+LRGGsU/6q2fyxwfCPYDi/CackBIdxPxARmRS3DfVkCcOGvGPnzTqx 6YyvNr7wtCLMMBSJi5DOWJm+4F2xrpPl0f9jHj0mCU0LBQrcmZD9z7fhS1OeY9Sz4Kfz OGOwBNAo8JKutLGfvxG/Qj8FIPx+gyoAScJGCEh5uKme33p2RCVDLLk7C18IfT+5D9hK sqWQ== X-Gm-Message-State: AOJu0Yz9cuiE4sYQFn4KZF+ArVGPjtfNsaehvpznoC34oyhaCupkuIun IRN1nMbYJK7iu0u9w5Z3kWxv0hZ3uC+KyhkDLujqF4mediqZUS6bK0Oc X-Gm-Gg: AeBDietilK7v2OcSf944gy/eoTjxAk/6H0cCjDMF6opyC6m0OsmMy+H08ICjdIT9/aH o5L3rBEMX6aWlttG/fnaFcsWGviytbDXyNjnso72QOyWaZEeK+JRvIEFqwBQR55q1fisa8pXko6 8Zxr5Xyxilk8D6xkDyGvQ9+mXHecEESX5knmNaZW8iMcXfhBRPciTyJjPUu9m2A0ItXpqYsgAU1 weHQ+zdvkTxJZpzNLqh4w6FRxhGfGM/kCge2XQGDPLWDiBTJC9Gc0X4iFy/xSEEzB7lMqDLa4bl IOzykkWyaBX4FoVyMZtYf9T3dnxqao/nmvNpTCHG3RGGnnGxFYN796zPS3jhp5y2Jhz1ru+c9oF vygxntQf4btcsWPLMPxOr1mWqz9lLgnFjK+WPZjFTJsHNe7tZPtXAb6WOFTGr+IMBbgBd9q9lo/ YlGRXxuXavMPFbm1hjIwp26X9P6wP/3ougbMvUBMuOanNqyyilUYLCGzhF7ZHEktPP8dTd88ocQ drDinSF79v0+sA2PpDyRbuENNN3wgY3lZR6zE1+NfbE+FHP3wWZY0ITN0VNxUiocNYLJ/aUBxpU X-Received: by 2002:a05:6a20:9389:b0:39b:c4cd:d848 with SMTP id adf61e73a8af0-39f2edd0c7amr18023948637.22.1775586284607; Tue, 07 Apr 2026 11:24:44 -0700 (PDT) Received: from sanjays-pc.govzhome.govindz.co.nz ([139.180.64.234]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c76c6475ae9sm16276034a12.2.2026.04.07.11.24.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 11:24:43 -0700 (PDT) From: Sanjay Govind To: Dmitry Torokhov , Vicki Pfau , Nilton Perim Neto , Mario Limonciello , Sanjay Govind , "Pierre-Loup A. Griffais" Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6] xpad: Overhaul device data for wireless devices Date: Wed, 8 Apr 2026 06:20:10 +1200 Message-ID: <20260407182011.73834-3-sanjay.govind9@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 reports 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 presence work drivers/input/joystick/xpad.c | 197 +++++++++++++++++++++++++++++++--- 1 file changed, 183 insertions(+), 14 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index bf4accf3f581..90f531bed3db 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -94,6 +95,22 @@ #define XTYPE_XBOXONE 3 #define XTYPE_UNKNOWN 4 +#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 this many * seconds */ @@ -766,6 +783,7 @@ struct usb_xpad { struct usb_device *udev; /* usb device */ struct usb_interface *intf; /* usb interface */ + bool pending_pad_present; bool pad_present; bool input_created; @@ -795,8 +813,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 +830,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); + /* * xpad_process_packet @@ -980,15 +1005,18 @@ static void xpad360_process_packet(struct usb_xpad *xpad, struct input_dev *dev, static void xpad_presence_work(struct work_struct *work) { - struct usb_xpad *xpad = container_of(work, struct usb_xpad, work); + struct usb_xpad *xpad = container_of(work, struct usb_xpad, work.work); int error; - + if (xpad->pad_present == xpad->pending_pad_present) + return; + xpad->pad_present = xpad->pending_pad_present; if (xpad->pad_present) { error = 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); + if (xpad->dev) + dev_err(&xpad->dev->dev, + "unable to init device: %d\n", error); } else { rcu_assign_pointer(xpad->x360w_dev, xpad->dev); } @@ -1017,18 +1045,77 @@ 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, unsigned char *data) +static void xpad360w_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *data, u32 len) { struct input_dev *dev; bool present; + u16 parsed_vid; /* Presence change */ if (data[0] & 0x08) { present = (data[1] & 0x80) != 0; - if (xpad->pad_present != present) { - xpad->pad_present = present; - schedule_work(&xpad->work); + if (xpad->pending_pad_present != present) { + xpad->pending_pad_present = present; + 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 >= 26 && data[0] == 0x00 && data[1] == 0x0F) { + xpad->sub_type = data[25] & 0x7f; + + /* Decode vendor id from link report */ + parsed_vid = ((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 == 1) + parsed_vid = 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 = parsed_vid; + xpad->wireless_pid = 0x02a0 + xpad->sub_type; + xpad->wireless_version = 0; + + if ((data[25] & 0x80) != 0) + xpad->flags |= FLAG_FORCE_FEEDBACK; + + xpad_inquiry_pad_capabilities(xpad); + } + + /* Capabilities report */ + if (len >= 21 && data[0] == 0x00 && data[1] == 0x05 && data[5] == 0x12) { + xpad->flags |= 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) == xpad->wireless_vid) { + xpad->wireless_pid = get_unaligned_le16(data + 12); + xpad->wireless_version = get_unaligned_le16(data + 14); } } @@ -1254,7 +1341,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 +1582,31 @@ static int xpad_inquiry_pad_presence(struct usb_xpad *xpad) return xpad_try_sending_next_out_packet(xpad); } +static int xpad_inquiry_pad_capabilities(struct usb_xpad *xpad) +{ + struct xpad_output_packet *packet = + &xpad->out_packets[XPAD_OUT_CMD_IDX]; + + guard(spinlock_irqsave)(&xpad->odata_lock); + + packet->data[0] = 0x00; + packet->data[1] = 0x00; + packet->data[2] = 0x02; + packet->data[3] = 0x80; + packet->data[4] = 0x00; + packet->data[5] = 0x00; + packet->data[6] = 0x00; + packet->data[7] = 0x00; + packet->data[8] = 0x00; + packet->data[9] = 0x00; + packet->data[10] = 0x00; + packet->data[11] = 0x00; + packet->len = 12; + packet->pending = true; + + return xpad_try_sending_next_out_packet(xpad); +} + static int xpad_start_xbox_one(struct usb_xpad *xpad) { int error; @@ -1893,7 +2005,7 @@ static void xpad360w_stop_input(struct usb_xpad *xpad) usb_kill_urb(xpad->irq_in); /* Make sure we are done with presence work if it was scheduled */ - flush_work(&xpad->work); + cancel_delayed_work_sync(&xpad->work); } static int xpad_open(struct input_dev *dev) @@ -1945,6 +2057,11 @@ static void xpad_deinit_input(struct usb_xpad *xpad) { if (xpad->input_created) { xpad->input_created = false; + xpad->wireless_vid = 0; + xpad->wireless_pid = 0; + xpad->wireless_version = 0; + xpad->flags = 0; + xpad->sub_type = 0; xpad_led_disconnect(xpad); input_unregister_device(xpad->dev); } @@ -1965,8 +2082,60 @@ static int xpad_init_input(struct usb_xpad *xpad) usb_to_input_id(xpad->udev, &input_dev->id); if (xpad->xtype == XTYPE_XBOX360W) { - /* x360w controllers and the receiver have different ids */ - input_dev->id.product = 0x02a1; + if (xpad->wireless_vid) + input_dev->id.vendor = xpad->wireless_vid; + if (xpad->wireless_pid) + input_dev->id.product = xpad->wireless_pid; + else + /* Default product id for x360w controllers */ + input_dev->id.product = 0x02a1; + if (xpad->wireless_version) + input_dev->id.version = xpad->wireless_version; + switch (xpad->sub_type) { + case SUBTYPE_GAMEPAD: + input_dev->name = "Xbox 360 Wireless Controller"; + break; + case SUBTYPE_WHEEL: + input_dev->name = "Xbox 360 Wireless Wheel"; + break; + case SUBTYPE_ARCADE_STICK: + input_dev->name = "Xbox 360 Wireless Arcade Stick"; + break; + case SUBTYPE_FLIGHT_STICK: + input_dev->name = "Xbox 360 Wireless Flight Stick"; + break; + case SUBTYPE_DANCE_PAD: + input_dev->name = "Xbox 360 Wireless Dance Pad"; + break; + case SUBTYPE_GUITAR: + input_dev->name = "Xbox 360 Wireless Guitar"; + break; + case SUBTYPE_GUITAR_ALTERNATE: + input_dev->name = "Xbox 360 Wireless Alternate Guitar"; + break; + case SUBTYPE_GUITAR_BASS: + input_dev->name = "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 = "Xbox 360 Wireless Guitar Hero Drum Kit"; + else + input_dev->name = "Xbox 360 Wireless Rock Band Drum Kit"; + break; + case SUBTYPE_RB_KEYBOARD: + input_dev->name = "Xbox 360 Wireless Rock Band Keyboard"; + break; + case SUBTYPE_ARCADE_PAD: + input_dev->name = "Xbox 360 Wireless Arcade Pad"; + break; + case SUBTYPE_TURNTABLE: + input_dev->name = "Xbox 360 Wireless DJ Hero Turntable"; + break; + case SUBTYPE_PRO_GUITAR: + input_dev->name = "Xbox 360 Wireless Rock Band Pro Guitar"; + break; + } } input_dev->dev.parent = &xpad->intf->dev; @@ -2106,7 +2275,7 @@ static int xpad_probe(struct usb_interface *intf, const struct usb_device_id *id xpad->delay_init = true; xpad->packet_type = PKT_XB; - INIT_WORK(&xpad->work, xpad_presence_work); + INIT_DELAYED_WORK(&xpad->work, xpad_presence_work); if (xpad->xtype == XTYPE_UNKNOWN) { if (intf->cur_altsetting->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC) { -- 2.53.0