Page MenuHomeFreeBSD
Files F157931447

D57215.diff
No OneTemporary
Actions

D57215.diff
View Options

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -903,6 +903,7 @@
_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 @@
.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
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -329,6 +329,7 @@
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
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -125,6 +125,7 @@
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
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -33,7 +33,6 @@
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
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -310,6 +310,7 @@
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
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -296,13 +296,6 @@
#
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
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -838,6 +838,7 @@
_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 @@
_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
--- a/sys/x86/conf/NOTES
+++ b/sys/x86/conf/NOTES
@@ -549,6 +549,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Wed, May 27, 2:29 PM (2 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33550554
Default Alt Text
D57215.diff (3 KB)

Event Timeline