From nobody Sat Sep 12 22:01:40 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 4hj53S6mVmz6r4JF for ; Sat, 12 Sep 2026 22:01:40 +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 4hj53S4N7pz4NZm for ; Sat, 12 Sep 2026 22:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789250500; 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=EotT5tphanpsxf9eZ3Scj9FEs/B+qkP2zyvJ1N5cYWs=; b=Zvjwpa8LYpJdFs7aOHoYth7k4NWcLBxYnUxYQuIKYRSRQYqvg9wOIM4wq78EuWaljvw7ps CM/x+tJ8l6lTmSQOtElgVFlbGEx+GhvMcYrBYpN0yYdIGoabp+tNYrnfW6M3NccCickwhr qtc/kO+7G6cVamHTqd3r5qzqB3ucGA4UaTufTuY5mSrPra21WZ32Kn5/NTpHaxgdbeoyaw GyK0IxAXcqY+ZG3v40wR6//wFkp74NWjCKlkqyCt5wFGXf7w7OOS1QU9KVc/CY6TJnElwz atj24FfC8YlvKXc317Y+Q+1jx37Nmy0/kUMEw8C4Q74mcD8RnZnWG7QCXIUAsw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789250500; b=gc72Q8bw41Fuw6EI+yhkjZJwqGLI+Ql8gnhvKOHhK66uW5sF+JjwyWOOdcsvgiCX8Se8Dq bQ7FMsLgqtqrkuCxuYeax32PdZirpoqsog8htrxZ5NhmlVPEs0bK5nSWzndLGREBlJ1JNT xOMrLpCBeVDlQCRLgyWpK7Y29sGvgGR6F3sPZIbMMEkht4J2mQU/rB5tndgHg1BeBMybJa +vkFCEd5edDq3FSLsp5Igx7Sfp8/kDE+fda2Nms0GrQdeYU25oiFxuQAWI8xa/7U/6W5W8 IsO0szzHqN9+VeEqdzgMIuJM00zusQLall3lZ8/XUlpuvGl8PCA2EcLcgmWagQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789250500; 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=EotT5tphanpsxf9eZ3Scj9FEs/B+qkP2zyvJ1N5cYWs=; b=gmoIC7eGUW8xhfjXaQyTh5dWwXPzfKtbwbbxzEttHJaTneTv0ZG9Hj35nKBw8o/BNEL+T2 dHCb231v7ZnRbaB0r4AlEQSLo3WbACUh4faW3A0IvR1415ft3VsGkJ9Vj9UTHOt6EI9WQh QbowVe2GMk2iSXa/jkFVHdzLzO0MUIMsvOl3K1u1mvguQ72Tm0ww5ghExlXC+iIiQFgS8K ErQxSO0dONxaw+FxKD5Ou868LRYk6vB5TNDjrfzWcLF51u2wXDRoNmm5adpx6JwlFUIW85 RSL5uYI86GSBM9itZQztFowjxpY1y3d0kXwVTXi1j9zED3cJXcbXTQJu9HcP4g== 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 4hj53S2q0szFm4 for ; Sat, 12 Sep 2026 22:01:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33655 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 12 Sep 2026 22:01:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: cb2964f840e8 - main - amd64, powerpc: Enable tpm(4) in supported kernels 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 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb2964f840e873d03a0739f41eed5921922f93a0 Auto-Submitted: auto-generated Date: Sat, 12 Sep 2026 22:01:40 +0000 Message-Id: <6aa5cbc4.33655.239d540c@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2964f840e873d03a0739f41eed5921922f93a0 commit cb2964f840e873d03a0739f41eed5921922f93a0 Author: Kevin Bowling AuthorDate: 2026-08-28 00:14:02 +0000 Commit: Kevin Bowling CommitDate: 2026-09-12 22:01:32 +0000 amd64, powerpc: Enable tpm(4) in supported kernels tpm(4) was removed from amd64 GENERIC because it broke suspend and resume. The preceding lifecycle, state-save, interrupt, locality, and teardown fixes address those failures for both TPM 1.2 and TPM 2.0. Restore the driver to amd64 GENERIC and MINIMAL, where TPM entropy harvesting remained enabled. Enable the driver and entropy harvesting in the MPC85XX and QORIQ64 configurations, which already provide FDT, spibus, and the platform SPI controller required by FDT-attached TPMs. Leave the generic AIM and POWER configurations unchanged because they have no TPM attachment bus. The TPM 1.2 path completed repeated S3 cycles and command tests on ThinkPad T430 and T440p systems. The TPM 2.0 path completed repeated device and full-system suspend/resume cycles on a ThinkPad P51. The PowerPC configuration matrix was checked to retain tpm(4) only where its FDT SPI attachment path is present. PR: 291067 Reviewed by: kevans Tested by: Marek Zarychta (tpm1.2) Fixes: 16f8ea6a81b5 ("amd64: Remove tpm(4) from GENERIC for now") MFC after: 1 month Relnotes: yes Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59247 --- sys/amd64/conf/GENERIC | 5 ++--- sys/amd64/conf/MINIMAL | 5 ++--- sys/powerpc/conf/MPC85XX | 2 ++ sys/powerpc/conf/QORIQ64 | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index e53d42c0ac43..61533394a3d0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -332,9 +332,8 @@ device bpf # Berkeley packet filter # random(4) device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG -# Disabled for now since tpm(4) breaks suspend/resume. -#device tpm # Trusted Platform Module -options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 +device tpm # Trusted Platform Module +options RANDOM_ENABLE_TPM # enable entropy from TPM devices options RANDOM_ENABLE_KBD options RANDOM_ENABLE_MOUSE diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 806d0baef9e7..70afb305d66b 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -141,9 +141,8 @@ device bpf # Berkeley packet filter # random(4) device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG -# Disabled for now since tpm(4) breaks suspend/resume. -#device tpm # Trusted Platform Module -options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 +device tpm # Trusted Platform Module +options RANDOM_ENABLE_TPM # enable entropy from TPM devices options RANDOM_ENABLE_KBD options RANDOM_ENABLE_MOUSE diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index fccbdbea8342..2d546bccbebf 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -28,6 +28,7 @@ options DDB options DEVICE_POLLING #options DIAGNOSTIC options FDT +options RANDOM_ENABLE_TPM #makeoptions FDT_DTS_FILE=mpc8555cds.dts options FFS options GDB @@ -103,6 +104,7 @@ device sdhci device sec device spibus device spigen +device tpm device tsec device tuntap device uart diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64 index cbafe1ab2f48..9141c3e72aa5 100644 --- a/sys/powerpc/conf/QORIQ64 +++ b/sys/powerpc/conf/QORIQ64 @@ -31,6 +31,7 @@ options DDB options DEVICE_POLLING #options DIAGNOSTIC options FDT +options RANDOM_ENABLE_TPM #makeoptions FDT_DTS_FILE=mpc8555cds.dts options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support @@ -105,6 +106,7 @@ device scc device sdhci device spibus device spigen +device tpm device tuntap device uart options USB_DEBUG # enable debug msgs