From 50895a549788b61c34d6b95ee3c34d271b362b3f Mon Sep 17 00:00:00 2001 From: Nitesh Konkar Date: Wed, 19 Jun 2019 18:53:19 +0530 Subject: [PATCH] ppc64le: enable kernel config options to enhance entropy In order to create enough entropy, the kernel needs some configs to be enabled Fixes: #581 Signed-off-by: Nitesh Konkar --- kernel/configs/powerpc_kata_kvm_4.14.x | 7 +++++-- kernel/configs/powerpc_kata_kvm_4.19.x | 16 ++++++++++------ kernel/kata_config_version | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/kernel/configs/powerpc_kata_kvm_4.14.x b/kernel/configs/powerpc_kata_kvm_4.14.x index 914bad53ad..e717d23e52 100644 --- a/kernel/configs/powerpc_kata_kvm_4.14.x +++ b/kernel/configs/powerpc_kata_kvm_4.14.x @@ -1812,7 +1812,11 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_IBM_BSR is not set # CONFIG_POWERNV_OP_PANEL is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_HW_RANDOM is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_HW_RANDOM_PSERIES=y +CONFIG_HW_RANDOM_POWERNV=y # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -2894,7 +2898,6 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set # CONFIG_STACK_TRACER is not set CONFIG_BLK_DEV_IO_TRACE=y CONFIG_KPROBE_EVENTS=y diff --git a/kernel/configs/powerpc_kata_kvm_4.19.x b/kernel/configs/powerpc_kata_kvm_4.19.x index fd1463a23f..12b2c0f9d0 100644 --- a/kernel/configs/powerpc_kata_kvm_4.19.x +++ b/kernel/configs/powerpc_kata_kvm_4.19.x @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609 +# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=50400 +CONFIG_GCC_VERSION=70400 CONFIG_CLANG_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -396,7 +396,6 @@ CONFIG_PPC_4K_PAGES=y # CONFIG_PPC_64K_PAGES is not set CONFIG_THREAD_SHIFT=14 CONFIG_FORCE_MAX_ZONEORDER=13 -CONFIG_PPC_COPRO_BASE=y CONFIG_SCHED_SMT=y CONFIG_PPC_DENORMALISATION=y # CONFIG_CMDLINE_BOOL is not set @@ -1103,7 +1102,7 @@ CONFIG_VIRTIO_BLK_SCSI=y # CONFIG_GENWQE is not set # CONFIG_ECHO is not set # CONFIG_CXL is not set -CONFIG_OCXL_BASE=y +# CONFIG_OCXL is not set # CONFIG_MISC_RTSX_PCI is not set CONFIG_HAVE_IDE=y # CONFIG_IDE is not set @@ -1821,7 +1820,11 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_IBM_BSR is not set # CONFIG_POWERNV_OP_PANEL is not set # CONFIG_IPMI_HANDLER is not set -# CONFIG_HW_RANDOM is not set +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=y +CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_HW_RANDOM_PSERIES=y +CONFIG_HW_RANDOM_POWERNV=y # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -1839,7 +1842,7 @@ CONFIG_MAX_RAW_DEVS=256 # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # # I2C support @@ -2998,6 +3001,7 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_HAVE_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACKOVERFLOW=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y # CONFIG_DEBUG_SHIRQ is not set # diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 87523dd7a0..d81cc0710e 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -41 +42