From nobody Sun Oct 11 01:22:22 2026 X-Original-To: dev-commits-src-branches@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 4j2NB65BbKz6w95S for ; Sun, 11 Oct 2026 01:22:22 +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 4j2NB64gCqz3P1Z for ; Sun, 11 Oct 2026 01:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791681742; 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=Fn1pxWqSX71B5rGBNFQ7QyqmlrkhH/lPMl8ZT+evw1o=; b=slLlW4mjXN9pHRSrgpyZ0BZxNlW9FlpM8PD6vjzJHTRCw9C53yFEVENzC8rVOveej83ufw MQWnPbvgxvksanJC5xFmI+8Yp4zAXeoveDPFFJaVs+F9OPWcgVtfyLiEZV6HdOv+zOgToI 0WtrAVm7OX/L2V0bHHT66B/fiABKeVE5cc/yOZLSgNEaIVLUmZ3OdYGqHpAkBclQgtmLre t6kVgyyBtwVXg/0AJK0DlxA1xFLqL4jYllNPvX0T/cI/HQShyhex+9stT0nVENRG7/jFQm sz/+/S2XEv58udP+Rreg2aPILx/jff35M0kCXxKC/K9hC+690aUbCi38HIapLQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791681742; b=vtxRCaTHhKNXGZwNIQeGOY3/DIRrFW8desx8UbM0n89csYdPF5HhS91Dw4Tvau5agSHlAu UruUjk/UmtKd+NIX914NiQKZVDMvr//sbyBLCPm2W343hfH8uMUcjAEbzLlYnk0+AIz5De v5zPi4Cb3D5zHIzQdaSP0u8mWqLUCdbZtq8kNhY6J8xsyDLtuCrgnoFq61ruu4LYuIrg/q RzDKcmNLdtu04FRdtnprXLgd278UPo4CzW5TRIZmn/EyPg+VRA2FIfQm0IlDkxg3Cu7oX1 kXUmhkaHQipegUlZHgTQfGux2AHbjubHh+i2s/tN79TvInBzwSEr7qdQmiiieA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791681742; 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=Fn1pxWqSX71B5rGBNFQ7QyqmlrkhH/lPMl8ZT+evw1o=; b=AWvEjqQrRK2eboOy7bj+Fb/ksmvgIuzERnvB+h3KH1ETnLNwf3yM1ewBzTRYnIt/Rl/JYT vbrVidWLRGjw+H8xy+OW/WgoYFxcy4aqFSLHTvK3tgExppPdVvEZIlLScHrZe6qO6O/Czm 7Qzoy74Sdq7vjdnm65abnCe6u8tQXpH4UR0aNOg4IoUXi6KF7Z2F7qFxF6gPYodsCGRYCN hEJ+YPVqYfbH70LREhiB7qNdrkFh6j8QKWoPqMV822IScHXGhZeCX8jzhdXolGZhoE/9C5 6Sifa9IEhdgg2PPbVLTHiReQItECVOYqTXJ+h6d+eSV+vJl7LcClDitK3HMJng== 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 4j2NB63RMgzJw9 for ; Sun, 11 Oct 2026 01:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3632a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 01:22:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 7fdc748c0c3d - stable/15 - amd64, powerpc: Enable tpm(4) in supported kernels List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD 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: 7fdc748c0c3d0f2f7c1c0725f9ff2a5085fc36ec Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 01:22:22 +0000 Message-Id: <6acae4ce.3632a.7ca6a248@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7fdc748c0c3d0f2f7c1c0725f9ff2a5085fc36ec commit 7fdc748c0c3d0f2f7c1c0725f9ff2a5085fc36ec Author: Kevin Bowling AuthorDate: 2026-08-28 00:14:02 +0000 Commit: Kevin Bowling CommitDate: 2026-10-11 01:21:08 +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") Relnotes: yes Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D59247 (cherry picked from commit cb2964f840e873d03a0739f41eed5921922f93a0) --- sys/amd64/conf/GENERIC | 2 +- sys/amd64/conf/MINIMAL | 2 +- sys/powerpc/conf/MPC85XX | 2 ++ sys/powerpc/conf/QORIQ64 | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 0548c90985d1..e06c585318b6 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -327,7 +327,7 @@ device bpf # Berkeley packet filter # random(4) device rdrand_rng # Intel Bull Mountain RNG device tpm # Trusted Platform Module -options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 +options RANDOM_ENABLE_TPM # enable entropy from TPM devices # USB support options USB_DEBUG # enable debug msgs diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index b7baa2bd061d..043ef348698b 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -138,7 +138,7 @@ device bpf # Berkeley packet filter # random(4) device rdrand_rng # Intel Bull Mountain RNG device tpm # Trusted Platform Module -options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 +options RANDOM_ENABLE_TPM # enable entropy from TPM devices # VirtIO support device virtio # Generic VirtIO bus (required) diff --git a/sys/powerpc/conf/MPC85XX b/sys/powerpc/conf/MPC85XX index c74819c7fee0..8ca927f9d896 100644 --- a/sys/powerpc/conf/MPC85XX +++ b/sys/powerpc/conf/MPC85XX @@ -29,6 +29,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 dpaa device tuntap diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64 index c64d015c37d1..37c087dd8a4d 100644 --- a/sys/powerpc/conf/QORIQ64 +++ b/sys/powerpc/conf/QORIQ64 @@ -32,6 +32,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 @@ -106,6 +107,7 @@ device scc device sdhci device spibus device spigen +device tpm device tuntap device uart options USB_DEBUG # enable debug msgs