Date: Mon, 13 Dec 2021 13:28:46 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d74c589ead91 - stable/13 - ng_ubt: Avoid attaching to several newer Intel controllers Message-ID: <202112131328.1BDDSkHT000805@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d74c589ead91118a46370edc30f10e7d65ed2636 commit d74c589ead91118a46370edc30f10e7d65ed2636 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2021-12-05 15:45:12 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2021-12-13 13:26:19 +0000 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) --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 7 +++++++ 1 file changed, 7 insertions(+) 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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112131328.1BDDSkHT000805>