From nobody Thu Jan 8 15:02:01 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 4dn7RL6Q3bz6GNNR for ; Thu, 08 Jan 2026 15:02:06 +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 4dn7RL3F0sz3Rk5 for ; Thu, 08 Jan 2026 15:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767884526; 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=noBCTEMmMFo2kJKDhplS1aW7E8hpL6Es235kO7RjAC/fiyRgzAPfzyTgrqMVZDxhLOsVK4 HkQ3UWT5r1SxUCzLSqWmexXHbBh+fcqkHCeTcchbosdBu9cBAb2cASHSRWx4yKAI2qQ77b DpHljPNahdbQB3oiV+Wxa3lOq4Qi6uBw37bfRhFT+ZwuZHd+YXxZs1jXJCrufO/cVt+Fhl GlwtXiWa874wUmtl+NT3Zx8evsdtW7+KsBpSZdL7t97VympcmzujYXA3Qs++ye7QU1Ckec 8T1OtUiSILrjyYP0EryMXCDbaC9rTYYyEvgKCh+4IQnOiZokh95McWFx7oMw/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767884526; 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=lEZ1ojpOTexztklh20GPFtosJBV+pnNmxQ0QJIcU94vKC5MrFLJ84NpdgvJt0VnxFmuffL OWB4evC12eCo/kzRC8yp8BpiUQODIfXWM4OkAXx9KTYq61F+qFP9lkphiGoT/Yhxl5OK2A rHA6e6v8hL/zVac8MGh2dFqXO+M/WQbhiT8vGnSj/qWzBpfBCh952T77h6iiaCrnE+NEZq VvJKEzCBHRmIiuBb6qcLBSaYY3NYZzo6GrzVo7mEmIUdKqQGdprN10HZvCFwZ0n6InEBx1 +/3SDny/O3lLUsDtIgOatgagIuEGTeLBOSN/+XnH3nChn2LVag0ZykzJYGMzLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767884526; a=rsa-sha256; cv=none; b=MhAsBvrbcq/8KsiEbIIVI7BVbYVeZNe0DCEXGfVBZ4/TWWdASCDKm11k7UZ0UNQBNuuYP/ 4h1mQ5H8htTzDP04ePPTxWHlkRLg1VJdwUduFozowOgT09GfOHE6S5qcqFXwyU2KPJt8UK nX7NVSSaa5bUMEJXU4C9GiNQZRIT4JmzJ3O2NL1dFRCpbQEMixAwOzpM6jj/32SFzrqlA8 t4QFXrndNOjOftEraGMwPliOHc1O85YD0lCmFzQn2zhErjodR25OEEssRg4aoZqYIeMoBe 5e7plp7PoWalhpCoVBpy0XjLHuIWiQ9Q8v7kGUeTMhrgpz2UzOkJjp0SkSu9ZA== 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 4dn7RL2qQXzkZ6 for ; Thu, 08 Jan 2026 15:02:06 +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 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: 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