From nobody Thu Apr 21 15:02:42 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 AEED8198C495; Thu, 21 Apr 2022 15:02:42 +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 4Kkgkp4Z9mz3Brq; Thu, 21 Apr 2022 15:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650553362; 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=jIaxSh0PmaFKV13aep2Z+NeTDXNbS++SJRyTNPvf3UA=; b=Bkg9KWURYcx7jhQw2Fhv/i/9F9BtuMqwyfqZ8Cm7N5gGImb0znVElhopLZc+Fo6mUMKswY EXE5EkovVBiA7zsP1B1ksueX+WqIuI8+Z/9mEo7B9cmntXRaxjd1uWikKId9P1PPQ0h66Q oToTyUhwTBS95fTnPnYVq2OoxYAJVrEPhnZWq/T5RalCfa4410F3v7t/h2pNmWbOWGzEtN 1+UWVNNxXPUUSBvJGxpfHpLMxGcK2fQQFmFGgKZzYQ71r+qtk3cSrMWZxXC/dWdKtnZK1W oPKLWn/4IiSmobB+vrI8egbHf3y1uYUHEYqBPFTO6JnPSQvdXMXauMXi9q7HLw== 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 721EB27FF; Thu, 21 Apr 2022 15:02:42 +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 23LF2ggl010182; Thu, 21 Apr 2022 15:02:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LF2g2L010181; Thu, 21 Apr 2022 15:02:42 GMT (envelope-from git) Date: Thu, 21 Apr 2022 15:02:42 GMT Message-Id: <202204211502.23LF2g2L010181@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: cda31e734925 - main - xhci(4): Ensure the so-called data toggle gets properly reset. 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: cda31e734925346328fd2369585ab3f6767ec225 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650553362; 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=jIaxSh0PmaFKV13aep2Z+NeTDXNbS++SJRyTNPvf3UA=; b=BdrKf4d8hoMKjGk7YsZjKka2qQIxL8PgcXKN+J7rqoOCrIB2CEcQpeOSJOdSleqSFkHW83 z44GYaW0/sEMPNC+WBXOV0IDfzOG5R1gyufkRR2mXCrJcD3LaMNjIYwW33x688KdT+YeWF t9F4LBBeCWnDN48e4WWUQ8aKyLStXDV5tnQ71mr2HXQ0eaX1FeIKuMy/yDUWL1vuLPWAEX vrJGJIUowyjF9Pp5JOFLEwCirYVXTtEPxC+SGTDRoO+Qt+pc9VJQD+29yg3yx2sUiCsmBJ qzIm81N4nVcd2iY2Tag5bcXeNtMmF2EUID2QLlNZ2pIGuSM3vNDc/AnLpziy9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650553362; a=rsa-sha256; cv=none; b=kb9cuMelyu5bfi+ooWExM+pzJzq9wHDKGHOlhsRgWz1WkvHNu9h0m3q3kKLTgYJDn7DImN Bj5wZtbqu8AJfzLrJi1P+1pCXhMjrmKtHIjaLPm5qlsWj3KOjllNkXN4flIEzcs9mPkO61 DRPpbKyn/WqseWf/KIJU5Xw1YN6VR7MKPrz5fD9fd/v9jBGeKI4d8P4bI41c2nqtAfFC6F QVcxoIyUrxtCndV/SvvNyvFCLpOzNavglIMJ7uMWZNzAIrOa9i0X7nX9NwE8DIT65ERK1y NqV9Ttlrl8tb7SFv4FCJmx4UWx169h3k6ow/IwggYUF8wnbiKNQXQVSGBQqMsg== 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=cda31e734925346328fd2369585ab3f6767ec225 commit cda31e734925346328fd2369585ab3f6767ec225 Author: Hans Petter Selasky AuthorDate: 2022-04-21 14:59:09 +0000 Commit: Hans Petter Selasky CommitDate: 2022-04-21 15:01:13 +0000 xhci(4): Ensure the so-called data toggle gets properly reset. Use the drop and enable endpoint context commands to force a reset of the data toggle for USB 2.0 and USB 3.0 after: - clear endpoint halt command (when the driver wishes). - set config command (when the kernel or user-space wants). - set alternate setting command (only affected endpoints). Some XHCI HW implementations may not allow the endpoint reset command when the endpoint context is not in the halted state. Reported by: Juniper and Gary Jennejohn MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/usb/controller/xhci.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index f95996b7ab32..72d1ff5e0ae5 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3772,6 +3772,7 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) uint32_t mask; uint8_t index; uint8_t epno; + uint8_t drop; pepext = xhci_get_endpoint_ext(xfer->xroot->udev, xfer->endpoint->edesc); @@ -3813,15 +3814,19 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) */ switch (xhci_get_endpoint_state(udev, epno)) { case XHCI_EPCTX_0_EPSTATE_DISABLED: - break; + drop = 0; + break; case XHCI_EPCTX_0_EPSTATE_STOPPED: + drop = 1; break; case XHCI_EPCTX_0_EPSTATE_HALTED: err = xhci_cmd_reset_ep(sc, 0, epno, index); - if (err != 0) + drop = (err != 0); + if (drop) DPRINTF("Could not reset endpoint %u\n", epno); break; default: + drop = 1; err = xhci_cmd_stop_ep(sc, 0, epno, index); if (err != 0) DPRINTF("Could not stop endpoint %u\n", epno); @@ -3842,11 +3847,25 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) */ mask = (1U << epno); - xhci_configure_mask(udev, mask | 1U, 0); + + if (epno != 1 && drop != 0) { + /* drop endpoint context to reset data toggle value, if any. */ + xhci_configure_mask(udev, mask, 1); + err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index); + if (err != 0) { + DPRINTF("Could not drop " + "endpoint %u at slot %u.\n", epno, index); + } else { + sc->sc_hw.devs[index].ep_configured &= ~mask; + } + } + + xhci_configure_mask(udev, mask, 0); if (!(sc->sc_hw.devs[index].ep_configured & mask)) { - sc->sc_hw.devs[index].ep_configured |= mask; err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index); + if (err == 0) + sc->sc_hw.devs[index].ep_configured |= mask; } else { err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index); }