From nobody Mon Dec 13 13:28:46 2021 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 1FCBC18F4D62; Mon, 13 Dec 2021 13:28:47 +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 4JCMly65B5z4s4c; Mon, 13 Dec 2021 13:28:46 +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 B278D157D2; Mon, 13 Dec 2021 13:28:46 +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 1BDDSkKO000806; Mon, 13 Dec 2021 13:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDDSkHT000805; Mon, 13 Dec 2021 13:28:46 GMT (envelope-from git) Date: Mon, 13 Dec 2021 13:28:46 GMT Message-Id: <202112131328.1BDDSkHT000805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d74c589ead91 - stable/13 - ng_ubt: Avoid attaching to several newer Intel controllers 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d74c589ead91118a46370edc30f10e7d65ed2636 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639402126; 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=YRfPziLasqu/ciROhODGqzFrj3qh+Kp2GQ7YW0tumqA=; b=heQGxbOyKOz6IRUE3QYsuGxpel/3ayFahl+7KFRQOZMfSeR4KSBHE0+JEp/9RTyn83nK3m myroN8XEVTF/S/U6SWL5dYVu4fAa21R+oH16y9ricL41wzkJUHG2tWInhZSq6QoBuvNcq6 UPTg60vC+lwVtckegOEVaWYjhCN/Ekx8ujAsGvAnDOVi/NVLsaL3YLyN75zJK1RRSgxZar XZC5KivNWDjl514xcZ+n/m72F8QbdBSh16EGl253DGD7nGCGRoNHvqv59AVxh1mirOTFAy C+0UBIJUgcvWmVL1WVNlvA/roT3ESzcyvtehBHP3Va+p4ho3daRMRc2ACETddQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639402126; a=rsa-sha256; cv=none; b=Td4xsEfsysEfOtS9d/4HY6/edb6IMOSuPtYirx8NBshCpBB2BmGLGWTex5Ata4D3OZfeUj n92XfW9nRYFVefc9HUfjG9EkghvLQiVLTmydyKlAbBa0TjdDYbTNBcASrhpM7Jl93Vglhe 7GmOnWVtG2fuZwRWo85qXbc1L+3wErfpxJu8EKbhslKpHafOzG+K1u8WlsKgikaY1aOftY Ewh2rk+AAu1ZUMOFT+rNdTTLk/PZiKtQirPlsXg2brJY8n/mVi6Ju3uZDhPn6NQ6DydA0/ WMro8V8lMcA7pf/I87kosWOH7RNWPuofd5/j7HF1NGlmddThMzHiuyNryR6Wdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d74c589ead91118a46370edc30f10e7d65ed2636 commit d74c589ead91118a46370edc30f10e7d65ed2636 Author: Mark Johnston AuthorDate: 2021-12-05 15:45:12 +0000 Commit: Mark Johnston 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 */