git: d82bcf5681dd - main - bluetooth: add device IDs for Intel AX411 and BE200 adapters

The branch main has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=d82bcf5681dd180177d78fdcd1b8bbde5eadc29b

commit d82bcf5681dd180177d78fdcd1b8bbde5eadc29b
Author:     Christos Longros <chris.longros@gmail.com>
AuthorDate: 2026-03-29 13:16:57 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2026-03-29 13:16:57 +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 <chris.longros@gmail.com>
    
    Reviewed by:    wulf
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D56122
---
 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