diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2021-12-05 15:45:12 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2021-12-13 13:26:19 +0000 |
| commit | d74c589ead91118a46370edc30f10e7d65ed2636 (patch) | |
| tree | 548d9c869a4e1feae540a8eb335a802f319b95e7 /sys/netgraph | |
| parent | 99e934e6f152eefa47bfae62db2ee0b439f137c0 (diff) | |
| download | src-d74c589ead91118a46370edc30f10e7d65ed2636.tar.gz src-d74c589ead91118a46370edc30f10e7d65ed2636.zip | |
ng_ubt: Avoid attaching to several newer Intel controllers
Like other Intel controllers, these require firmware to be loaded, and
generic ng_ubt attach causes them to lock up until a power cycle.
However, their firmware interface for querying version info and loading
operational firmware is different from that implemented by ng_ubt_intel
and iwmbtfw, so they are not usable yet. Just disable attach for now to
avoid stalls during USB device enumeration.
PR: 260161
Sponsored by: The FreeBSD Foundation
(cherry picked from commit b25ba58adc04ca475df1e8125d2a16a07d68b49d)
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index 3e4dc0e80dec..a79a8cd48509 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -432,6 +432,13 @@ 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) }, }; /* List of supported bluetooth devices */ |