dashboard/config/linux: enable HW_RANDOM_VIRTIO

HW_RANDOM_VIRTIO/RANDOM_TRUST_CPU/RANDOM_TRUST_BOOTLOADER
help to initialize random pool faster.

+mark some x86_64-specific configs as such
in preparataion for arm64 support.

22 files changed, 108 insertions, 101 deletions

diff --git a/dashboard/config/linux/android-5.4-base.config b/dashboard/config/linux/android-5.4-base.config
index 94a2e3726..d0d530f8d 100644
--- a/dashboard/config/linux/android-5.4-base.config
+++ b/dashboard/config/linux/android-5.4-base.config
@@ -2366,10 +2366,10 @@ CONFIG_HVC_DRIVER=y
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_INTEL=y
-CONFIG_HW_RANDOM_AMD=y
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_NVRAM is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_MWAVE is not set
@@ -2384,8 +2384,8 @@ CONFIG_HPET_MMAP_DEFAULT=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config
index 6a9dc8d4e..ee6f43c6d 100644
--- a/dashboard/config/linux/android-5.4.config
+++ b/dashboard/config/linux/android-5.4.config
@@ -2466,10 +2466,10 @@ CONFIG_HVC_DRIVER=y
 # CONFIG_IPMI_HANDLER is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
-CONFIG_HW_RANDOM_INTEL=y
-CONFIG_HW_RANDOM_AMD=y
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_NVRAM is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_MWAVE is not set
@@ -2484,8 +2484,8 @@ CONFIG_HPET_MMAP_DEFAULT=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 0df125369..4bd4c059b 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -21,7 +21,6 @@ config:
  # watchdog_thresh/workqueue.watchdog_thresh are part of deterministic hang/stall detection.
  # Don't change them without considering kernel.hung_task_check_interval_secs,
  # CONFIG_RCU_CPU_STALL_TIMEOUT, CONFIG_DEFAULT_HUNG_TASK_TIMEOUT and "no output from test machine" timeout.
- - CMDLINE_BOOL
  - CMDLINE: "ima_policy=tcb watchdog_thresh=55 workqueue.watchdog_thresh=140 kvm-intel.nested=1 nf-conntrack-ftp.ports=20000 nf-conntrack-tftp.ports=20000 nf-conntrack-sip.ports=20000 nf-conntrack-irc.ports=20000 nf-conntrack-sane.ports=20000 vivid.n_devs=16 vivid.multiplanar=1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2 netrom.nr_ndevs=16 rose.rose_ndevs=16 spec_store_bypass_disable=prctl numa=fake=2 nopcid dummy_hcd.num=8 binder.debug_mask=0 rcupdate.rcu_expedited=1"
 
  # This config can be used to enable any additional temporal debugging features in linux-next tree.
@@ -45,6 +44,15 @@ config:
  - PAGE_TABLE_ISOLATION: n
  - SCHED_DEBUG: n
 
+ # Speeds up randomness initialization.
+ - HW_RANDOM
+ - HW_RANDOM_VIRTIO
+ - HW_RANDOM_INTEL: n
+ - HW_RANDOM_AMD: n
+ - HW_RANDOM_VIA: n
+ - RANDOM_TRUST_CPU
+ - RANDOM_TRUST_BOOTLOADER
+
  # For detection of supported syscalls
  - KALLSYMS
  - KALLSYMS_ALL
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index 72dff3221..726e7852b 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -4,11 +4,20 @@
 # Auxiliary debug configs that detect non-critical bugs.
 
 config:
