From nobody Tue May 10 08:08:09 2022 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 275611ADA28B; Tue, 10 May 2022 08:08:10 +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 4Ky9dj46mTz4SlB; Tue, 10 May 2022 08:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652170089; 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=W+q54TnfHaBPf3YlLfYC4JUrGcvIwC8EIkK91iGQaIA=; b=L6O30PdrlNG/jlhgttAfl83MfXWrPRKd3AcKVAvIOwreWZitpt1iDEryot4xnT96si30Qu /pt/+RUpTgA+r6IB7xtOWBk+AnTTpI85r2LXYAzZfwEQKhbm2gbeSdDp9BKQfsraT3A/AT CgZplIVF5qHf+txUl8BP4lV6L4BlBtf5XRa+dCyJIpVnM/Z4E5CmDc1QRwhhe5QfA9qqM/ AaJpt+/YdQua3JvMDqciw4Vazbp7nJIQ3Zwup6DtFdurCQ0vu3Mg6UMFwGFrU3gPD40zmM fOoDVZXo4IaofzjYHZsk4FTmG+iG5PZDdE576Dr5FZBp2KWk5ZbJ8hxmD/okIw== 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 69E0821B8E; Tue, 10 May 2022 08:08:09 +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 24A889Zv029679; Tue, 10 May 2022 08:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24A8896a029678; Tue, 10 May 2022 08:08:09 GMT (envelope-from git) Date: Tue, 10 May 2022 08:08:09 GMT Message-Id: <202205100808.24A8896a029678@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: c42b04d3af7e - stable/12 - xhci(4): Tweak USB port speed checks to allow newer super speed generations. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c42b04d3af7e10c304111a1cca48cc6afa501d0a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652170089; 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=W+q54TnfHaBPf3YlLfYC4JUrGcvIwC8EIkK91iGQaIA=; b=T6lnywhjqQDHQn9UolKc3N1jqFyp28vHSIpwo7P+XDaEcODPFBDarFrSVPEg/zzClBNNoP o0Jdmyn0pkVIc1kSwzDUvJ6fCu6H/fGn0WJhYrView4ADJSCHGGPBmOeAifx1ncLpO87Mn AAJReqY3C8HmCNNSpmgKlgRqVv4B1iWHy57K1cbmAy5oj0bs8RukRHN4G3CgE9WD4Fwqav vRBu9HSi0RIl3ViQa6HNn4pYQUG1LDku4w6LUvbb5lBhZL26shFecCbYZex9jjuuAcP2wC BLBdvZ50E4nppOYg3tBFDodjOhvbMKFh75ZwuyIf0fno47Z8wBC1SwXds6qa0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652170089; a=rsa-sha256; cv=none; b=AUe2axRbNNak9PbHcGYZY83N9HH/yF5gcHd1Tn9S+1zrzujaVfrCRR8FzOAeC/t3RIEj6X XwKOdZuRzqeHXsleLK215WqvLpDL1cNMwg4QiaIKYsk3waLVR1V9toVFT1QiW7KAWMwSN8 RnMg21u2s9biObBwBpwNk9i5oqgQJgBtxYFzLET7mCJUtH5powEpkjC0es4n83p6E74N6r PIlW6Foc0XbdDQhBIClgeci3sKP8nRZGGPnQ/vkMuwPEBENMD3xgZfjS3dXruW9cYPbi8I o9ld/22Djy2xV4WNgPKWlvKutCxVqt1kPMAqi/jMKXsaxnuezHblyUgk9YR5lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=c42b04d3af7e10c304111a1cca48cc6afa501d0a commit c42b04d3af7e10c304111a1cca48cc6afa501d0a Author: Hans Petter Selasky AuthorDate: 2022-05-03 20:20:27 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-10 08:07:06 +0000 xhci(4): Tweak USB port speed checks to allow newer super speed generations. This allows setting the U1 and U2 port timeout values. MFC after: 1 week 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 5da51efd9dca..579ccf1a21e1 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3635,7 +3635,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; } @@ -3646,7 +3646,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; }