From nobody Thu Jan 8 15:02:01 2026 X-Original-To: dev-commits-src-main@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 4dn7RG0wlDz6GN9m for ; Thu, 08 Jan 2026 15:02:02 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dn7RF5SXRz3Rjx for ; Thu, 08 Jan 2026 15:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767884521; 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=We/kElUcbZQ87dk5PTWfSyOSGL0Z09k4UFsznca4I04=; b=gNv3/dUZDhEkWKAOOogzvONZb9GmunP94p/QS7dP/QrsDY3Y0Kz3OrDfs2vMtWZcnkX1sl eCGsZqLBcs745PfK2RCxeiu15ziWLuC5brb6ESQ5KFx3OniqXn8Lziln7UyX73TLEkZVNT c/McZ1dspolLegEgYIYjJGjX2613g2O16Cw4AkNUh0TLLQCujVq6NJ5Hv6RTcFVWSQ/XoK 1zdK9U3YI8iu5vLaJ/Kt2Uym7d0PAYGLmdYzvtSpLJug/QiTsI4pi65/pQ47TRp1NlgVr1 rnEi8YmrLIO+Ni63RKL9w23ht/5yLjjXRyN/rNqc3TLdTZbgy/gjmI8GqZfXkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767884521; 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=We/kElUcbZQ87dk5PTWfSyOSGL0Z09k4UFsznca4I04=; b=RL+cOLywvIEcLsQGjBks1SWdniYHpLO8WUEoFyaC7XbSXIXgC2aid+zxUxEfJdsnTdCye2 SKR0hwA4m/ksBvm4pBQHPRvUaV4OWXYPVa89z8y9ZGajvr0cYr/bMzz/MXzms7uPxdoDH5 FHsNh7JgeEB7+pOBw8WcgC6RbQ8Rhz0/h34z3nZqpGEng/jSz1R3mrc5zHCnywqXMgvzpj VyH5kzPx7aZZKgY1hCMNtDjRhV8q45HMZIpj6ckbztcY1CUHVrwTT2k+dIlUwvrhWbg6pK MoTBFWkkxwq8CznKeWl+BW8Q7evgpdjuDX+T77Ygx+CStgViN8zX84XUtX86+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767884521; a=rsa-sha256; cv=none; b=UyuAUwYo2pFYqwTIhBNCemcZGHudTgZAOPh7tOn5Oh/LwoGwudQ13Zov9vG98jVIiL0xy7 Tc3XsfJnxirADel/zV9sTLUhtPMt5QMdAIkeSG6FXfEfIH2ty7oVVQW1u/tfOLrL4FEYaM lZ7TnDg1+/oqQ8IHMsHjBr0P9j1gBnFq7oFb5WKjgS8/YB+/oazoDsrDW47AHcPRasZlAL e0zgZmABGuolBrFVWF/6j0fa+banflKdgAod+gfb/1jVJ2VZGd1h9olggbKcVj6UKE2dXa HCiy5K61N4UPnBaEdfeVoBYPW/R0aTfWK6yRgHI0Vs+ITnE+y+Bgi4+JACIseQ== 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 4dn7RF2pPSzkVL for ; Thu, 08 Jan 2026 15:02:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b70a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Jan 2026 15:02:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 16f8ea6a81b5 - main - amd64: Remove tpm(4) from GENERIC for now List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16f8ea6a81b59a82d8c27c6b3aa380617485bfd2 Auto-Submitted: auto-generated Date: Thu, 08 Jan 2026 15:02:01 +0000 Message-Id: <695fc6e9.b70a.2b548eea@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=16f8ea6a81b59a82d8c27c6b3aa380617485bfd2 commit 16f8ea6a81b59a82d8c27c6b3aa380617485bfd2 Author: Mark Johnston AuthorDate: 2026-01-08 14:54:15 +0000 Commit: Mark Johnston CommitDate: 2026-01-08 14:54:15 +0000 amd64: Remove tpm(4) from GENERIC for now It breaks suspend/resume and no one has had time to investigate and fix it. PR: 291067 Reviewed by: emaste Fixes: 3deb21f1afd5 ("random: TPM_HARVEST should have been named RANDOM_ENABLE_TPM") Differential Revision: https://reviews.freebsd.org/D54587 --- sys/amd64/conf/GENERIC | 3 ++- sys/amd64/conf/MINIMAL | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index ef7ce215474e..38b6dccb3579 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -324,7 +324,8 @@ device bpf # Berkeley packet filter # random(4) device rdrand_rng # Intel Bull Mountain RNG -device tpm # Trusted Platform Module +# Disabled for now since tpm(4) breaks suspend/resume. +#device tpm # Trusted Platform Module options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 options RANDOM_ENABLE_KBD options RANDOM_ENABLE_MOUSE diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 8df3349b4c34..9f80fe2f42d5 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -122,7 +122,8 @@ device bpf # Berkeley packet filter # random(4) device rdrand_rng # Intel Bull Mountain RNG -device tpm # Trusted Platform Module +# Disabled for now since tpm(4) breaks suspend/resume. +#device tpm # Trusted Platform Module options RANDOM_ENABLE_TPM # enable entropy from TPM 2.0 options RANDOM_ENABLE_KBD options RANDOM_ENABLE_MOUSE