From nobody Thu Mar 17 12:28:06 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 04FEC1A2531C; Thu, 17 Mar 2022 12:28:07 +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 4KK5yZ5X90z4r9q; Thu, 17 Mar 2022 12:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520086; 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=IzxF0hpxoSnBu4REigr8DSM56GYlcip3NWuQXwQxRk0=; b=FbW/QPsDHLWMqCb0r++HnGoh1oxTqiKVeiNoGe00EMUO64peIedVNA4GJqUS7EF/NLPEj9 g7RqigU4txhaH9DubkxFOf3YSGM/LYqDCQdfwWcT7sNvsiJJJzN44QYdjkBlGfWoQiwjrn H2uyYc6N7+paWJ9QTaKXmBQQQFIy1Map2MQcUKowD1NJx9mqo7pYXSJkEMkNj81FIYF/Tv l73OpaDX9HutKc/922ezIGk+zc1sNJP/88GNPvpCgvDWbX6YoamBwswavpkXjGokcN4ngA CZbx5NlpBLPJXyIz6+b4azvNaU7kACtwrktrfO0nZUOwgPBc7dvpEuzhOQbRZw== 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 9D3082685; Thu, 17 Mar 2022 12:28:06 +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 22HCS6Cx083759; Thu, 17 Mar 2022 12:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22HCS6gf083758; Thu, 17 Mar 2022 12:28:06 GMT (envelope-from git) Date: Thu, 17 Mar 2022 12:28:06 GMT Message-Id: <202203171228.22HCS6gf083758@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: 3e40a842aa80 - releng/13.1 - Make sure the XHCI driver obeys the isochronous scheduling threshold value as given by the XHCI hardware parameters to avoid scheduling isochronous transfers too early. 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 3e40a842aa80dc62bd9f4afe8d923f4121773ea9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647520086; 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=IzxF0hpxoSnBu4REigr8DSM56GYlcip3NWuQXwQxRk0=; b=wfBHv7Vti/RJkiEJnfAkfxm9NeKAzYj0modXgp2EM7tBFoqb1Atc7dVoLbz+EjxS8SKEWn YWY21EI9rd6P/fERy7cw1LzHYnRmUlQSCBZ0Rz9G1BUekibQ6a/RfeUGxXMBvFIUkbfiK3 3JNuuJH4djTv/emNoOeM8hidKMZTvOPaX9o9XYRMDpMwBBZxCB0MF/ROSiH04Ow3GX3VND K/nVJAcYMfisVY1RrEm0Z/Xrbdp40KAwTFo0DOhAyBLRQDtPkS7t1TTiMvplDefhDInH3e w1nDuNY6T9adEGSOmVCrBb72GMkp/tAng6wW9YttOhM19rjRCflTt7zEvvQ7RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647520086; a=rsa-sha256; cv=none; b=HKeMPhBYyHBP0QMYOYfEabjKtbVq3p43sRhLHp7E4y/o8579kXV202ZGGVBqVJl/YFq/yx cB0oMZk7gf/GprSlzUR+G+EK3Xp0bx+L6IfrGSNJNahLjFq5cdmjPqcwalJoy1UjfVjpPs Iu4T4Q1FEFsskO6Q4ms2oxpXmEh2gYc+Kwp3ira44DSE1Sg4Ga/ynwKNFKvMmFOMoEOUdo hZbzk1RtmK6ousMvqZh/fkEpzKDoZbJXA8WMMEZw2M344q4X45GqdfIq6NG7W78CwKFNhI mg5yjuilc2gwnsm6eClqCHf+/mL3KchCXfl5Xhoxi61fYa8q6Hv+8/ghvpNfSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=3e40a842aa80dc62bd9f4afe8d923f4121773ea9 commit 3e40a842aa80dc62bd9f4afe8d923f4121773ea9 Author: Hans Petter Selasky AuthorDate: 2021-07-10 16:09:56 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-17 12:25:52 +0000 Make sure the XHCI driver obeys the isochronous scheduling threshold value as given by the XHCI hardware parameters to avoid scheduling isochronous transfers too early. Sponsored by: NVIDIA Networking Approved by: re (gjb) (cherry picked from commit d038463bd269031fa8f13c0951b223bcae02bbca) (cherry picked from commit 2db063c4cea9ae46493dab19d70499e06f0e1ed0) --- sys/dev/usb/controller/xhci.c | 11 ++++++++++- sys/dev/usb/controller/xhci.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index db2aad057bc0..f42428614bbb 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -644,6 +644,9 @@ xhci_init(struct xhci_softc *sc, device_t self, uint8_t dma32) DPRINTF("HCS2=0x%08x\n", temp); + /* get isochronous scheduling threshold */ + sc->sc_ist = XHCI_HCS2_IST(temp); + /* get number of scratchpads */ sc->sc_noscratch = XHCI_HCS2_SPB_MAX(temp); @@ -2075,7 +2078,13 @@ xhci_setup_generic_chain(struct usb_xfer *xfer) x = XREAD4(temp.sc, runt, XHCI_MFINDEX); - DPRINTF("MFINDEX=0x%08x\n", x); + DPRINTF("MFINDEX=0x%08x IST=0x%x\n", x, sc->sc_ist); + + /* add isochronous scheduling threshold */ + if (temp.sc->sc_ist & 8) + x += (temp.sc->sc_ist & 7) << 3; + else + x += (temp.sc->sc_ist & 7); switch (usbd_get_speed(xfer->xroot->udev)) { case USB_SPEED_FULL: diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h index e8841a05b134..802207208569 100644 --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -529,6 +529,9 @@ struct xhci_softc { /* size of context */ uint8_t sc_ctx_is_64_byte; + /* Isochronous Scheduling Threshold */ + uint8_t sc_ist; + /* vendor string for root HUB */ char sc_vendor[16]; };