Commit 75239cf7 authored by Eric DeVolder's avatar Eric DeVolder Committed by Andrew Morton
Browse files

s390/kexec: refactor for kernel/Kconfig.kexec 

The kexec and crash kernel options are provided in the common
kernel/Kconfig.kexec. Utilize the common options and provide
the ARCH_SUPPORTS_ and ARCH_SELECTS_ entries to recreate the
equivalent set of KEXEC and CRASH options.

Link: https://lkml.kernel.org/r/20230712161545.87870-13-eric.devolder@oracle.com


Signed-off-by: default avatarEric DeVolder <eric.devolder@oracle.com>
Acked-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 1f0d6efe

arch/s390/Kconfig

+23 −46
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ config S390 
	select HAVE_VIRT_CPU_ACCOUNTING_IDLE

	select IOMMU_HELPER		if PCI

	select IOMMU_SUPPORT		if PCI

	select KEXEC

	select MMU_GATHER_MERGE_VMAS

	select MMU_GATHER_NO_GATHER

	select MMU_GATHER_RCU_TABLE_FREE
@@ -244,6 +245,28 @@ config PGTABLE_LEVELS 


source "kernel/livepatch/Kconfig"



config ARCH_DEFAULT_KEXEC

	def_bool y



config ARCH_SUPPORTS_KEXEC

	def_bool y



config ARCH_SUPPORTS_KEXEC_FILE

	def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390



config ARCH_SUPPORTS_KEXEC_SIG

	def_bool MODULE_SIG_FORMAT



config ARCH_HAS_KEXEC_PURGATORY

	def_bool KEXEC_FILE



config ARCH_SUPPORTS_CRASH_DUMP

	def_bool y

	help

	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.

	  This option also enables s390 zfcpdump.

	  See also <file:Documentation/s390/zfcpdump.rst>



menu "Processor type and features"



config HAVE_MARCH_Z10_FEATURES
@@ -482,36 +505,6 @@ config SCHED_TOPOLOGY 


source "kernel/Kconfig.hz"



config KEXEC

	def_bool y

	select KEXEC_CORE



config KEXEC_FILE

	bool "kexec file based system call"

	select KEXEC_CORE

	depends on CRYPTO

	depends on CRYPTO_SHA256

	depends on CRYPTO_SHA256_S390

	help

	  Enable the kexec file based system call. In contrast to the normal

	  kexec system call this system call takes file descriptors for the

	  kernel and initramfs as arguments.



config ARCH_HAS_KEXEC_PURGATORY

	def_bool y

	depends on KEXEC_FILE



config KEXEC_SIG

	bool "Verify kernel signature during kexec_file_load() syscall"

	depends on KEXEC_FILE && MODULE_SIG_FORMAT

	help

	  This option makes kernel signature verification mandatory for

	  the kexec_file_load() syscall.



	  In addition to that option, you need to enable signature

	  verification for the corresponding kernel image type being

	  loaded in order for this to work.



config KERNEL_NOBP

	def_bool n

	prompt "Enable modified branch prediction for the kernel by default"
@@ -733,22 +726,6 @@ config VFIO_AP 


endmenu



menu "Dump support"



config CRASH_DUMP

	bool "kernel crash dumps"

	select KEXEC

	help

	  Generate crash dump after being started by kexec.

	  Crash dump kernels are loaded in the main kernel with kexec-tools

	  into a specially reserved region and then later executed after

	  a crash by kdump/kexec.

	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.

	  This option also enables s390 zfcpdump.

	  See also <file:Documentation/s390/zfcpdump.rst>



endmenu



config CCW

	def_bool y