From nobody Mon Sep 14 14:28:44 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 4hk6vw5Brgz6sf76 for ; Mon, 14 Sep 2026 14:28:44 +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 4hk6vw4h3zz4VGf for ; Mon, 14 Sep 2026 14:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789396124; 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=nr6iOgVXDUWOOPT2YulGbev5iiIPwQiVx1IjPKAqYZ8=; b=c14KcA/5yTl91FryReiBZO15C0xazMbk7SvC+Dpnmxgd66i9AeiEZNWS8D2vDKFZ2k2ueB 2JcksJg6F68x3S6OrQkGzynTDdutcxLK7EbasPC2mQJtH5X8RTc/JQ0m985mK4xPMitjJ3 DXAAnZVnRV+bMDDw75R277ObS7uEhom4xww7brOAUpftlGIhJa7w5/U92ltHJtpvkqi6k2 YPAzk9LGieRNSD/wsI1a7oiASFjCUffBzRDBOMrZaNPTmJ3M6Jg63kejjzWpTyOD4YS9Fv P037wyPUloBJB0t/rIh8cITqEGlbSMgZ3QSE+mLmg7z+4rL0LrH92qkvVZ3QUg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789396124; b=i9EVb+FAKp20Z1pvTOUcfibRiFNCAGK4iX0tJ1OUBcY5BX5Kj6zjblUbhLae+0879CtZ9O yPiV9LNjZ2ZQ47FeTBJgEKtswnXaEGfD4/WDg1y1eYOU+MzF8NuLwXl44+QAcNwblL3zol pHdYl7bMW86GXJKFMnxg1YNvICzHPEu4hvTkRqMgXeTSp/w0wUHcl5jn+GY6cIrl84r+kc aeAWCfxXzhuQ7fWEo7gJ5NoaypARkofpCS7KovWPopd1uSf84kLLC7bZs0QtpTQwhv00xi 1n3Uc/Qn4ogxSTTd7DArz1fFs346a7NJ1/Ac/gMP6oiP9VjSY/Pj0XQOuUwPGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789396124; 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=nr6iOgVXDUWOOPT2YulGbev5iiIPwQiVx1IjPKAqYZ8=; b=IMEZBz6bWcP4E6w8gdYbNUoxuzn8iw+RalKyYJfj7qH+SBgGROpquYazTTPdTDWJJHDvI8 bhUwQRPKaCRcotjQIHOuNsmVa6PElyC86k/qxT25C9x0mXd9HLj9KiDMmCLSRgccRuvWZO yjfbAmdwTEexcG7OfcnPQ0K15IYwQ14ZxCUtxp1zX4IDFqV6drmE13fQPa1nwX1uqJ/OH+ ehbaTnRIJxFzE3YUkr+qNgR7G8l3buDLJCeXIKpdT6qz1tiW5Nk+PZXRkyCbFNobJuz4ua 7lPs73hfzY+EaZqiGMoproS6aVlNpxCEDBqOCHiqjeNU3/UhA6RSgYPrJs9T5g== 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 4hk6vw3kxRzH65 for ; Mon, 14 Sep 2026 14:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3314d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 14 Sep 2026 14:28:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 7c375af72ef3 - main - tpm: crb: check the error bit only after taking locality 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c375af72ef3f631e89431ae32a855d806e6ec98 Auto-Submitted: auto-generated Date: Mon, 14 Sep 2026 14:28:44 +0000 Message-Id: <6aa8049c.3314d.e98eba6@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=7c375af72ef3f631e89431ae32a855d806e6ec98 commit 7c375af72ef3f631e89431ae32a855d806e6ec98 Author: Olivier Cochard AuthorDate: 2026-09-14 14:21:11 +0000 Commit: Olivier Cochard CommitDate: 2026-09-14 14:25:47 +0000 tpm: crb: check the error bit only after taking locality tpmcrb_transmit() read CRB_CTRL_STS before requesting locality 0. An AMD Pluton fTPM (like FrameWork Desktop) using the plain CRB start method reads the control area as all-ones until locality is assigned, so bit 0 looks like a stuck tpmSts and every command failed with EIO. With RANDOM_ENABLE_TPM the harvester retries every 10 seconds, so this printed "Device has Error bit set" forever. Reviewed by: kbowling Approved by: kbowling MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D59661 --- sys/dev/tpm/tpm_crb.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index e5bbec5d46da..f62d350948c8 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -514,17 +514,25 @@ tpmcrb_transmit(device_t dev, struct tpm_priv *priv, size_t length) return (E2BIG); } - if (TPM_READ_4(dev, TPM_CRB_CTRL_STS) & TPM_CRB_CTRL_STS_ERR_BIT) { - device_printf(dev, - "Device has Error bit set\n"); - return (EIO); - } if (!tpmcrb_request_locality(sc, 0)) { device_printf(dev, "Failed to obtain locality\n"); return (EIO); } locality = true; + + /* + * Only check for the error once we own the locality: some + * implementations do not return meaningful values in the control area + * before then. An AMD Pluton fTPM using the plain CRB start method + * reads all-ones, which looks like a permanently stuck tpmSts. + */ + if (TPM_READ_4(dev, TPM_CRB_CTRL_STS) & TPM_CRB_CTRL_STS_ERR_BIT) { + device_printf(dev, + "Device has Error bit set\n"); + error = EIO; + goto out; + } /* Clear cancellation bit */ TPM_WRITE_4(dev, TPM_CRB_CTRL_CANCEL, TPM_CRB_CTRL_CANCEL_CLEAR);