From nobody Thu Mar 10 08:35:37 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 163781A0355E; Thu, 10 Mar 2022 08:35:38 +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 4KDj7Y3rZcz4Ylr; Thu, 10 Mar 2022 08:35:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646901337; 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=ssnFWdpqS2acJXtepExMnICE7YODm1HbAPp3dTt1k6Y=; b=vZ/+EKxGoN25O/ezpFby4ThgCSRXk/Wq7BjCigQNLYLbfdl1phWSpOooum03nlQmLsAp17 v3ki+ohNXHHZkWqz/NdQOYWSxYXjoMOeX3HDTc2CzPQdTSP6FDCsbFERkbQAHTt4iDaXHa XAYDUaxzAuHcEIsju5xcVqvXALURZlDPPcJhv81YQVzQDwNoPf7QV55d4/pQ/fxPI0xU3A XTthJqRaZS25VNUoGmTCx2bPUoGLLD6fWdSf+qK9gO4jMhZsvD0bUdmAaVB/VsG7MGQHp3 le5puiv1PsoAeVQsvPAsGavZcEk1CGlSsyzkgZsr2v0JEv5Ss4FZRBI6AR2Zig== 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 4B6E421D02; Thu, 10 Mar 2022 08:35:37 +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 22A8Zbix003394; Thu, 10 Mar 2022 08:35:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22A8ZbKV003393; Thu, 10 Mar 2022 08:35:37 GMT (envelope-from git) Date: Thu, 10 Mar 2022 08:35:37 GMT Message-Id: <202203100835.22A8ZbKV003393@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: 2db063c4cea9 - stable/13 - 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: 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: 2db063c4cea9ae46493dab19d70499e06f0e1ed0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646901337; 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=ssnFWdpqS2acJXtepExMnICE7YODm1HbAPp3dTt1k6Y=; b=GcYyiZVlnHW0u6Amj27OD5Bn8NRfwTQLJu7gXFaXgv1JGUAI+Y3wnOK1FNsKxl+vkXOZGF WkfSAF9gJK2aptYeET4PtcB0kO1/k2bxjTb3w3UXxS3pHfpHCqjmRyoQ4ucmBPDHBq05KN XFUfLftFMA2W2S2jVAAukAaJaR10esTz5uTJf/i+R1PBDh0/KVGjnT/i7WYn+3AAx6wzpZ Q8unYiTJ+a/5Z7MBhBxDVB7VN+MWF84pojGCOWa1WpRiKShFnBJqpiqIzp7k1t7Dmik8Ik j+CAj01Kk+GeW7GDx4x+glvH1L59trDkBsC5LHi3UicTKiTz+bW2fl14dVr2LA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646901337; a=rsa-sha256; cv=none; b=jY7mTrN50C3CvBfoi5dHyquw2QW2UTZNQltVPiPmvuIH8g0lh6NyOWNmxCtRwVWfMj0kpc e/RKUNEdtdcAR8rAIl3lrHQydpZMIHerqJjUgujpJH6EZRIicxuN2UvLMOUBq/vqMBifU8 ZWYQL92TVhLfP/0oDSVTgjNnf+9+7yJgriiZMG7Ok9dZALhIuJWodlZQ2k1Emtt7BHU1XM RxP/lN5tzxylRi9T2W8keLvYVMw4rlntWIKokcmtYc/W4u1Q0OFblfKpjV3bJqyotnSW+Y JBMaHzHlU/gm8X379VRZ9LydK7MDQR5BePFyVWrUPDRbZOXqcOUyPCNkXYfEgQ== 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=2db063c4cea9ae46493dab19d70499e06f0e1ed0 commit 2db063c4cea9ae46493dab19d70499e06f0e1ed0 Author: Hans Petter Selasky AuthorDate: 2021-07-10 16:09:56 +0000 Commit: Hans Petter Selasky CommitDate: 2022-03-10 08:27:41 +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 (cherry picked from commit d038463bd269031fa8f13c0951b223bcae02bbca) --- 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]; };