From nobody Thu Nov 05 19:57:43 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 4jLCld3ZFbz6y6Cb for ; Thu, 05 Nov 2026 19:57:49 +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 4jLCld0dHTz3Pp2 for ; Thu, 05 Nov 2026 19:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793908669; 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=hlgAy15FIwwgK+X1zHkttFDKp4IpWFD0ZbJp0/zyaGs=; b=Z0PnF52/ZzO2tU797T9kreiliqRvVwPHtOUgQreHNKbJI9ZlehfTnFC6Rf1pPGDLSl+8FI uKLAIgjLT5pn8XHTJzMAGAhCI2KmbU5N+tdaNRZwsLbqVt23/DfuC7LCY9srF8olQo8u1u D9hygas1woqz8T3xfHJFp1JajfgIJr6+Rc0VRf4wo2IMrh1JlvZ0dlA0BJiDZoztvcubef sq5rm6j/vt4xT9+onPnrQlLuEs/DcWpg2OPOg39nAi77rqQuHgEC7UHgkqL+n9PoZU9siC OlFf45Fl1K3yXZXGvfprkrosen+GqVbzuqmN9VLuf9A6lSDJa5A/0LHvTiQ56w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793908669; b=vXdYbuyeUT5sS6aSbgkZ6TJtk0EhJuMHNiBb/15h5kINgs/PvLiMpm/NgX5mDQylTiAQP4 aLp6UANnPne86N/YEsxXhp5zfdTX2XOmC2nZWQSRvbvH/yRvX+Y5R7tg0dtg2+E8hbizHj NdQZTDiW3hmXylNywo+nmrjVcaczghbP2QUodvq6XnOIPJZPiyceIon3IknwPSy8G+PC8e 6dsbdlMzuUSvNATNttKgGjgBvmcMgTz5szCOIaFaC4ZbEMj65tfNVd/ouGQlUwKRhFyxnZ 9H9cYOfwTaGLJ0oc6eejVLRUQAA5aCHgAE8j/LAx6PJ6EwOk2JVDxYJTdTX8hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793908669; 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=hlgAy15FIwwgK+X1zHkttFDKp4IpWFD0ZbJp0/zyaGs=; b=PBSuasU8H/0YZMRDfo3gQhqU64P0pbjEv2GzG0i8t6BfCIj773dKeRLZ0C8IM0SUEA13Kr BERb4pB83phbgHtgUkrh/dy9tqlAvahXTwidkLyzaVSBAuQ5hvlsKU2z15OQIyAnXwIBi6 ZayI4MW5wDofbZNedTU8J5z9OrlOyjjRgikXQMTL3UCvJymW6VZl/I3ZjqZhODmc56uLdq hxAb9f8C9Lt3rY0WGdrop+Xi30pwU5eBypRV/wRzZkkzKCq26Lb846JIrkC2rwVH8xYbYB cEa9oFMyjUrrqz9FxSobE5F4EeZU5AZRY5Gmf5qwmJUOGjomDbRaYjv5oy/tug== 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 4jLClc6V4fz14DB for ; Thu, 05 Nov 2026 19:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18847 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Nov 2026 19:57:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: bfe4be85a935 - main - 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 Sender: owner-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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfe4be85a9354b92135e105028f2e1b3e0307ada Auto-Submitted: auto-generated Date: Thu, 05 Nov 2026 19:57:43 +0000 Message-Id: <6aecdfb7.18847.3d7dee3c@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=bfe4be85a9354b92135e105028f2e1b3e0307ada commit bfe4be85a9354b92135e105028f2e1b3e0307ada Author: Olivier Cochard AuthorDate: 2026-11-04 21:05:22 +0000 Commit: Olivier Cochard CommitDate: 2026-11-05 19:51:20 +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 --- 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); }