- - LOCKDEP
- - PROVE_LOCKING
- - DEBUG_ATOMIC_SLEEP
- - PROVE_RCU
- - RCU_EQS_DEBUG
+ # Lock debugging does not seem to work properly on arm64:
+ # https://groups.google.com/g/syzkaller/c/0Wpssi9zJbw/m/KbGObTC7BQAJ
+ - LOCKDEP: [-arm64]
+ - PROVE_LOCKING: [-arm64]
+ - DEBUG_ATOMIC_SLEEP: [-arm64]
+ - PROVE_RCU: [-arm64]
+ - RCU_EQS_DEBUG: [-arm64]
+ - DEBUG_LOCK_ALLOC: [-arm64]
+ - DEBUG_RT_MUTEXES: [-arm64]
+ - DEBUG_SPINLOCK: [-arm64]
+ - DEBUG_MUTEXES: [-arm64]
+ - DEBUG_WW_MUTEX_SLOWPATH: [-arm64]
+ - DEBUG_RWSEMS: [-arm64]
+
  - DEBUG_VM
  - DEBUG_VM_RB
  - DEBUG_VM_VMACACHE
@@ -34,12 +43,6 @@ config:
  - DEBUG_OBJECTS_TIMERS
  - DEBUG_OBJECTS_WORK
  - DEBUG_OBJECTS_SELFTEST: n
- - DEBUG_RT_MUTEXES
- - DEBUG_SPINLOCK
- - DEBUG_MUTEXES
- - DEBUG_WW_MUTEX_SLOWPATH
- - DEBUG_RWSEMS
- - DEBUG_LOCK_ALLOC
  - SND_DEBUG
  - SND_PCM_XRUN_DEBUG
  - SND_CTL_VALIDATION: [v5.6]
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index fbd831257..e2a2be770 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -40,7 +40,6 @@ config:
  - CGROUP_PERF
  - CGROUP_BPF
  - CHECKPOINT_RESTORE
- - BLK_DEV_INITRD
  - USERFAULTFD
  - COMPAT_BRK: n
  - PROFILING
@@ -587,7 +586,9 @@ config:
  - NET_IFE_SKBPRIO
  - NET_IFE_SKBTCINDEX
  - NET_TC_SKB_EXT
- - NET_DROP_MONITOR
+ # This depends on TRACING, which is enabled because of LOCKDEP,
+ # which is currently disabled on arm64.
+ - NET_DROP_MONITOR: [-arm64]
  - DCB
  - BATMAN_ADV
  - BATMAN_ADV_NC
@@ -752,16 +753,16 @@ config:
  - MTDRAM_ERASE_SIZE: 4
  - MTD_BLOCK2MTD
  - MTD_UBI
- - BLK_DEV_PMEM
- - ND_BLK
- - ND_CLAIM
- - ND_BTT
- - BTT
- - ND_PFN
- - NVDIMM_PFN
- - NVDIMM_DAX
- - OF_PMEM
- - DAX_DRIVER
+ - BLK_DEV_PMEM: [x86_64]
+ - ND_BLK: [x86_64]
+ - ND_CLAIM: [x86_64]
+ - ND_BTT: [x86_64]
+ - BTT: [x86_64]
+ - ND_PFN: [x86_64]
+ - NVDIMM_PFN: [x86_64]
+ - NVDIMM_DAX: [x86_64]
+ - OF_PMEM: [x86_64]
+ - DAX_DRIVER: [x86_64]
  - BLK_DEV_NULL_BLK
  - BLK_DEV_NULL_BLK_FAULT_INJECTION
  - BLK_DEV_FD: [x86_64]
@@ -777,7 +778,7 @@ config:
  - BLK_DEV_RNBD_CLIENT: [v5.5]
  - BLK_DEV_NVME
  - NVME_MULTIPATH
- - NVME_HWMON: [v5.7]
+ - NVME_HWMON: [n, v5.7]
  - NVME_RDMA
  - NVME_FC
  - NVME_TCP
@@ -1022,11 +1023,6 @@ config:
  - TTY_PRINTK
  - LEGACY_PTYS
  - LEGACY_PTY_COUNT: 256
- - HW_RANDOM
- - HW_RANDOM_VIRTIO
- - HW_RANDOM_INTEL: n
- - HW_RANDOM_AMD: n
- - HW_RANDOM_VIA: n
  - NVRAM: [x86_64]
  - HPET: [x86_64]
  - HPET_MMAP: [x86_64]
@@ -1327,7 +1323,7 @@ config:
  - ION_CMA_HEAP
  - CHROME_PLATFORMS: n
  - AMD_IOMMU: n
