From nobody Wed Nov 04 19:49:36 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 4jKbcd0C05z6yt1P for ; Wed, 04 Nov 2026 19:49:37 +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 4jKbcc3cBvz4HQk for ; Wed, 04 Nov 2026 19:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793821776; 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=OpRuUisbN7Kn9/VKRAq1G8dY0WlW8nEIorVqVyzIWm4=; b=ZbDspp5W0yB7FhtFUggbZ9U/EMtXI+VKfWnS4yKSkP5JkDvpJcS7CEb24LMLQJRixAauYI eegqAdkIr5Bk+tnyVwmoA7AqyaMGBdUiN9gQh5xCBEjhTlRoWR9oXZ0tA4drSKlicdzahZ svGo9aqLoFM4qK5j55mGBVCoi6OaBCb3CQ1bIMJAogANTxQev/cbA+ZddcsNFQJqxq+8zl mPf+suQ6a2UySsOT5hry+/7BqFE8kt7Zrqf4lgoxSxxyBs4yDZepc0EmGGJUjqK+Nj++Ds UV0dVIr182sNluczGf0CIXAq1LNs9nRX6WQ+TY/9EQqt6FncmdHHbOcWMuHTtQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793821776; b=kBWPMAct5TucCZgnHsY6dIiWXskYITBDxUsLipRSqT+kNpGrYkbb7q5rz4uf1gaq8J+V2G MXJIU25+ts4fPX5nsHmpNJYgyz2guzoUXU9vq9qjck2P750jyxTasCCDEJOEn8nPqc6ZwV nPslqg7d4PWnyztFB30D8UxQ5jPVugLYxgSos27GEbpLc7QU+/6CZiPODOX91ZcWcrotEW tyEzXSBlhgiFMCWM5B7lAYroaoF18ewdVRlAhFoxjP9ht7wSmvxXKXz0OFbz5ZhAZwmT65 M9aK+xaEejA9F9f98+UK3QuJGSVE8JS2smX40N9KDTrKNLUfzJ4Y1l3Q5zJQtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793821776; 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=OpRuUisbN7Kn9/VKRAq1G8dY0WlW8nEIorVqVyzIWm4=; b=ZQWg/vw+JiqapR4emvT9jCyTKtxH++/bzqtMacQVBYqzMPthUXKzwBXYeirqKIfxr3TJ/+ 1XRvigk5WnggNBFm9mNCTgaMvCHUOT+dRd9WZHkxC/2Q/fmcfaSQkuI9DPw/VHwoSQPq0z mqtFlzrAWOwAdAPVaRdT8X9tM6+cJCdSVMEZ3AOr+BtjaprIHB1yiRfffYvk0XRPdxX/Cg cIvm5aa6d3EEVLpr/Pbs/QjsGsirUDytAMAOxHpsJlpjQ2yrBu5TdVKtGWHwg99+/aHXBA JC0rsqEhe5kiBpzEw9KJ3k7U6CV2p91C0LeoNo+ShPTFDtPEj2XsSAUZu41vRA== 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 4jKbcc2PYxzHTZ for ; Wed, 04 Nov 2026 19:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3db19 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 19:49:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 915eb355d8fe - main - tpm: crb: Dump register state on command failures 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 915eb355d8fe8555f7a74c6db95bc3c02610a939 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 19:49:36 +0000 Message-Id: <6aeb8c50.3db19.628608ad@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=915eb355d8fe8555f7a74c6db95bc3c02610a939 commit 915eb355d8fe8555f7a74c6db95bc3c02610a939 Author: Kevin Bowling AuthorDate: 2026-11-04 19:43:54 +0000 Commit: Kevin Bowling CommitDate: 2026-11-04 19:49:28 +0000 tpm: crb: Dump register state on command failures Include the command code in notification failures and the command code and execution timeout in completion failures. Capture CRB control registers on completion timeouts and Pluton mailbox readiness or acknowledgement timeouts, before cancellation or cleanup changes them. Include locality registers when present and mailbox registers for the Pluton start method. The dump contains transport state without command payloads or response data. Tested by: olivier, tuexen MFC after: 2 weeks Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D61128 --- sys/dev/tpm/tpm_crb.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 6e77655c3aab..df47f88f79fd 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -199,6 +199,30 @@ tpmcrb_ctrl_write_barrier(struct tpmcrb_sc *crb_sc, bus_size_t off, BUS_SPACE_BARRIER_WRITE); } +/* Capture registers on failure, before cancellation changes their state. */ +static void +tpmcrb_dump_state(struct tpmcrb_sc *crb_sc) +{ + device_t dev; + + dev = crb_sc->base.dev; + device_printf(dev, "CRB req=%#x sts=%#x start=%#x cancel=%#x\n", + tpmcrb_ctrl_read_4(crb_sc, TPM_CRB_CTRL_REQ), + tpmcrb_ctrl_read_4(crb_sc, TPM_CRB_CTRL_STS), + tpmcrb_ctrl_read_4(crb_sc, TPM_CRB_CTRL_START), + tpmcrb_ctrl_read_4(crb_sc, TPM_CRB_CTRL_CANCEL)); + if (crb_sc->has_locality) + device_printf(dev, "CRB loc_state=%#x loc_sts=%#x\n", + bus_read_4(crb_sc->base.mem_res, TPM_LOC_STATE), + bus_read_4(crb_sc->base.mem_res, TPM_LOC_STS)); + if (crb_sc->sm_cfg->sm_attach == pluton_attach) + device_printf(dev, "Pluton mailbox start=%#x reply=%#x\n", + bus_space_read_4(crb_sc->pluton.bst, + crb_sc->pluton.start_bsh, 0), + bus_space_read_4(crb_sc->pluton.bst, + crb_sc->pluton.reply_bsh, 0)); +} + char *tpmcrb_ids[] = {"MSFT0101", NULL}; static const struct tpmcrb_sm_cfg_map * @@ -701,7 +725,8 @@ tpmcrb_transmit(device_t dev, struct tpm_priv *priv, size_t length) if (!tpmcrb_notify_cmdready(crb_sc, timeout)) { device_printf(dev, - "Timeout while waiting for device to ready\n"); + "Timeout while waiting for device to ready (cmd=%#x)\n", + curr_cmd); if (!tpmcrb_cancel_cmd(crb_sc)) { error = EIO; goto out; @@ -711,7 +736,9 @@ tpmcrb_transmit(device_t dev, struct tpm_priv *priv, size_t length) mask = ~0; if (!tpmcrb_ctrl_wait(crb_sc, TPM_CRB_CTRL_START, mask, ~mask, timeout)) { device_printf(dev, - "Timeout while waiting for device to process cmd\n"); + "Timeout while waiting for device to process cmd " + "(cmd=%#x timeout=%d us)\n", curr_cmd, timeout); + tpmcrb_dump_state(crb_sc); if (!tpmcrb_cancel_cmd(crb_sc)) { error = EIO; goto out; @@ -862,6 +889,7 @@ pluton_doorbell(struct tpmcrb_sc *crb_sc, int timeout) TPM_TIMEOUT_C)) { device_printf(crb_sc->base.dev, "Pluton mailbox readiness timed out\n"); + tpmcrb_dump_state(crb_sc); return (false); } @@ -875,6 +903,7 @@ pluton_doorbell(struct tpmcrb_sc *crb_sc, int timeout) if (!pluton_wait_reg(crb_sc, crb_sc->pluton.start_bsh, 0, timeout)) { device_printf(crb_sc->base.dev, "Pluton mailbox acknowledgement timed out\n"); + tpmcrb_dump_state(crb_sc); return (false); } return (true);