git: 14b8531c4ccb - main - padlock: Restore padlock_rng to the amd64 build

The branch main has been updated by asomers:

URL: https://cgit.FreeBSD.org/src/commit/?id=14b8531c4ccb836d755ce8a4f1b384164b5d9d94

commit 14b8531c4ccb836d755ce8a4f1b384164b5d9d94
Author:     Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2026-05-24 00:19:13 +0000
Commit:     Alan Somers <asomers@FreeBSD.org>
CommitDate: 2026-05-26 21:43:57 +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.
    
    PR:             295517
    Fixes:          88a53301e19 ("padlock.4: only install on i386")
    Fixes:          d1ca01059d5 ("padlock(4)/nehemiah: move i386-only entropy")
    MFC after:      1 week
    Reviewed by:    kib
    Differential Revision: https://reviews.freebsd.org/D57215
---
 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 0b94158659fb..4b9740e12081 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -903,6 +903,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
@@ -949,10 +950,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 c6a095f2d98a..9d76736cc46b 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -329,6 +329,7 @@ device		xz			# lzma decompression
 device		bpf			# Berkeley packet filter
 
 # random(4)
+device		padlock_rng		# VIA Padlock RNG
 device		rdrand_rng		# Intel Bull Mountain RNG
 # Disabled for now since tpm(4) breaks suspend/resume.
 #device		tpm			# Trusted Platform Module
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index d67ae8189a9e..ba64c39bc6b9 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -125,6 +125,7 @@ device		ether			# Ethernet support
 device		bpf			# Berkeley packet filter
 
 # random(4)
+device		padlock_rng		# VIA Padlock RNG
 device		rdrand_rng		# Intel Bull Mountain RNG
 # Disabled for now since tpm(4) breaks suspend/resume.
 #device		tpm			# Trusted Platform Module
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 0e7a1f24be7e..b65d78d1ea3c 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 8a7e0b78feb4..a9b9d8875ad1 100644
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -310,6 +310,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 25bfb99c1fef..b21f05b685b5 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -296,13 +296,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 faedb856977c..f21f22c174cd 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -838,6 +838,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
@@ -911,9 +912,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 3ae80fbe45c5..ebe272769818 100644
--- a/sys/x86/conf/NOTES
+++ b/sys/x86/conf/NOTES
@@ -549,6 +549,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