From nobody Tue May 10 08:06:34 2022 X-Original-To: dev-commits-src-branches@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 5A1271AD96F9; Tue, 10 May 2022 08:06:35 +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 4Ky9bt5Rcdz4SB3; Tue, 10 May 2022 08:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652169994; 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=27wfW/gzjRkH+dVmxkj/iEPAyTX8LSuvQ2nRbNXnElI=; b=iIYUlyuHnY9OcSpt9cJCiRP8OtMyo/BAOB4eWJuhQEyBYIhAAoE/1agnEjEhwAul0/DAt5 H+EUOo9fLElxfoQ4q2k/B2emAab39F4dA3zxa6k73yic+g8WwK+1whTuuDjmmDFv83RFJs 0e+LydDdQQdexixLGIIkAY+wEAxxwUeJ+EGjfOX5U0cpUNauaJvuBBKZaGtp9dodgoSS9+ g2bQ0e3lM4FDx3soTHl7v8FplAlFovbN7r+P7aQ3c0gR6E6nqojeCtUIXdD3IKkSFzsFVO v9TiVAgZk8Csza6CrnF3o8YIbEWJ9QwhGWvK8iG6Z/Qq3GDqnY5WXi/ha8lKug== 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 71F1221799; Tue, 10 May 2022 08:06:34 +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 24A86YEQ029413; Tue, 10 May 2022 08:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24A86YFH029412; Tue, 10 May 2022 08:06:34 GMT (envelope-from git) Date: Tue, 10 May 2022 08:06:34 GMT Message-Id: <202205100806.24A86YFH029412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: 75a5bdd45302 - stable/13 - xhci(4): Tweak USB port speed checks to allow newer super speed generations. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 75a5bdd4530265946ad6576135dd50ac547878ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652169994; 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=27wfW/gzjRkH+dVmxkj/iEPAyTX8LSuvQ2nRbNXnElI=; b=RJNev7SW98UgVmSY+1B3p2QeTrx2MFGWFq6L5b5rt7oMH5PYOi3vLpB93ElAiPcOfFhL17 +SN4gDZO3msaYYOIvMlYbFQcv45aGEcZTSKBuOZ7cCYD1vDitCYqgPIBdJU40ttvr35i1h 7svQNd5fwMhacwTQa0jcTAp2jrJzW8e8lR0rORDctWVkfFRCMRDuq3CIf/Is7QJAQbmGRI GI7/hW5XHSbU0jMIRtaIpMKcpyPj3lE1J45TutBKN4OlY0LawRolojqxjCl9ATq/ikf6iC W0GZPLYy7LcnlGVghBOVP85/fv+FXKglovBnnGObK83H5w4bbAt4tOCxPgjUPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652169994; a=rsa-sha256; cv=none; b=ilc4ji1DKDFF+fG947V7+k8Z3c4YREs0SaK0ouz0r2RNQLuaPJ59aV7xDV804x2flE6fFT akajrt/KoHj2q3Hrfwv2eW4A3toM1lI0HIKZzEvw9xTpfJZqaKkAgD8tjz7zI8fyidQkNA 2i/V3SLxcZxy4XG97fjJbNUzfKLeaiyQ3swP81ukFZB5GK14LmMFSNWcJ1O6nVdMoAN4Hq vGH2WrfpKzXB5E6fqAPuaAEzjyNrD5PkvPmXjc47eFQ3qar7I37tGDFABGEgK7mDlxDKX8 beF429/PmAYpCMH8QWClvD/nY7bV6hFaZXtu6p2nobDgsQA/8jW5TCWlLr+CWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=75a5bdd4530265946ad6576135dd50ac547878ee commit 75a5bdd4530265946ad6576135dd50ac547878ee Author: Hans Petter Selasky AuthorDate: 2022-05-03 20:20:27 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-10 08:05:32 +0000 xhci(4): Tweak USB port speed checks to allow newer super speed generations. This allows setting the U1 and U2 port timeout values. Sponsored by: NVIDIA Networking (cherry picked from commit a1c0442b418b39e57d287750147b0aeae5140766) --- sys/dev/usb/controller/xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index cdc73aa13bc8..c173d780217f 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3601,7 +3601,7 @@ xhci_roothub_exec(struct usb_device *udev, switch (value) { case UHF_PORT_U1_TIMEOUT: - if (XHCI_PS_SPEED_GET(v) != 4) { + if (XHCI_PS_SPEED_GET(v) < XHCI_PS_SPEED_SS) { err = USB_ERR_IOERROR; goto done; } @@ -3612,7 +3612,7 @@ xhci_roothub_exec(struct usb_device *udev, XWRITE4(sc, oper, port, v); break; case UHF_PORT_U2_TIMEOUT: - if (XHCI_PS_SPEED_GET(v) != 4) { + if (XHCI_PS_SPEED_GET(v) < XHCI_PS_SPEED_SS) { err = USB_ERR_IOERROR; goto done; }