git: 191573ce0bfd - releng/15.1 - padlock: Restore padlock_rng to the amd64 build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 28 May 2026 22:16:12 UTC
The branch releng/15.1 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=191573ce0bfd44189ef6f34f22108e59da1cc65a
commit 191573ce0bfd44189ef6f34f22108e59da1cc65a
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-05-24 00:19:13 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-05-28 22:15:46 +0000
padlock: Restore padlock_rng to the amd64 build
Revert 88a53301e19 and d1ca01059d5 . They removed padlock_rng from the
amd64 build under the mistaken belief that this device was available on
32-bit processors only. But it's also available on the 64-bit Via Nano,
Nano X2, and some Zhaoxin CPUs.
Approved by: re (cperciva)
PR: 295517
Fixes: 88a53301e19 ("padlock.4: only install on i386")
Fixes: d1ca01059d5 ("padlock(4)/nehemiah: move i386-only entropy")
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D57215
(cherry picked from commit 14b8531c4ccb836d755ce8a4f1b384164b5d9d94)
(cherry picked from commit 71ec93ff69f0b724a1c51e9fa772b08a10506112)
---
share/man/man4/Makefile | 5 +----
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 +
8 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 23057e016f7d..c6889c49c355 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -895,6 +895,7 @@ _ntb_hw_intel.4= ntb_hw_intel.4
_ntb_hw_plx.4= ntb_hw_plx.4
_ntb_transport.4=ntb_transport.4
_nvram.4= nvram.4
+_padlock.4= padlock.4
_pchtherm.4= pchtherm.4
_qat.4= qat.4
_qat_c2xxx.4= qat_c2xxx.4
@@ -941,10 +942,6 @@ _vmm.4= vmm.4
.endif
.endif
-.if ${MACHINE_CPUARCH} == "i386"
-_padlock.4= padlock.4
-.endif
-
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64"
_hwt.4= hwt.4
.if ${MACHINE_CPUARCH} == "amd64"
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 17f70c6c26fd..6f1b4993a849 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -310,6 +310,7 @@ 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 c14d8fa261c5..595ff454f400 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -115,6 +115,7 @@ 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 e6c2089e2c1e..41c51a7aa9c5 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -33,7 +33,6 @@ 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 fabcd5d9ebe5..ebafb6e942f4 100644
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -309,6 +309,7 @@ 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 fbcea76527db..93dc00634cc0 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -302,13 +302,6 @@ 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 a3b0cda92feb..abb2668f4ae2 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -830,6 +830,7 @@ _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
@@ -903,9 +904,6 @@ _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 501d4159b129..3e8793e9d1ae 100644
--- a/sys/x86/conf/NOTES
+++ b/sys/x86/conf/NOTES
@@ -541,6 +541,7 @@ envvar hint.pbio.0.port="0x360"
device smbios
device vpd
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