From nobody Tue Jul 21 16:58:42 2026 X-Original-To: dev-commits-src-main@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 4h4NrL1z6mz6mBV9 for ; Tue, 21 Jul 2026 16:58: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h4NrL1M5yz3x8h for ; Tue, 21 Jul 2026 16:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784653122; 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=HUMNyRc0HqqkKGVFbQKbpD1qelc/E+8ZUehf9C0ytY4=; b=U4oDdVqxDv+sKuoT8CUk3jXHArkFgiEZfnK3sEqnMUJUZ7GJKX563lR0HMOC60JcrC+RCH QB4EIw/PGp9FTeow6q8pYXM9Xzh1sS16rFZ40fxgBueXBIIG5lbuWNzomT8kpFe+3V3yYM mL+ownsv5Jn/qXTYLkTWJe2KXdYKiplyq5+69pC7Mu1LblYbuG+7X5sVH5Jl6sNT9IKulf 8OyCiHOeY9zJgmLtS9N6MPrfSgdPTJqrC1MEDGvn3v1r7eQBk6f+EbdtjuEuky2cf2eV11 P8LRlFpzv/rMHAI3NWrNBGBmu5T+5hSs+mrHwm+Mnh3FhiGkgpNoGw7Ux+g62A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784653122; a=rsa-sha256; cv=none; b=rBfvJ9niWGYCX3Rpe7qhpZNJzSsJ5EcH+6CkrCL5FXfYu3lWuiWVDEkvwhA9TJefOsiM/Y +V1pR26SvDTNOQa3DiY/y3HucfAydSz7oCLE6L5eTureg0Fm1IS61OokUVsQYMy8dWmfj0 sY2rHiTr3u35BjvESJNnMXUilfa7fGlLHWn/oKnwlsfaFNpWL1xSPEt141m4FeGkoKa0pP tgsuJwtkgTf5q3rA7IM8qC8n90Hr6NlswbqCBwZyzDgZJAY8Gja06xUL2jEt4LbfSthsFR Z8ITbEOnQWbUBgajJa2ueCIlA1pE+VKU5p5JPCy5oGnKH9YWTwVqdRvLdiIFIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784653122; 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=HUMNyRc0HqqkKGVFbQKbpD1qelc/E+8ZUehf9C0ytY4=; b=WpwoamHrZnSPot7/xyvvaMbBTuRtzz4huu0vUwyt1PJIJ8G/zKGK1SzTxgLxQhhnhRoOdr qu6IWNlDBsnu59RFbUtZDhYmEI1xsQUKNEBj1vrO/OzihZuNIVZRBNWwbhTPj77cBxqN7H qRYTPbT24yj6d/jzddBs2/v5WH1kjX0nFUMyp058yia5i0IcmgSlknopnbMR29NyFhxzv+ /h/mgraiqJ5iOi7Y+plMmqMNsFaysY5VwXJC5Q80makTWLbxa6OPGz1ciYUmx6QE6S0e8l RV4EVEQKY4VVbZgtjSdCFwBJUlk1dvH+6QFSmulCsDegt7UyOosXE9eyx0PGng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h4NrL0DcJzwgV for ; Tue, 21 Jul 2026 16:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35caf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 21 Jul 2026 16:58:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 2e3892671a6f - main - hid: u2f: stop interrupts on last-close List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e3892671a6fe2bceff6a9d8b439e7acd27dc28a Auto-Submitted: auto-generated Date: Tue, 21 Jul 2026 16:58:42 +0000 Message-Id: <6a5fa542.35caf.51466520@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2e3892671a6fe2bceff6a9d8b439e7acd27dc28a commit 2e3892671a6fe2bceff6a9d8b439e7acd27dc28a Author: Kyle Evans AuthorDate: 2026-07-21 16:57:47 +0000 Commit: Kyle Evans CommitDate: 2026-07-21 16:58:19 +0000 hid: u2f: stop interrupts on last-close This fixes an issue with the Solo2 (and likely some of the Nitrokey family) where hangs would occur with OpenSSH- it issues a CANCEL prior to closing the device unconditionally, and without draining the read endpoint we end up seeing the response to that CANCEL the next time OpenSSH tries to connect. This throws the entire command/response sequence out of whack. This call used to break Yubikeys in some situations, but the fix that landed in 28d85db46b48 ("xhci: Do not drop and add bits in xhci") seems to have addressed that- presumably we sometimes end up stopping the command and desyncing at the controller level. This probably implies that we need a SYNCWRITE HID quirk, but that requires a little more work in usbhid_sync_xfer() and this doesn't seem to cause any problems in normal usage. Reviewed by: aokblast, wulf Differential Revision: https://reviews.freebsd.org/D58199 --- sys/dev/hid/u2f.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/hid/u2f.c b/sys/dev/hid/u2f.c index e1f696d72f01..d4bb56368080 100644 --- a/sys/dev/hid/u2f.c +++ b/sys/dev/hid/u2f.c @@ -223,7 +223,6 @@ u2f_detach(device_t dev) } taskqueue_drain(taskqueue_thread, &sc->sc_kqtask); - hid_intr_stop(sc->sc_dev); knlist_clear(&sc->sc_rsel.si_note, 0); knlist_destroy(&sc->sc_rsel.si_note); @@ -300,10 +299,8 @@ u2f_dtor(void *data) { struct u2f_softc *sc = data; -#ifdef NOT_YET /* Disable interrupts. */ hid_intr_stop(sc->sc_dev); -#endif mtx_lock(&sc->sc_mtx); sc->sc_state.open = false;