From nobody Sun Dec 5 15:52:41 2021 X-Original-To: dev-commits-src-main@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 71EF718C5226; Sun, 5 Dec 2021 15:52:42 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J6WKk0YNLz3pyn; Sun, 5 Dec 2021 15:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE51F1ABAF; Sun, 5 Dec 2021 15:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B5FqfYv002335; Sun, 5 Dec 2021 15:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B5Fqfxv002334; Sun, 5 Dec 2021 15:52:41 GMT (envelope-from git) Date: Sun, 5 Dec 2021 15:52:41 GMT Message-Id: <202112051552.1B5Fqfxv002334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b25ba58adc04 - main - ng_ubt: Avoid attaching to several newer Intel controllers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b25ba58adc04ca475df1e8125d2a16a07d68b49d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638719562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MGWSGFwtkdTrTqaUILaMo1fhysOBJub4gxXmIfiZ/rE=; b=cTfWBcrGGuuouqrz25sywsrBGfUKQ+VwfhLSCro2iEAUlEE/q/rKVlQzqolnLk15U7OMLD ZEVyg7E+R1nAN8cyHewpWSm6vI71B5FwaMlhfWRtoBOYEJeQpLZdtTH+Nosl24LCwwT/CG XEC71XOE0Tz/Ec49TG0pPcukbGT6oVxlQGRNaNoygofxCy4ZMvvzIfYKZC4o2F2gDRw7XM ZjIEy+11yoLev6Jpy7OpjtbLbSRKqgbDBYdX3ZTlzWntGkYdt8JvkBhKt9HL2tjiMXdQte hfSL0/H4+kSb/PexdGG7TRNvJrrbVgJvScUN/CrLywcbahon0iVObqVEUq9oHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638719562; a=rsa-sha256; cv=none; b=xcIysvW7QkGekmi+moKIxUDWsQRrgbJOaxIvxnxiraBdqxI8FEymxSqJfdtgxrZRIcZM1P 422K6oqV7jXUlWoBDZ23OyFf9HGG5efyGy5+9bZVgQreZ523oqugSMEkAO0viT53j9K9ir JcCRx5Vg0i//njbgdV6kU8808Q+Bo4/QV+JV6cNx40DZFBSA1MrxOK3hlcXMuFQCbYbF3v VVkuvHuauhJjGBkD0kcTig0DZgMPhNj4g8d7iX5oe+WZyYNI1DvKUz/TZrGGRpWM3oMOSb /PQdZL3cMUpD6EKu0jj84TnJ24zu9ol7duLioSiV8wCXANXQ8Ps4JPf78EezQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b25ba58adc04ca475df1e8125d2a16a07d68b49d commit b25ba58adc04ca475df1e8125d2a16a07d68b49d Author: Mark Johnston AuthorDate: 2021-12-05 15:45:12 +0000 Commit: Mark Johnston CommitDate: 2021-12-05 15:51:46 +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 MFC after: 1 week --- 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 */