- - INTEL_IOMMU
+ - INTEL_IOMMU: [x86_64]
  - SOUNDWIRE
  - GENERIC_PHY
  - REALTEK_PHY: n
@@ -1673,5 +1669,5 @@ config:
  - SCHEDSTATS
  - RAW_DRIVER
  - THERMAL_NETLINK: [v5.8]
- - VMWARE_VMCI
+ - VMWARE_VMCI: [x86_64]
  - W1: n
diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml
index bb4f4decf..68a9b5687 100644
--- a/dashboard/config/linux/bits/x86_64.yml
+++ b/dashboard/config/linux/bits/x86_64.yml
@@ -7,6 +7,7 @@ shell:
  - make kvm_guest.config: [-android]
 
 config:
+ - CMDLINE_BOOL
  # Should be faster this way.
  - MCORE2
  - BASE_FULL
@@ -43,5 +44,4 @@ config:
  - EFI: n
 
  - TRACE_EVENT_INJECT: [v5.5]
- - PREEMPTIRQ_TRACEPOINTS: [v5.5, optional]
  - PM_TRACE_RTC: [optional]
diff --git a/dashboard/config/linux/stable-5.4-kasan-base.config b/dashboard/config/linux/stable-5.4-kasan-base.config
index fdc8c0daa..68c8be8ec 100644
--- a/dashboard/config/linux/stable-5.4-kasan-base.config
+++ b/dashboard/config/linux/stable-5.4-kasan-base.config
@@ -2417,8 +2417,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_NVRAM=y
 # CONFIG_APPLICOM is not set
 
@@ -2455,8 +2455,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config
index 01ae21be3..08cc98b9c 100644
--- a/dashboard/config/linux/stable-5.4-kasan.config
+++ b/dashboard/config/linux/stable-5.4-kasan.config
@@ -3451,8 +3451,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-apparmor-kasan-base.config b/dashboard/config/linux/upstream-apparmor-kasan-base.config
index ee046babc..cfcd0ec2b 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan-base.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan-base.config
@@ -2430,8 +2430,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
 
@@ -2471,8 +2471,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config
index 7a9b01eb1..a1482046a 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan.config
@@ -2296,7 +2296,7 @@ CONFIG_BLK_DEV_RNBD_CLIENT=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
+# CONFIG_NVME_HWMON is not set
 CONFIG_NVME_FABRICS=y
 CONFIG_NVME_RDMA=y
 CONFIG_NVME_FC=y
@@ -3546,8 +3546,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-kcsan-base.config b/dashboard/config/linux/upstream-kcsan-base.config
index 0385a8ff0..078be8d13 100644
--- a/dashboard/config/linux/upstream-kcsan-base.config
+++ b/dashboard/config/linux/upstream-kcsan-base.config
@@ -2405,8 +2405,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_APPLICOM is not set
 
 #
@@ -2445,8 +2445,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config
index 74dfe71dd..013d56611 100644
--- a/dashboard/config/linux/upstream-kcsan.config
+++ b/dashboard/config/linux/upstream-kcsan.config
@@ -2271,7 +2271,7 @@ CONFIG_BLK_DEV_RNBD_CLIENT=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
+# CONFIG_NVME_HWMON is not set
 CONFIG_NVME_FABRICS=y
 CONFIG_NVME_RDMA=y
 CONFIG_NVME_FC=y
@@ -3500,8 +3500,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-kmsan-base.config b/dashboard/config/linux/upstream-kmsan-base.config
index 434138734..b99559416 100644
--- a/dashboard/config/linux/upstream-kmsan-base.config
+++ b/dashboard/config/linux/upstream-kmsan-base.config
@@ -2390,8 +2390,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_APPLICOM is not set
 
 #
@@ -2430,8 +2430,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config
index 23e82b688..dbb3c0e87 100644
--- a/dashboard/config/linux/upstream-kmsan.config
+++ b/dashboard/config/linux/upstream-kmsan.config
@@ -2163,7 +2163,7 @@ CONFIG_BLK_DEV_RNBD_CLIENT=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
+# CONFIG_NVME_HWMON is not set
 CONFIG_NVME_FABRICS=y
 CONFIG_NVME_RDMA=y
 CONFIG_NVME_FC=y
