From nobody Fri Nov 13 01:19:29 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 4jQfYZ0njzz6y0RL for ; Fri, 13 Nov 2026 01:19:30 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jQfYY5vm6z4nfB for ; Fri, 13 Nov 2026 01:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532769; 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=8wDzv0NmjlXdZDmJhK+aD17Ps5RSmkl/zvGVvKz8Xxs=; b=ULOsrq/E5Nav4HGcRFeNBen9h0zO/LsGlV6wB5JGtVw6hG7NCjH7rugRnUQvii8uD1J4K9 iVrsEX2f3i76kLmtRae+Xb5t6CWkFAdPswVp5saD54Ax4GCUwGg0tTO63lFoa19hZK9Ga9 YysUNJLu1R2g2pwSlfkr5kI6Ex1JB5FgehF7XIgubTLVxTniWj1Ksl97FMEPucE3Tz/b3z HAj/H/nBna+Y++ekVepSis3jjAap++P8m81zvi9BE0M9sHQV43QT2hgSLJNMa3Yj7awdHp ejh16iEb/1Hd/d7yki0SfYKPqqvBLgosFhftjS9DJHYlX0dUZRxUfsnsWC2jMA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794532769; b=KqA7u1a2dK4R3V+DdfVkf8P+cB05SymBGJlGQ85FTTkx9T7QQN/f4oQafcPeAPIpxJkh4Z E2oH3O0sonpplaz6WXN4X2MX4VhYM/vSggryUCV9yvrZcAbrsvghduuxC0WKlIu3VVlC0m UZM9QlDCzBPRm1OqIeYdzfZ4jFNe8cwFDuTmen0wTaDrz/6yDeuJOXgk9r7HHsr/K57cEL 7yGrpdjghN6F4dmBe8MeyfCz0g9HxfU/99LkNEME3ui532EbNBtxnQKJJatloacoI5yZCm qWiEmK0jwBGR47bHW4kXbvKKm9f89weMLhtB8vO10wgYQ5vvIEONlptKhCtv5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532769; 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=8wDzv0NmjlXdZDmJhK+aD17Ps5RSmkl/zvGVvKz8Xxs=; b=E4FNktobZHOqga1d61SwgKquZWdHGIzlS1sWocFBk6wLdzMRuq83KEuc3ezcp1cu3t/1MR 3rGa10i6WgFnBmwDIC9C69lpHBAulTi93Jk4RhhLtdLkCRA4KiJoEkkt+8bUXQYKCqCToq oa7WEeWQ2KRQIObOMwi75IAyQLOj38JCv9hbejY7OsiquorBBpf1pTM+cR1EgZvjURcC8C GfdPL76lfmBUeO5mTn1rMXc9m8Fpq8pSMZqIL2LAodKtLFsq0rGtrnQlZ5jmmCiDMTR2i4 1zz2o/Phy6PqdnBW2nLvBZFWGLzCiVTw8Z3yqXXzHRpstAL831AQ9FdO+kWS9g== 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 4jQfYY4r7Hz1R18 for ; Fri, 13 Nov 2026 01:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 198cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 01:19:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Cochard From: Kevin Bowling Subject: git: 052e37a485a6 - stable/15 - tpm_crb: wait for idle and locality release after each command List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 052e37a485a68104291fd6d6ba2be1ae4a8cc470 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 01:19:29 +0000 Message-Id: <6af665a1.198cf.2f75842d@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=052e37a485a68104291fd6d6ba2be1ae4a8cc470 commit 052e37a485a68104291fd6d6ba2be1ae4a8cc470 Author: Olivier Cochard AuthorDate: 2026-11-04 21:05:22 +0000 Commit: Kevin Bowling CommitDate: 2026-11-13 01:19:19 +0000 tpm_crb: wait for idle and locality release after each command transmit only requested GO_IDLE and the locality release, so a back-to-back command could see stale state and fail with EIO. A post-send idle timeout no longer discards a completed response. Reviewed by: kbowling Approved by: kbowling Differential Revision: https://ron-dev.freebsd.org/FreeBSD/src/pulls/93 (cherry picked from commit bfe4be85a9354b92135e105028f2e1b3e0307ada) --- sys/dev/tpm/tpm_crb.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index df47f88f79fd..4e6f550e473c 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -552,10 +552,33 @@ tpmcrb_request_locality(struct tpmcrb_sc *crb_sc, int locality) static void tpmcrb_relinquish_locality(struct tpmcrb_sc *crb_sc) { + struct resource *res = crb_sc->base.mem_res; + uint32_t mask; + int timeout; - if (crb_sc->has_locality) - bus_write_4(crb_sc->base.mem_res, TPM_LOC_CTRL, - TPM_LOC_CTRL_RELINQUISH); + if (!crb_sc->has_locality) + return; + + /* PTP 1.07, Table 37: the other fields mean something only if valid. */ + mask = TPM_LOC_STATE_VALID | TPM_LOC_STATE_ASSIGNED; + + bus_write_4(res, TPM_LOC_CTRL, TPM_LOC_CTRL_RELINQUISH); + + /* + * Wait for the TPM to act on the request. Otherwise a following + * tpmcrb_request_locality() can see the stale assignment and proceed + * just before the locality goes away. Read once more after the last + * pause so a release during it is not reported as a failure. + */ + for (timeout = TPM_TIMEOUT_C;; timeout -= tick) { + if ((bus_read_4(res, TPM_LOC_STATE) & mask) == + TPM_LOC_STATE_VALID) + return; + if (timeout <= 0) + break; + pause("TPM locality", 1); + } + device_printf(crb_sc->base.dev, "Failed to relinquish locality\n"); } static bool @@ -783,12 +806,14 @@ out: (tpmcrb_ctrl_read_4(crb_sc, TPM_CRB_CTRL_START) & TPM_CRB_CTRL_START_CMD) != 0) (void)tpmcrb_cancel_cmd(crb_sc); - if (!tpmcrb_state_idle(crb_sc, false)) { + /* + * Let the TPM finish going idle before giving up the locality. + * The next transmit requests idle again if needed, so a timeout + * here must not discard the response of a completed command. + */ + if (!tpmcrb_state_idle(crb_sc, true)) device_printf(dev, "Failed to transition to idle state post-send\n"); - if (error == 0) - error = EIO; - } tpmcrb_relinquish_locality(crb_sc); }