From nobody Sun Apr 12 13:44:25 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 4ftsGK6L5kz6ZMF6 for ; Sun, 12 Apr 2026 13:44:25 +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 4ftsGK1zVwz3kr5 for ; Sun, 12 Apr 2026 13:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001465; 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=vAOrDxfMeLD0ZTPnj3hEGIQ3iYAM+foPMMY/afci2bc=; b=ffvr3279N44pbVT/uVFKIgEDvd5eueHzB/XAmTSqLCpISC1IhcbTyvWu54rSsv/Z7G966y YO1fmLW/3BG87vZxptSy4JEBt6m3NYF/105mphFpkpIJw7RkbNtk9fzDPNwI+UOgHbj3yM B5KDbNtfMP0lB+8dHAYU4vL2WI5Ol7ZpCF+cFIRNXzuq6ilrSPRRVVSdIZMhgLxd0zFk/m EZLoRn7yxznKQHT8JhrFhcQ2bWChQSMCCN1Njvzw94xqjmfjYJKc5MiQjmMpXF/kvtIDQS z1IY2VpSr/ux+gPK6ekuubK1GF3e+MGdc17reo8D+HUSzWGY9GaV3m0js8bosw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001465; a=rsa-sha256; cv=none; b=IU7tA+XTSYYLo3hlJQMMZgz5zEZts+APyvN+72rcYwWac/O2JmZ5+KRf1ImzYCVlpYR7n7 YNWu8D0TWfOZSb1YHIjozJWIwZVMOHOr8ilguKx3kYNCFRnvrwFE8/3Rr4fc+Hb1XHCENf hG4RRCAKh/Lk9AgcNopJDrHvOPFZAJyWu8iB6uXVOgQHaUmS2aCE5iB6JGUnwdW2/TubnF WNLrLtOkxcuMYZSPqT447xlFHBYqVpk6D0ScgAPMbJis6FHrLUdxj/RnhjQXbGEqgmsFYX qey+TJaibOij03wVIN2SYT7DXAGQ+x0rpXvb46g1nkJkP1vG9lMLiTBy3bkJ/A== 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=1776001465; 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=vAOrDxfMeLD0ZTPnj3hEGIQ3iYAM+foPMMY/afci2bc=; b=yon4U3mxDIMWpBZQ3SRsqyOo48CdT5u7zIAsxQ7svMPRJqb3vNWxqgcIEe3uniUgbEO55Q /GybMOMjSjTmIKtfyw8rAY/JOL/NNy7g+GBqGM95TdjANiVX9tCSul+WK/RSHIpKStoHg7 8gcWJ7yqu8/FK3eyl0PTU0tgl8F8cWGGT4mXGMO3tRl4r3YQMy8k4yt6Zn4ckAzZ9IixS1 N7n1RKew5rltkAJBRcRQiD8U5DvytpR6UGfyAIsSR4ZWApiVE+cogW9LHFJVWfrauzpwkO 3FcpvU6EQGlHK5Zmdr2x1kANikaS30fGPUQaeVvizF4gdfb1gxvbPU/Xc7phTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGK1HVgz48p for ; Sun, 12 Apr 2026 13:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42c88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: f329d69b9176 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: f329d69b9176a1d407276a010c2b87a07a2bbc5d Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:25 +0000 Message-Id: <69dba1b9.42c88.144f4714@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f329d69b9176a1d407276a010c2b87a07a2bbc5d commit f329d69b9176a1d407276a010c2b87a07a2bbc5d Author: Kyle Evans AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:44 +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. Co-authored-by: markj Tested by: garga (cherry picked from commit 38a4995eb52db21116f8b37ed942e66a8c2f050f) --- sys/dev/tpm/tpm20.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/tpm/tpm20.h | 1 + sys/dev/tpm/tpm_crb.c | 1 + sys/dev/tpm/tpm_tis.c | 1 + 4 files changed, 66 insertions(+) diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 393552172656..f2c63b9f0e93 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; @@ -232,9 +233,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)); } @@ -296,6 +319,42 @@ 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 sc->transmit() return and tpm's response */ + sc->transmit(sc, sizeof(startup_cmd)); + sc->pending_data_length = 0; + + sx_xunlock(&sc->dev_lock); + + return (0); +} + static int tpm20_save_state(device_t dev, bool suspend) { @@ -320,8 +379,12 @@ 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 sc->transmit return and tpm's response */ sc->transmit(sc, sizeof(save_cmd)); + sc->pending_data_length = 0; sx_xunlock(&sc->dev_lock); diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index 14f89de3e84e..1e663910cede 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -131,6 +131,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 bb4df82e613b..38640b010e18 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -411,6 +411,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), {0, 0} }; diff --git a/sys/dev/tpm/tpm_tis.c b/sys/dev/tpm/tpm_tis.c index b97d7ab3f8e8..e51f5a656b05 100644 --- a/sys/dev/tpm/tpm_tis.c +++ b/sys/dev/tpm/tpm_tis.c @@ -510,6 +510,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), {0, 0} };