From nobody Fri Sep 25 21:40:17 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 3BE8E3AAF69 for ; Tue, 8 Sep 2026 08:01:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788854495; cv=none; b=LrmVC+kHVrMIvM7bhwYgVxoZeM6pp1+Fmj9zGM568/dwf/IvIEF4X4CHjgG7aJpewHGW2Vq3Jhiko1szXHiMAdnjNJhFV2/wYBPF6wz/elRFC3Ga++VEg6ZRL4A+zzwk2GSqGBy228q/mg40TqJCBSsy3TbuLnTVm1ltCt0PjX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788854495; c=relaxed/simple; bh=kY5mHzv52Br0b7G2PSb1FefbbJw1TgOgY/VveBl3Qsc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Q+paI+WkT46Cl+12PaSeKbZa/gHDUOXDnv8Ah9xQJxuGY1Wp7OONUrLycQdT4B+azSTFVZnYseDy0BbNBaovS6XeSJY2DkOfNpv9mouxLuiRgejT/anY4yeNxpGuvjwZPRxWpUJHQRHnCF1c0LJEOxCxF3RkzcALn3dl8qWcqDo= 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=m3Znfqj/; arc=none smtp.client-ip=209.85.128.50 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="m3Znfqj/" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-49ccfbe062eso41422765e9.3 for ; Tue, 08 Sep 2026 01:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788854491; x=1789459291; 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:content-type; bh=kY5mHzv52Br0b7G2PSb1FefbbJw1TgOgY/VveBl3Qsc=; b=m3Znfqj/bwDpzfbnj4anIyUafd6vcZG2LrHjiioVNO534/X+Hj82izwzCZ0QuffINT dXhixNn7S2y5Sac+0rA6hugsNB3SMnrtoPlwhecNIxr+zVYnQbYeN738CXLNKa2DLRbA god1R5uPrX5Mcj9sXL5R2d2Jmn0athEV82vEOjHzeC/BbR6cYLurlH1Cxtg0kN/b5oSY Dgmjsss4aszvmK7b779Xefu3XaxLvqi3NUag4u8bE3sIWoelAqG2McQvMbmuTJ7HggSW WlPFKwWaFL8hh3jDJ9XkQ4O1c7FzM+l5Pp5jIo9GD/3PT4Cpds6H3nj8Jgp54j2FqScJ MAqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788854491; x=1789459291; 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:content-type; bh=kY5mHzv52Br0b7G2PSb1FefbbJw1TgOgY/VveBl3Qsc=; b=SxTi/CizygrR+MIZdWExtHG5cXBZRjk/6AOVeNst5t6w8a1yBbeYwhgB0jSLtO03gY xgM8dek/ZMgn4CJqM5WgIFgOQHKja9rYVW4aZmb6gdqP6HZHNKERd4JMiZEmGlNgyYlh rgeT4WgAlq/ObZiDsFA3J7gGnQo43SCuiR6cyhRGVLTxxB8GY4plafgBzutuMkZprcIg BqngmuBl1/BBmJtyw31uLzE5oYwZcG8kMIVrvMTVWt6gJacwLHROIl5r9oV6XVZmRDsB s8zxgy/BNswwPXZVw3YlYjqegY0GCg2QGEZGyzZDA1x3zbJ9UE3bL7gnifX8Z3LO6v3p NarA== X-Forwarded-Encrypted: i=1; AKwUvBxCZPe2/BSL82zKHNSBBzUgnzFbXO6jPnd7EZySzdijbh9jO9qq/1NXcesiRvhEVKTX3r9I/8tnA07cPxs=@vger.kernel.org X-Gm-Message-State: AFuF++kA2c7ofeQ/A0OHHtWKLP4MNXSk21WT/ywRLo+mXfnUjKE5Ac3m ZjK+z4Dc4742+SwYeN1530ZOtBY9ZGlSL727/3khnixLmNrlKYlDShyR X-Gm-Gg: AYBFou1GHnrlJ3zbcNOD5gC24slYGzTNStP38DMHfn2z1j3a/z5vFDik809kqge4QG7 4kbbZQXe3Wjc2ccFKazix/x/v8ES/EQK6eT6f3VryTlavuOJu0zU7u6F2EX2ITLRKixznULu2i6 M5VPuUVjdf9LJQO0za2+WJG0XncQR9F28C6rh4LatKQWNVlLZsFguR5cISs6KQZwihrO/Ezg0Ix zUeLCTii6z8uVHpAKTCVpMgPSEMCHiqFyC4eDBN1XUMMda/xt30yut2NNlrhoM/dDw4JXcOr5Y7 BlTRozNA9g8/2g7vslwkdvV2guoq/NKBU2cu61gr9k6FaWSKqRNT2tNanAQ/Y2vO0sX36yhZOEc qhZrz50BYdiprv7N9ZEhfmIRjmHmYoeqOIGBqaC4u6ozGIYGBQssx9x2rtkq/JxEpaXFro2mNW6 LoMFKliuDXlN5QW0APvOp6VG80iuEJQzuuvyiGmj9XZCD7DGDlhz0bIltC/f+zSnr3pZRdq76eK J+pmsG4SNZ4u+LH5mE6AC6T+6UZpsvo7fsEKfbmKH6hcWeNb/uklKBzg3KgxU3zeViH+2RRfD7t X-Received: by 2002:a05:600c:4693:b0:49d:39:90ba with SMTP id 5b1f17b1804b1-49d00399d19mr187306625e9.3.1788854489959; Tue, 08 Sep 2026 01:01:29 -0700 (PDT) Received: from MYL150-3871.localdomain (57.11.28.93.rev.sfr.net. [93.28.11.57]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49cfbdacc45sm344218455e9.11.2026.09.08.01.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2026 01:01:29 -0700 (PDT) From: Nicolas Thibert To: marcel@holtmann.org, luiz.dentz@gmail.com Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] Bluetooth: btusb: fix NXP IW610 composite device handling Date: Tue, 8 Sep 2026 10:01:08 +0200 Message-Id: <20260908080108.1260799-1-nithibert@gmail.com> X-Mailer: git-send-email 2.34.1 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" The NXP IW610 module exposes itself as a composite USB device (0471:0215) with three interfaces: two real Bluetooth HCI interfaces (class 0xe0) and one vendor-specific WiFi interface (class 0xff) used by mwifiex-nxp. The composite device's whole USB descriptor reports class 0xe0/01/01 (Bluetooth), so btusb_table's generic USB_DEVICE_INFO(0xe0, 0x01, 0x01) entry matches every interface, not just the two real HCI ones -- btusb ends up binding the WiFi interface too, and mwifiex-nxp never gets it. Fix: 1. In btusb_table (the table the USB core actually matches against), explicitly ignore the WiFi interface via BTUSB_IGNORE, ahead of the generic entry. 2. In quirks_table, scope the existing BTUSB_MARVELL entry to the BT interface class instead of matching the whole device by VID/PID (harmless either way since quirks_table isn't consulted for initial binding, but keep it correct). Not upstream anywhere: checked NXP's own i.MX kernel fork (nxp-imx/linux-imx), no IW610 references in btusb.c on any branch -- their reference designs wire this chip differently (WiFi over SDIO per their release notes), so they never hit this. Signed-off-by: Nicolas Thibert Cc: stable@vger.kernel.org Assisted-by: LLM (Claude Sonnet 5, Anthropic) --- drivers/bluetooth/btusb.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -71,6 +71,15 @@ static struct usb_driver btusb_driver; #define BTUSB_BROKEN_EXT_SCAN BIT(29) =20 static const struct usb_device_id btusb_table[] =3D { + /* + * NXP IW610 (0471:0215): the composite device reports Bluetooth + * class at the whole-device level, so the generic entry below + * would also match this WiFi vendor interface. Ignore it here + * first so mwifiex-nxp can bind it instead. + */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0471, 0x0215, 0xff, 0xff, 0xff), + .driver_info =3D BTUSB_IGNORE }, + /* Generic Bluetooth USB device */ { USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, =20 @@ -477,6 +486,14 @@ static const struct usb_device_id quirks { USB_DEVICE(0x1286, 0x2046), .driver_info =3D BTUSB_MARVELL }, { USB_DEVICE(0x1286, 0x204e), .driver_info =3D BTUSB_MARVELL }, =20 + /* + * NXP IW610 BT interfaces (Marvell-lineage silicon, same quirk as + * the 0x1286 entries above). Scoped to the BT interface class, + * not just VID/PID -- see the btusb_table entry above. + */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0471, 0x0215, 0xe0, 0x01, 0x01), + .driver_info =3D BTUSB_MARVELL }, + /* Intel Bluetooth devices */ { USB_DEVICE(0x8087, 0x0025), .driver_info =3D BTUSB_INTEL_COMBINED }, { USB_DEVICE(0x8087, 0x0026), .driver_info =3D BTUSB_INTEL_COMBINED }, -- 2.34.1