From nobody Sun Apr 12 03:16:35 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 4ftbKv5xHzz6YM0T for ; Sun, 12 Apr 2026 03:16:35 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftbKv1QMvz3P5j for ; Sun, 12 Apr 2026 03:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963795; 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=OzOi6+H752mzAGh0TM+AhJLwbxRwR3xSA0UwQTed9jY=; b=j4SfDV9yWgEwCyOq/KGABL+ydvp8vsO0MYaKjjhCdIIhQAkD/JCoW8Dyb0seam4fJssV7/ vzs8KqQFdYfaAeNPNxS2ki/ZoTKnZceUI4CabhX6chaLbJK3hU2kgFLkLNIZId8CgOdO8s waEyp2C8EjfRMiQilORpVStIPTxzpd76BzqBciaQcvWeL46g9gg9B3Pa/RhLqIcz4bKFs4 BaWJlSO0FgYaZDg4z+ptUwQuL8Kamo8QBXf89gDwoXuYsKUqG68AO7Viej0vI7di8cCbHl b7j9ZFuu2H1jpM7wJtEqU4+7JkKXS9wRh/R8oHzjRrCVtx6x1JJvG8wNwYYVWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963795; a=rsa-sha256; cv=none; b=xHoirRwAY2K0YmuAlGLkAvPOhqEMsRSv/1nISUUyl/LZEtELeCbbGHeO54f/g2jScd3Tz8 tytUbCkLvxxzLV7/TexezqjqXtt5TYlDNgb10FI3wy9UyblK2fhtEWEObLGVN6yx+OepJv IJaN95XJvTNLk1Ot8Nzj6XBVrRJaSOES3sdqrnShp/Gr616n50AXWyRP+8MkZpngnMTqe4 ECHI6c2fhKQW/KQvPZcPktavVTegHwq/uEF5QP+9kIYzpIL/BHf59/uc2QV6OFXc3xTKlJ mRlXEfD6C+WOgcZH+Gk3aNjG8WEElB+uHv2BGF4Up9sk6uUPu/eyN2ExsAangA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963795; 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=OzOi6+H752mzAGh0TM+AhJLwbxRwR3xSA0UwQTed9jY=; b=hMRv0xSJq5xjZGJBNWkn1t+RXlhrrUQIUmTNcpP5Cifvp3+s/asHpBtGxlJ5b1Y5G1CKiR z7xkDDO2PcUUBEDZdjvOAn2wWkKKia1JcXImHXCA7GLn07+Z091WQrM952V0OWjanhOO2x dNF+uBVk9ux/Q4scoB516g8anf77R1BSPrVYmVySfpAbT9LYAl4wFnMYtf1WWP7Dr1gbom FdhVTd6qXVfUZ7OwR8hqpF/RqOotfbjXvkZs64IubThGhPv6DLoX7Xq7QGWq2QDlWlwxl5 CVOkS2u6dIL+Jyc6HPVxA8BVu1Kpg4GH9RxVC9C84kpoIkyUFcjMjbT87J2F/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKv0DvzzyWN for ; Sun, 12 Apr 2026 03:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4750d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 21fcae195867 - stable/15 - tpm20: fix suspend/resume and entropy harvesting List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 21fcae1958672a08726d20a95baaf91940511faa Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:35 +0000 Message-Id: <69db0e93.4750d.26aba45d@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=21fcae1958672a08726d20a95baaf91940511faa commit 21fcae1958672a08726d20a95baaf91940511faa Author: Kyle Evans AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:13 +0000 tpm20: fix suspend/resume and entropy harvesting There were a few problem here: - TPM2_Shutdown results in a response that we need to either process or ignore, otherwise any tpm20_write or tpm20_harvest call will trivially hang on an `sc->pending_data_length != 0` - We should have a matching TPM2_Startup upon resume to restore any state that should have persisted - We must drain the harvest task before we suspend to avoid problems there This commit is sufficient to avoid breaking suspend/resume. PR: 291067 Co-authored-by: markj Tested by: garga (cherry picked from commit 38a4995eb52db21116f8b37ed942e66a8c2f050f) --- sys/dev/tpm/tpm20.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/tpm/tpm20.h | 1 + sys/dev/tpm/tpm_crb.c | 1 + sys/dev/tpm/tpm_tis_core.c | 1 + 4 files changed, 68 insertions(+) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 067e7ccae8f9..ca73b0de8529 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -45,6 +45,7 @@ static void tpm20_discard_buffer(void *arg); #ifdef TPM_HARVEST static void tpm20_harvest(void *arg, int unused); #endif +static int tpm20_restart(device_t dev, bool clear); static int tpm20_save_state(device_t dev, bool suspend); static d_open_t tpm20_open; @@ -242,9 +243,31 @@ tpm20_release(struct tpm_sc *sc) destroy_dev(sc->sc_cdev); } +int +tpm20_resume(device_t dev) +{ + + tpm20_restart(dev, false); + +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_enqueue_timeout(taskqueue_thread, &sc->harvest_task, + hz * TPM_HARVEST_INTERVAL); +#endif + return (0); +} + int tpm20_suspend(device_t dev) { +#if defined TPM_HARVEST || defined RANDOM_ENABLE_TPM + struct tpm_sc *sc; + + sc = device_get_softc(dev); + taskqueue_drain_timeout(taskqueue_thread, &sc->harvest_task); +#endif return (tpm20_save_state(dev, true)); } @@ -307,6 +330,43 @@ tpm20_harvest(void *arg, int unused) } #endif /* TPM_HARVEST */ +static int +tpm20_restart(device_t dev, bool clear) +{ + struct tpm_sc *sc; + uint8_t startup_cmd[] = { + 0x80, 0x01, /* TPM_ST_NO_SESSIONS tag*/ + 0x00, 0x00, 0x00, 0x0C, /* cmd length */ + 0x00, 0x00, 0x01, 0x44, /* cmd TPM_CC_Startup */ + 0x00, 0x01 /* TPM_SU_STATE */ + }; + + sc = device_get_softc(dev); + + /* + * Inform the TPM whether we are resetting or resuming. + */ + if (clear) + startup_cmd[11] = 0; /* TPM_SU_CLEAR */ + + if (sc == NULL || sc->buf == NULL) + return (0); + + sx_xlock(&sc->dev_lock); + + MPASS(sc->pending_data_length == 0); + memcpy(sc->buf, startup_cmd, sizeof(startup_cmd)); + + /* XXX Ignoring both TPM_TRANSMIT return and tpm's response */ + TPM_TRANSMIT(sc->dev, sizeof(startup_cmd)); + sc->pending_data_length = 0; + sc->total_length = 0; + + sx_xunlock(&sc->dev_lock); + + return (0); +} + static int tpm20_save_state(device_t dev, bool suspend) { @@ -331,8 +391,13 @@ tpm20_save_state(device_t dev, bool suspend) sx_xlock(&sc->dev_lock); + MPASS(sc->pending_data_length == 0); memcpy(sc->buf, save_cmd, sizeof(save_cmd)); + + /* XXX Ignoring both TPM_TRANSMIT return and tpm's response */ TPM_TRANSMIT(sc->dev, sizeof(save_cmd)); + sc->pending_data_length = 0; + sc->total_length = 0; sx_xunlock(&sc->dev_lock); diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index 7c2ccd30143a..7f6e8f39c5e6 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -136,6 +136,7 @@ struct tpm_sc { }; int tpm20_suspend(device_t dev); +int tpm20_resume(device_t dev); int tpm20_shutdown(device_t dev); int32_t tpm20_get_timeout(uint32_t command); int tpm20_init(struct tpm_sc *sc); diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 26b53e7a621d..18414a6c799b 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -651,6 +651,7 @@ static device_method_t tpmcrb_methods[] = { DEVMETHOD(device_detach, tpmcrb_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), DEVMETHOD(tpm_transmit, tpmcrb_transmit), {0, 0} }; diff --git a/sys/dev/tpm/tpm_tis_core.c b/sys/dev/tpm/tpm_tis_core.c index 4159de4daf3b..34ecfcc283b1 100644 --- a/sys/dev/tpm/tpm_tis_core.c +++ b/sys/dev/tpm/tpm_tis_core.c @@ -487,6 +487,7 @@ static device_method_t tpmtis_methods[] = { DEVMETHOD(device_detach, tpmtis_detach), DEVMETHOD(device_shutdown, tpm20_shutdown), DEVMETHOD(device_suspend, tpm20_suspend), + DEVMETHOD(device_resume, tpm20_resume), DEVMETHOD(tpm_transmit, tpmtis_transmit), DEVMETHOD_END };