From nobody Thu Oct 23 23:17:26 2025 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 4ct24Q4YXgz6DqB7; Thu, 23 Oct 2025 23:17:26 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ct24Q3w2vz3NJS; Thu, 23 Oct 2025 23:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761261446; 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=gJDMxHn8BzjYA1WBG9hbCMc+oF2HXyBLLUOjQba1Hr8=; b=iLb5j0c4Mbul1hqKo8tKfu1lRYwmbBP3igeM+LTguhPZEJci2i2S29jfgOfhOKYPYixzPb 0vDNxtnQJVMgBEprjXELgPnbi84fh3+Il9izC2brpzB0A5Nxbam/ZIyFdVkXoxCrTOSIZ0 uecbjHJ4nBrlaSlO99+Ypi1w8nm6FBBWfCLMz3JthSsIF9wbfKxWOMukgQsV2wWHQ5J926 UwGGMQURZZCcQhX37N/Fw8h7FIEfhQcIMcEAx+sIfITOsp4hRBMOh1AGvATIJ9mRmte5Br qNgaHHbddUjK0qL2bvX+MRjVxN69TvDyEUtk4jbUr/l/dICF5Gq2iF1vtWoQTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761261446; 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=gJDMxHn8BzjYA1WBG9hbCMc+oF2HXyBLLUOjQba1Hr8=; b=feCtbgVLrv0j5OHCiuLcaKvmRn2dq0/9chsdlSIRXI7dl4g+v0Dpcgfo9JNSLwk9apvIva 5bw1vmu44aVcC5oXkscB8xfNSwkUofdbHn8VDjKULY5cQoxSgvu4+P1Z4dGeBz5q2rZf2N JtPbj4NWXodIuB21N12etDj2IN7yfD4QreL2C6iuIZstasJtNKdBD4OtT4wvFb+Pcd+Dgc r22qxwlgHi9BAsKZu5zRXrzvu7CMK+cecEn6BaByGM0SRcjdBqnvXcZJ1pbgyqEdKC0A2n tpW6iejpLYAs7FE7758rQvWnspenvwQGyfDgzhE8IxYdVD3C4RbxxS9bhNtzHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761261446; a=rsa-sha256; cv=none; b=Ma+ABaSnTc+vrBI7KJdYZ7Q1tVwz3BY9JBI2yvI3eoJXm1cWgbOHDaDO78I9W2uYgJDpu5 yzIPXdVLU2rL82o4piGK0RIQ1qETTZuZRYAvNzEagNY+1hh3cOYJHolp268JUnWO3WZvpQ tSvgKdJixKehpyNUv3RS5HPVM3KmRqXYrpUXutCJ2hEdiIaw7JvVMBbTbtWfwq+QkQioKG 3fONVBp3V/XGf5yqUJ1BM+27lEdGvFfB9cYL/EFMtQ2otlzFAhoE6Dd+vQHI42Y6VNrdyP RWU7OcG+VLhWqUdie7hJ9XDTIVPvvrFTqJZJomRf8gsAzoStHOnDrHmG01+wwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ct24Q2zXPzbZ3; Thu, 23 Oct 2025 23:17:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59NNHQZg088765; Thu, 23 Oct 2025 23:17:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NNHQMC088762; Thu, 23 Oct 2025 23:17:26 GMT (envelope-from git) Date: Thu, 23 Oct 2025 23:17:26 GMT Message-Id: <202510232317.59NNHQMC088762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: d1ca01059d5d - main - padlock(4)/nehemiah: move i386-only entropy source to MD files 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: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1ca01059d5d756a4aef09d955e98aa59a284344 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ca01059d5d756a4aef09d955e98aa59a284344 commit d1ca01059d5d756a4aef09d955e98aa59a284344 Author: David E. O'Brien AuthorDate: 2025-10-23 22:27:06 +0000 Commit: David E. O'Brien CommitDate: 2025-10-23 23:17:19 +0000 padlock(4)/nehemiah: move i386-only entropy source to MD files Reviewed by: khng Differential Revision: https://reviews.freebsd.org/D53309 --- sys/amd64/conf/GENERIC | 1 - sys/amd64/conf/MINIMAL | 1 - sys/conf/files.i386 | 1 + sys/conf/files.x86 | 1 - sys/i386/conf/NOTES | 7 +++++++ sys/modules/Makefile | 4 +++- sys/x86/conf/NOTES | 1 - 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 2e41ed26403a..fb8473505128 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -309,7 +309,6 @@ device wpi # Intel 3945ABG wireless NICs. device crypto # core crypto support device aesni # AES-NI OpenCrypto module device loop # Network loopback -device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 0baf6d6431de..61c713c609a4 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -113,7 +113,6 @@ device uart # Generic UART driver # Pseudo devices. device loop # Network loopback -device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device ether # Ethernet support diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 41c51a7aa9c5..e6c2089e2c1e 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -33,6 +33,7 @@ dev/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv dev/le/if_le_isa.c optional le isa dev/ofw/ofw_pcib.c optional fdt pci dev/pcf/pcf_isa.c optional pcf +dev/random/nehemiah.c optional padlock_rng !random_loadable dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 21a1b8046f12..31b8e88a6951 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -310,7 +310,6 @@ dev/ntb/ntb_hw/ntb_hw_plx.c optional ntb_hw_plx | ntb_hw dev/ntb/test/ntb_tool.c optional ntb_tool dev/nvram/nvram.c optional nvram isa dev/random/ivy.c optional rdrand_rng !random_loadable -dev/random/nehemiah.c optional padlock_rng !random_loadable dev/random/rdseed.c optional rdrand_rng !random_loadable dev/qat_c2xxx/qat.c optional qat_c2xxx dev/qat_c2xxx/qat_ae.c optional qat_c2xxx diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 93dc00634cc0..fbcea76527db 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -302,6 +302,13 @@ envvar hint.pcf.0.irq="5" # device glxsb # AMD Geode LX Security Block +# +# padlock is a driver for the cryptographic functions and RNG in +# VIA C3, C7, and Eden processors. +# Requires 'device crypto'. +# +device padlock_rng # VIA Padlock RNG + ##################################################################### # ABI Emulation diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9bc743c0c6d1..cde4c1c0e9ac 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -819,7 +819,6 @@ _nfe= nfe _nvram= nvram .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock -_padlock_rng= padlock_rng _rdrand_rng= rdrand_rng _rdseed_rng= rdseed_rng .endif @@ -892,6 +891,9 @@ _glxsb= glxsb _pcfclock= pcfclock _pst= pst _sbni= sbni +.if ${MK_CRYPT} != "no" || defined(ALL_MODULES) +_padlock_rng= padlock_rng +.endif .endif .if ${MACHINE_ARCH} == "armv7" diff --git a/sys/x86/conf/NOTES b/sys/x86/conf/NOTES index 3b3439b519d7..fadaf90d508f 100644 --- a/sys/x86/conf/NOTES +++ b/sys/x86/conf/NOTES @@ -541,7 +541,6 @@ device smbios device vpd device asmc device tpm -device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG device aesni # AES-NI OpenCrypto module device ossl # OpenSSL OpenCrypto module