From nobody Wed May 04 07:27:17 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 2D03611DBE90; Wed, 4 May 2022 07:27:18 +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 4KtT1L0Cwvz3lYL; Wed, 4 May 2022 07:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651649238; 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=judkxRXeOs5PqT8SXNzoRK1LwETARsNqNeVFcdIZ158=; b=lU1Sdh2GbyhTsi/RwTCmJZi6Z8Gq/QwSlL4igeMZ7AbDa2aLCHOfgCvxbeOYEa2WXSW5au bhgILEraasGgHmyivpQpuIXma0cE0/sd/sxwZst07+1ETFt6P7cvuav8EbtMRaQx0xSpVQ juKrp5Rp66er/7SYsQ99bvTlgUuBkUA8tsdJl3xTZe658g5vOEuImml3G321RezWu3OGOv voO1JJhGrE/KOaFNS2RvpTHX8hN64uL98bRgdK2Ggo0JyEFFbHi3MnfU05XghDpWGK0kIp u3x3WrGjkd+/9llV8JHZBKLj+viBkv+RS4Y4C1zMtiVyOJkylIfoJ+5tczWZ9w== 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 D2E5768CB; Wed, 4 May 2022 07:27:17 +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 2447RHrs084541; Wed, 4 May 2022 07:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2447RHMW084540; Wed, 4 May 2022 07:27:17 GMT (envelope-from git) Date: Wed, 4 May 2022 07:27:17 GMT Message-Id: <202205040727.2447RHMW084540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: a1c0442b418b - main - 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/main X-Git-Reftype: branch X-Git-Commit: a1c0442b418b39e57d287750147b0aeae5140766 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651649238; 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=judkxRXeOs5PqT8SXNzoRK1LwETARsNqNeVFcdIZ158=; b=H5JOfvyGHauCzQaIb4nt8IyIaOGhF4PLfoJrveBXZm5T4YjRrh6NvnXayPJXtKQChSVvht BjXy5iZddrAumY5GKj/hAvkSbChvRng1rR7+rumm21Ll/LmDO4Ri9QjAyL9Xrg9UPolzE4 1zCgVdwok3f/jRWz3Ymu2kE7Tv9TySpBBeE1YYRBwu9d6YeJ0rfWOjhwMdsraDstFhgWEL ybDPDsZe9zzlTcdwRJxtKTzMcUCRsJ0UBXBNTxMuHGyxbY9N5fiMhuYQs0drODXgq9ecky RlUJzSODVjX37HZ2se9koaxhpAAjQ7pc572+ur2T6xbYH3JKOWbduYJ+BR4sVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651649238; a=rsa-sha256; cv=none; b=a+zr4AfjCAYPhlrEnRWb7biYJrdq7MsU6GFB4ckl0f7s8V6sv8Mnm05dKIfkNNwye7J5Lx WuLUhUpcqbPuI/nJk9viOSk0zsjnIZShYDeHlcQhAZMJibV5CoNksjiIhKXvXJYR9ExM9M i3l0RH55BNPDM66l/3rTEo8fKa75ZjYgCXOUPHiJQtzUYnEtTuQCvyf95ycYNoCT3wUY4G Xst71p56ZbOLau1V3AqphtnXLXuiwVtBkA3LDsqAT/Z36cLh2zggKSRRCtFXC2vqsz1IXo pvPGl1aeghXpuPG6+wqMMsEWkDMnA7rLDAdzH03cbJ3XTCP/PVY4V3TBd0XKZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c0442b418b39e57d287750147b0aeae5140766 commit a1c0442b418b39e57d287750147b0aeae5140766 Author: Hans Petter Selasky AuthorDate: 2022-05-03 20:20:27 +0000 Commit: Hans Petter Selasky CommitDate: 2022-05-04 07:26:39 +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 --- 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 2ad72a48293d..15835d0a641b 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3550,7 +3550,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; } @@ -3561,7 +3561,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; }