From nobody Wed Apr 27 19:18:05 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 942EC1998C80; Wed, 27 Apr 2022 19:18:05 +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 4KpT6j3HZ4z3GG6; Wed, 27 Apr 2022 19:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651087085; 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=i3eS1Tc4SGkQ/94lZP4VRrxdvpfl+Nhmy9bCVcE2dOM=; b=Jm77A1+vufHHCPw0iitcVi6u79qKcXYfMdS4J2hgCBbXb+Z17JkfwmPdLN31ouIB5CouN6 YHDFvS0PLQzbkvPSnUBKO+ewOtA2Zj4/E6VJDynTP2qSck5ydclF5q71Hz4kxyzI32DH0a vSjHkDjfyfh3B6AvR9K8B7geGl+pjB8SfeqavLcdLVlRGhim3KGVmGxH8WYcXt091KIBXx hloyg2tMM76qV40nLK1jY2tKQwwdfyHT5e+fhN2mrTO3C4KI4CH7QflJvcTvNW40MOFGaK yQ9bQfbTR3C0kXxWN3MlUeu5tPOIHxKN1IgODmRgP6Ir+zza2PB/qytPrDMfgw== 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 40C9F1B1B; Wed, 27 Apr 2022 19:18:05 +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 23RJI5IZ033853; Wed, 27 Apr 2022 19:18:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23RJI5w2033852; Wed, 27 Apr 2022 19:18:05 GMT (envelope-from git) Date: Wed, 27 Apr 2022 19:18:05 GMT Message-Id: <202204271918.23RJI5w2033852@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: 683c36ae04ab - stable/11 - xhci(4): Ensure the so-called data toggle gets properly reset. 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/11 X-Git-Reftype: branch X-Git-Commit: 683c36ae04abac55841271b3d9a65c0eb5b7155c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651087085; 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=i3eS1Tc4SGkQ/94lZP4VRrxdvpfl+Nhmy9bCVcE2dOM=; b=AfyBSSKZthVuKpSYrnV7LjjpcFL+0SgoNpsA5KMQFaw9xM2Ok7DMfe9hQne5YpCuESt34E Xq0BLFjy9BTZvnt2SHKZaP5f4T+5vGIuW6RbUSRG2QtYCYxTfOvWBE7FAfp9qtSqpRBjqi xmuj0+FjQcvNhJujUTYeYxfwEy55N/S/Sf8tgM0pKfQKAUBwbMr0FDKXVEkee34gqK9O3i /VJjsDB2KYiIJ4CWJSYL+I5pleBdL/rhBU9GMmbgBWoXIO3WeiNnVpeYYVI8OU2IFmSoqs BQez/8SGkicH78DDcYeZoafodePcXSv4yvxIeqluPKSq8NqBzyqtD81KwFJ9OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651087085; a=rsa-sha256; cv=none; b=iEKN+NGTtiHnv09Zt/GrbXJhaWYa2IIfmwrFycIpVQSfpcly7SkO5Ly8ptyKZf9c+3fNT8 9o14MMVze73PTDF2nVv9gBRWRXFDP5rQcTBB4vSDXK2cGPGu9S0V9rIsBRD0eNb3IB8cW7 OoapmJJSvOl9Ay2ytddUEq9Zp18VOMrRHXWTz96J7haO9hOb6cD+mtjX78ejhqs8KLIPtq E1xtbtWky4hXW9sBS9Ayx75ypnV2TXJ3YnlEE9Ep6lr595k0nbW0+2AETqd0H/89oK/x0f mSwB7pQWj3QdMtU0G6jOiScL6VlETRoSZQz2Kz6s8zRZjC5EcRWs4pjZnOfAVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/11 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=683c36ae04abac55841271b3d9a65c0eb5b7155c commit 683c36ae04abac55841271b3d9a65c0eb5b7155c Author: Hans Petter Selasky AuthorDate: 2022-04-21 14:59:09 +0000 Commit: Hans Petter Selasky CommitDate: 2022-04-27 19:17:46 +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 Sponsored by: NVIDIA Networking (cherry picked from commit cda31e734925346328fd2369585ab3f6767ec225) --- 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 cfe1b40fdbf8..f71062059653 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3856,6 +3856,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); @@ -3897,15 +3898,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); @@ -3926,11 +3931,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); }