From nobody Wed Apr 22 20:08:03 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g19JM5Cz6z6bDK8 for ; Wed, 22 Apr 2026 20:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g19JM4Ggvz3LW5 for ; Wed, 22 Apr 2026 20:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776888483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cwz2+4zXs4HZNTACFx+dqRycgx4nz3VGRUcUFrk2J7o=; b=e68u55abDw92IJbm+bSI3i6jEVe8lqwh5cZBEqEakovVeJjF8P84ouyOFDEJbWURzG3swK bFgiR3drQKEWfrGLgmVLKQ8+qZeMLhviOpmuE3MhVIH164EZBQNdJzEXdV26pSyjx570h9 j6mpnEPzgpgpZb+I7JEAnMBVN6JsSLoFtwAg5I/B34NPf88dVcmRdSbi1f91ZOLHjZ33/2 FD/uECcd5A8wkMlQlTqQXQe7kyhKXn9aN8Qn+hHaKDrSvOWIBiZcfwDjpacmXUHJrQXGlE YzmSjYPhj8phvkfEt9e7OZ5WZ3/4zS+ibshtjU0YCXE+etmxErOvfyJJAM5ZSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776888483; a=rsa-sha256; cv=none; b=VnY3Z5weWZMHynD1m55ZLhNpRQRJTxw9QhGuYv44PkvAj9zzPfeqH9YNULC/x6BSS49eCJ OmGJ+9ceWp/s0VsmYgAOkYR7s/MxmXsF0Fd+AcnGDJOuAfj1EwhLCVAOriChWy0SoGTZ/d HSXjqy0MBW3Pmxgv2LuDNR4uX2Cjf1iAvm00fBWp8BErMtlDyZYArZnk4q8azOVsZayymF K+lhlT3WJhCN8ixivM3QPGK7iP2aAzt44tF04vNg3uIpeQA1lewl8ICx5lWuBEHgBd+bh8 lGpZuYIAu+jmiJg/pJh62R2POyL4JKF3WE/FxLw2w4iQY++Joxfbgb7qnM8HBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776888483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cwz2+4zXs4HZNTACFx+dqRycgx4nz3VGRUcUFrk2J7o=; b=niSeF7oIoCNbpn/OI5WqlrQRHhRcPzXnRXFfHm+CWmdo8wG2+aOKTCb6EMevsVJVQWV/gA 8Im1CklHl+ceMw1oaTxG4B1RKIZdsHcJklRQI7LZw3LMfPnDi3gWk1jf4WaPmrc++ewTkI oRIgc+t3LUfEfmhnDt8fV0XwTg8kl6QoupTQGzHNzsxMLxAEJDRN2pe1yPM3q9W9y6XXoL J1AJwe/XWgmUW4+4mXrtXaDYa4cuoDau9HcwBTjogBr9B4+VOLC6cpHOX85sAY3TNGfhvk g1HAiahdF00rwaPJNM5o7T7DWK/WtjgrjSuq7HtLugvO3Rwzkt6HXnIhyUnnAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g19JM3WT0zlxZ for ; Wed, 22 Apr 2026 20:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2212d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 20:08:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Longros From: Vladimir Kondratyev Subject: git: 5138ea094d35 - stable/15 - bluetooth: add device IDs for Intel AX411 and BE200 adapters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5138ea094d350054a2be9ada9d679000ed5bc55c Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 20:08:03 +0000 Message-Id: <69e92aa3.2212d.7048c1a2@gitrepo.freebsd.org> The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5138ea094d350054a2be9ada9d679000ed5bc55c commit 5138ea094d350054a2be9ada9d679000ed5bc55c Author: Christos Longros AuthorDate: 2026-03-29 13:16:57 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-04-22 19:59:02 +0000 bluetooth: add device IDs for Intel AX411 and BE200 adapters Add USB product IDs for Intel AX411 (0x0035) and BE200 (0x0036) Bluetooth adapters to ng_ubt_intel, ng_ubt, iwmbtfw, and iwmbtfw.conf. Both chips use the same TLV-based firmware protocol as the existing 9260/9560 entries. Newer Blazar-generation chips (BE201, BE202, Whale Peak 2) are omitted as they require IML support not yet implemented in iwmbtfw. Signed-off-by: Christos Longros Reviewed by: wulf MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56122 (cherry picked from commit d82bcf5681dd180177d78fdcd1b8bbde5eadc29b) --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 7 ++----- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c | 2 ++ usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 | 4 ++-- usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf | 2 +- usr.sbin/bluetooth/iwmbtfw/main.c | 2 ++ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index def589107725..934a5d4d37f6 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -436,13 +436,10 @@ static const STRUCT_USB_HOST_ID ubt_ignore_devs[] = { USB_VPI(USB_VENDOR_INTEL2, 0x0025, 0) }, { USB_VPI(USB_VENDOR_INTEL2, 0x0026, 0) }, { USB_VPI(USB_VENDOR_INTEL2, 0x0029, 0) }, - - /* - * Some Intel controllers are not yet supported by ng_ubt_intel and - * should be ignored. - */ { USB_VPI(USB_VENDOR_INTEL2, 0x0032, 0) }, { USB_VPI(USB_VENDOR_INTEL2, 0x0033, 0) }, + { USB_VPI(USB_VENDOR_INTEL2, 0x0035, 0) }, + { USB_VPI(USB_VENDOR_INTEL2, 0x0036, 0) }, /* MediaTek MT7925 */ { USB_VPI(USB_VENDOR_AZUREWAVE, 0x3602, 0) }, diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c index c4410b7b2c80..290c04790a46 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_intel.c @@ -101,6 +101,8 @@ static const STRUCT_USB_HOST_ID ubt_intel_devs[] = /* Intel Wireless 9260/9560 and successors */ { USB_VPI(USB_VENDOR_INTEL2, 0x0032, UBT_INTEL_DEVICE_9260) }, { USB_VPI(USB_VENDOR_INTEL2, 0x0033, UBT_INTEL_DEVICE_9260) }, + { USB_VPI(USB_VENDOR_INTEL2, 0x0035, UBT_INTEL_DEVICE_9260) }, + { USB_VPI(USB_VENDOR_INTEL2, 0x0036, UBT_INTEL_DEVICE_9260) }, }; /* diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 index ac32a675aa63..fd0118655a67 100644 --- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 +++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 @@ -48,8 +48,8 @@ device. .Pp This utility will .Em only -work with Intel Wireless 7260/8260/9260 chip based Bluetooth USB devices -and some of their successors. +work with Intel Wireless 7260/8260/9260 and newer chip based Bluetooth +USB devices, including AX and BE series wireless adapters. The identification is currently based on USB vendor ID/product ID pair. The vendor ID should be 0x8087 .Pq Dv USB_VENDOR_INTEL2 diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf index e30a3c15ccaa..d48206827f90 100644 --- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf +++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.conf @@ -7,6 +7,6 @@ notify 100 { match "subsystem" "DEVICE"; match "type" "ATTACH"; match "vendor" "0x8087"; - match "product" "(0x07dc|0x0a2a|0x0aa7|0x0a2b|0x0aaa|0x0025|0x0026|0x0029|0x0032|0x0033)"; + match "product" "(0x07dc|0x0a2a|0x0aa7|0x0a2b|0x0aaa|0x0025|0x0026|0x0029|0x0032|0x0033|0x0035|0x0036)"; action "/usr/sbin/iwmbtfw -d $cdev -f /usr/local/share/iwmbt-firmware"; }; diff --git a/usr.sbin/bluetooth/iwmbtfw/main.c b/usr.sbin/bluetooth/iwmbtfw/main.c index b27c5ad62239..1e11cc468015 100644 --- a/usr.sbin/bluetooth/iwmbtfw/main.c +++ b/usr.sbin/bluetooth/iwmbtfw/main.c @@ -81,6 +81,8 @@ static struct iwmbt_devid iwmbt_list[] = { /* Intel Wireless 9260/9560 and successors */ { .vendor_id = 0x8087, .product_id = 0x0032, .device = IWMBT_DEVICE_9260 }, { .vendor_id = 0x8087, .product_id = 0x0033, .device = IWMBT_DEVICE_9260 }, + { .vendor_id = 0x8087, .product_id = 0x0035, .device = IWMBT_DEVICE_9260 }, + { .vendor_id = 0x8087, .product_id = 0x0036, .device = IWMBT_DEVICE_9260 }, }; static enum iwmbt_device