@@ -3390,8 +3390,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-leak-base.config b/dashboard/config/linux/upstream-leak-base.config
index cf04fa923..5820de3ef 100644
--- a/dashboard/config/linux/upstream-leak-base.config
+++ b/dashboard/config/linux/upstream-leak-base.config
@@ -2404,8 +2404,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_APPLICOM is not set
 
 #
@@ -2444,8 +2444,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config
index d6a1aa54f..b83e8f1ef 100644
--- a/dashboard/config/linux/upstream-leak.config
+++ b/dashboard/config/linux/upstream-leak.config
@@ -2270,7 +2270,7 @@ CONFIG_BLK_DEV_RNBD_CLIENT=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
+# CONFIG_NVME_HWMON is not set
 CONFIG_NVME_FABRICS=y
 CONFIG_NVME_RDMA=y
 CONFIG_NVME_FC=y
@@ -3499,8 +3499,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-selinux-kasan-base.config b/dashboard/config/linux/upstream-selinux-kasan-base.config
index 6b01f8e20..b4e6edf73 100644
--- a/dashboard/config/linux/upstream-selinux-kasan-base.config
+++ b/dashboard/config/linux/upstream-selinux-kasan-base.config
@@ -2426,8 +2426,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
 
@@ -2467,8 +2467,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config
index cf1690504..c2f13734c 100644
--- a/dashboard/config/linux/upstream-selinux-kasan.config
+++ b/dashboard/config/linux/upstream-selinux-kasan.config
@@ -2292,7 +2292,7 @@ CONFIG_BLK_DEV_RNBD_CLIENT=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
+# CONFIG_NVME_HWMON is not set
 CONFIG_NVME_FABRICS=y
 CONFIG_NVME_RDMA=y
 CONFIG_NVME_FC=y
@@ -3542,8 +3542,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-smack-kasan-base.config b/dashboard/config/linux/upstream-smack-kasan-base.config
index e782baf5b..2164ee038 100644
--- a/dashboard/config/linux/upstream-smack-kasan-base.config
+++ b/dashboard/config/linux/upstream-smack-kasan-base.config
@@ -2430,8 +2430,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_XIPHERA is not set
 # CONFIG_APPLICOM is not set
 
@@ -2471,8 +2471,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config
index 78e99e96f..26973c64f 100644
--- a/dashboard/config/linux/upstream-smack-kasan.config
+++ b/dashboard/config/linux/upstream-smack-kasan.config
@@ -2296,7 +2296,7 @@ CONFIG_BLK_DEV_RNBD_CLIENT=y
 CONFIG_NVME_CORE=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
-CONFIG_NVME_HWMON=y
+# CONFIG_NVME_HWMON is not set
 CONFIG_NVME_FABRICS=y
 CONFIG_NVME_RDMA=y
 CONFIG_NVME_FC=y
@@ -3546,8 +3546,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config
index 8f94323ef..9a54806e6 100644
--- a/dashboard/config/linux/upstream-usb-base.config
+++ b/dashboard/config/linux/upstream-usb-base.config
@@ -2406,8 +2406,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_APPLICOM is not set
 
 #
@@ -2446,8 +2446,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config
index c3ba323de..c77b575da 100644
--- a/dashboard/config/linux/upstream-usb.config
+++ b/dashboard/config/linux/upstream-usb.config
@@ -2844,8 +2844,8 @@ CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_INTEL is not set
 # CONFIG_HW_RANDOM_AMD is not set
 # CONFIG_HW_RANDOM_BA431 is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_HW_RANDOM_VIRTIO is not set
+# CONFIG_HW_RANDOM_VIA is not set
+CONFIG_HW_RANDOM_VIRTIO=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_APPLICOM is not set
 
@@ -2887,8 +2887,8 @@ CONFIG_TCG_CRB=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support