From nobody Fri Nov 13 01:17:04 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 4jQfVn0vNrz6y0Pd for ; Fri, 13 Nov 2026 01:17:05 +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 4jQfVn0Gdbz4n37 for ; Fri, 13 Nov 2026 01:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532625; 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=eipnkny6iPqSCrFGy/tDh8xuW5BRp1rQNblngolJvGM=; b=GVxOcEzdGQvi10d62C8UPny+2lvmjgHddP6LwFK7IlIJz+qH8GcJeHV2GR+Zz58qz8kKy+ 4AI+flSBf235gHYM+o0JxkLXDiVAeuPX5pyKvcgg5x2VmMnvGQL4xfl8jF92phMk5vqhzB 5USk4sHukH+b6t9rC7Gbuwu2kk1ESkix5RbFniuV6fJ6sJwJJKKlJ9+/GdzllZfYta7Ojk 2L0oxWi6P2qoQgy0Smdyy/QMKkUzxOioP7qeljsDX41eQeCRNhiLFAOz/imNHq9MJ3J2K8 72FesULuyKc7CzUQ3eV/MgS10ZtT+VlRCVpoylqKF0yA8VVwsYzFh+HcA7RJuQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794532625; b=g0l1bHFnrSvcs6gVQi+zm7tf5Tmdrto88hAcswHH3ZjVF3N5xMEix8az4GiJIH7e6qHL5W ll0SNQZw9FvHNT4ObxnD72WrCC0uTYC+c9azsz9ue2LnOccE9SqaVDNg0WLG6OEcUIc1x2 0GyoLK5Ct4T1HOGGLzxhx46Q5MCghvblnGi0QCBnvUGXHKSRwPf7fKPG0RZw24YC+yBZL7 VtfuneT4giWU6patcshYi+I+fI3RzDZpKsINsgjJKp+GmU5CcADwv+s7xnBNCd8a6TA2jK FYlzvaVm8HO1RU7F3t7X2GpT9JM5ZlhzcXQzlBFTzOi/UjS9tUqkHEVj4enfnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794532625; 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=eipnkny6iPqSCrFGy/tDh8xuW5BRp1rQNblngolJvGM=; b=AJyIuXFZx03477OV+gQFGOJRbBHTiFnkuUrfGK0fIa/qhRSi8Qwf/t80kfnie8Gg6UESTU +eSEnlezdIovE7zUTwDBt4ILsNQ3sIClDv1/0SBFzmu4JUYa3Wa2kWYbDx6zK0Q2EbUDWx K3XqiUhb5NJxbSkQAX9VuIcw6j52qMSXXIxEPbVz9OPFnoqYtL/7uLS7tgitgBxQo+NvJA fkH7F5UsEUt52TEMo4wvdo9vjF2N9Jf1DXMrjd6e/q8q0+E6CFG2SGvMUdaFTYfnYcMsRz CFrbxx8dpsCRxq07zlEisG5YktBPXWirEjamjdgrkkNz9w2mR+OpIsio/Und4g== 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 4jQfVm7305z1PxW for ; Fri, 13 Nov 2026 01:17:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 198cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 01:17:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 133335cc97b8 - stable/15 - 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 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: 133335cc97b847cc577c678a556e0bb8e46bcabe Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 01:17:04 +0000 Message-Id: <6af66510.198cb.2ca78abf@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=133335cc97b847cc577c678a556e0bb8e46bcabe commit 133335cc97b847cc577c678a556e0bb8e46bcabe Author: Kevin Bowling AuthorDate: 2026-11-04 19:43:54 +0000 Commit: Kevin Bowling CommitDate: 2026-11-13 01:16:56 +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 Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D61128 (cherry picked from commit 915eb355d8fe8555f7a74c6db95bc3c02610a939) --- 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);