From nobody Tue Sep 29 16:09:02 2026 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 4hvNQr18Zmz6tlsk for ; Tue, 29 Sep 2026 16:09:08 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hvNQq6tgHz4qyy for ; Tue, 29 Sep 2026 16:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpVdvkFSKjgkK4T77BdwkwzoShVps0P+U1KAH5CW8HE=; b=wG5zwIQm/CQxeRgeFybccNhquc38kaaQnxh6NQLfQr7LntDNE7Qll/Eu/qr7oQ6zInUM7l PU7To2UN5sj0QZU3NwDNuUzU/Kdx+aPVvSh46YGNRXOAPy04wAxKbORMrPMBHKEHV+2Osg 9f2CNZ0NBrLwV50LsiKn7/MV3WrCapv8evVQim0rQtNu0vIn/A60quHNZ/p4R6eWbv6Ziz fIWgSakpA7jgMhEu/OLM2PMKgBjs96ErLq7dtscvQFrzxgmuhDu4e3A2u1L5mBnb+83pHm 7YiTCDvbkHNK32qWuAXEZjoG0ZBiCmZtzvCs5gS6S5GuqTfBIfNbCYUhwpgFKw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790698148; b=Smq62CDURneFq9Ft+xLssTEN9s+r2DZR4h5kz+59hWWHSVxoEO3Pianb1CtRs2afrAa4Dv Ci8I2jPIY0H1T5m5XUMzswLyCOrNlQVJ4GqiXWpAgvWILQXPRfrOHvFphvl/x1YibDrCty ON7+Cbh5Dr1uNDh0/42uuKW3+nhA9LlVE+Fv+u44KAmoVVrjCuLjFAfQ8vg5A6rI8hhYdM W0rwrjewDEhY1IXk4857sH2LAZzjSzRn94ISvaEj+8cCh46/xTCVwBlJZNiQBKqYftRwnz xeoXpvmOLOQL/LSaMXESXCh10f4RxQCFeQrI6jZgti2yTh3pvo9nanygdGKp3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790698148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zpVdvkFSKjgkK4T77BdwkwzoShVps0P+U1KAH5CW8HE=; b=NRXAG49NCcgMgui9xwVqfAhzzmqT+MlXdA1zKGo/9ZFuvf641RCpu2iQ50VnJb2l6Xg6PK 1M9EEtoItfhs8W+wAV+LLmqksjbUfvjIY+rlPSlWQvct7BSU1xGBOFWvlmJJqenvmhK58p gQqlOXDBxsivCI8Ll/rNNSU1gNfHRbXNsVeh9ciCpUxV4lgN5ex+yZfQ6H0yaRYntJz0zy 0llo91uy3yrBLTpIKrxliBXsc1cnlF6Pcbr8E1qOHWMqI4M9VrTWj75HBsC4ygzngXDS3r z5wvE/zvQDvD/GzQNnBrjP4Cedx19xzBX//Uk17Cw8FcoOjip0dp48sAObBVZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hvNQq5wqbz1KQr for ; Tue, 29 Sep 2026 16:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30c67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 16:09:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: ShengYi Hung From: Mark Johnston Subject: git: 662ed9948327 - releng/14.5 - xhci: Only reset the data toggle value when the USB stack asks for it 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: 662ed9948327ffadc9379aa524865fda810401d9 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 16:09:02 +0000 Message-Id: <6abbe29e.30c67.ca07c8f@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=662ed9948327ffadc9379aa524865fda810401d9 commit 662ed9948327ffadc9379aa524865fda810401d9 Author: ShengYi Hung AuthorDate: 2026-08-24 17:51:41 +0000 Commit: Mark Johnston CommitDate: 2026-09-28 13:07:40 +0000 xhci: Only reset the data toggle value when the USB stack asks for it The previous patch assumes that we don't want to reset toggle bit in STOPPED_STEP. However, a device can explicitly call usbd_clear_data_toggle if necessary. As a result, instead of not dropping the bit unconditionally, we added a field in xhci to specify that we want to drop it, so that usbd_clear_data_toggle can handle it correctly. Approved by: so Security: FreeBSD-EN-26:22.usb Reported by: oh Reviewed by: kevans Tested by: oh Fixes: 28d85db46b48 ("xhci: Do not drop and add bits in xhci") (cherry picked from commit 0f59df83869d3734a33d96b01381823e6a3ef3ff) (cherry picked from commit f656bde0c2efd016f1c5d1f22460d657e73a7eb5) --- sys/dev/usb/controller/xhci.c | 23 ++++++++++++++++++----- sys/dev/usb/controller/xhci.h | 1 + 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index c9820ce55423..c3360e05d748 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -3796,6 +3796,11 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) if (epno == 0) return (USB_ERR_NO_PIPE); /* invalid */ + USB_BUS_LOCK(udev->bus); + drop = pepext->trb_toggle_reset; + pepext->trb_toggle_reset = 0; + USB_BUS_UNLOCK(udev->bus); + XHCI_CMD_LOCK(sc); /* configure endpoint */ @@ -3813,14 +3818,16 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) */ switch (xhci_get_endpoint_state(udev, epno)) { case XHCI_EPCTX_0_EPSTATE_DISABLED: - case XHCI_EPCTX_0_EPSTATE_STOPPED: drop = 0; break; + case XHCI_EPCTX_0_EPSTATE_STOPPED: + break; case XHCI_EPCTX_0_EPSTATE_HALTED: err = xhci_cmd_reset_ep(sc, 0, epno, index); - drop = (err != 0); - if (drop) + if (err != 0) { + drop = 1; DPRINTF("Could not reset endpoint %u\n", epno); + } break; default: /* @@ -3830,9 +3837,10 @@ xhci_configure_reset_endpoint(struct usb_xfer *xfer) * result, xHCI may refuse to receive or process the packet. */ err = xhci_cmd_stop_ep(sc, 0, epno, index); - drop = (err != 0); - if (drop) + if (err != 0) { + drop = 1; DPRINTF("Could not stop endpoint %u\n", epno); + } break; } @@ -4097,6 +4105,11 @@ xhci_ep_clear_stall(struct usb_device *udev, struct usb_endpoint *ep) USB_BUS_LOCK(udev->bus); pepext->trb_halted = 1; pepext->trb_running = 0; + /* + * The USB stack has cleared its own data toggle value and expects + * the hardware data toggle value to be cleared as well: + */ + pepext->trb_toggle_reset = 1; USB_BUS_UNLOCK(udev->bus); } diff --git a/sys/dev/usb/controller/xhci.h b/sys/dev/usb/controller/xhci.h index 3758815238ad..c2e6cde8ad77 100644 --- a/sys/dev/usb/controller/xhci.h +++ b/sys/dev/usb/controller/xhci.h @@ -419,6 +419,7 @@ struct xhci_endpoint_ext { uint8_t trb_index[XHCI_MAX_STREAMS]; uint8_t trb_halted; uint8_t trb_running; + uint8_t trb_toggle_reset; uint8_t trb_ep_mode; uint8_t trb_ep_maxp; };