forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/arch/s390/Kconfig
....@@ -14,12 +14,6 @@
1414 config STACKTRACE_SUPPORT
1515 	def_bool y
1616 
17
-config RWSEM_GENERIC_SPINLOCK
18
-	bool
19
-
20
-config RWSEM_XCHGADD_ALGORITHM
21
-	def_bool y
22
-
2317 config ARCH_HAS_ILOG2_U32
2418 	def_bool n
2519 
....@@ -36,7 +30,7 @@
3630 	def_bool y
3731 
3832 config GENERIC_LOCKBREAK
39
-	def_bool y if SMP && PREEMPT
33
+	def_bool y if PREEMPTION
4034 
4135 config PGSTE
4236 	def_bool y if KVM
....@@ -56,21 +50,31 @@
5650 config ARCH_SUPPORTS_UPROBES
5751 	def_bool y
5852 
53
+config KASAN_SHADOW_OFFSET
54
+	hex
55
+	depends on KASAN
56
+	default 0x18000000000000 if KASAN_S390_4_LEVEL_PAGING
57
+	default 0x30000000000
58
+
5959 config S390
6060 	def_bool y
6161 	select ARCH_BINFMT_ELF_STATE
62
+	select ARCH_HAS_DEBUG_VM_PGTABLE
63
+	select ARCH_HAS_DEBUG_WX
6264 	select ARCH_HAS_DEVMEM_IS_ALLOWED
6365 	select ARCH_HAS_ELF_RANDOMIZE
6466 	select ARCH_HAS_FORTIFY_SOURCE
6567 	select ARCH_HAS_GCOV_PROFILE_ALL
66
-	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA
68
+	select ARCH_HAS_GIGANTIC_PAGE
6769 	select ARCH_HAS_KCOV
70
+	select ARCH_HAS_MEM_ENCRYPT
6871 	select ARCH_HAS_PTE_SPECIAL
6972 	select ARCH_HAS_SET_MEMORY
70
-	select ARCH_HAS_SG_CHAIN
7173 	select ARCH_HAS_STRICT_KERNEL_RWX
7274 	select ARCH_HAS_STRICT_MODULE_RWX
75
+	select ARCH_HAS_SYSCALL_WRAPPER
7376 	select ARCH_HAS_UBSAN_SANITIZE_ALL
77
+	select ARCH_HAS_VDSO_DATA
7478 	select ARCH_HAVE_NMI_SAFE_CMPXCHG
7579 	select ARCH_INLINE_READ_LOCK
7680 	select ARCH_INLINE_READ_LOCK_BH
....@@ -100,47 +104,58 @@
100104 	select ARCH_INLINE_WRITE_UNLOCK_BH
101105 	select ARCH_INLINE_WRITE_UNLOCK_IRQ
102106 	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
103
-	select ARCH_SAVE_PAGE_KEYS if HIBERNATION
107
+	select ARCH_STACKWALK
104108 	select ARCH_SUPPORTS_ATOMIC_RMW
105109 	select ARCH_SUPPORTS_NUMA_BALANCING
106110 	select ARCH_USE_BUILTIN_BSWAP
107111 	select ARCH_USE_CMPXCHG_LOCKREF
108112 	select ARCH_WANTS_DYNAMIC_TASK_STRUCT
113
+	select ARCH_WANT_DEFAULT_BPF_JIT
109114 	select ARCH_WANT_IPC_PARSE_VERSION
110
-	select BUILDTIME_EXTABLE_SORT
115
+	select BUILDTIME_TABLE_SORT
111116 	select CLONE_BACKWARDS2
117
+	select DMA_OPS if PCI
112118 	select DYNAMIC_FTRACE if FUNCTION_TRACER
113119 	select GENERIC_CLOCKEVENTS
114120 	select GENERIC_CPU_AUTOPROBE
115
-	select GENERIC_CPU_DEVICES if !SMP
116121 	select GENERIC_CPU_VULNERABILITIES
117122 	select GENERIC_FIND_FIRST_BIT
123
+	select GENERIC_GETTIMEOFDAY
124
+	select GENERIC_PTDUMP
118125 	select GENERIC_SMP_IDLE_THREAD
119126 	select GENERIC_TIME_VSYSCALL
120127 	select HAVE_ALIGNED_STRUCT_PAGE if SLUB
121128 	select HAVE_ARCH_AUDITSYSCALL
122129 	select HAVE_ARCH_JUMP_LABEL
130
+	select HAVE_ARCH_JUMP_LABEL_RELATIVE
131
+	select HAVE_ARCH_KASAN
132
+	select HAVE_ARCH_KASAN_VMALLOC
123133 	select CPU_NO_EFFICIENT_FFS if !HAVE_MARCH_Z9_109_FEATURES
124134 	select HAVE_ARCH_SECCOMP_FILTER
125135 	select HAVE_ARCH_SOFT_DIRTY
126136 	select HAVE_ARCH_TRACEHOOK
127137 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
138
+	select HAVE_ARCH_VMAP_STACK
139
+	select HAVE_ASM_MODVERSIONS
128140 	select HAVE_EBPF_JIT if PACK_STACK && HAVE_MARCH_Z196_FEATURES
129141 	select HAVE_CMPXCHG_DOUBLE
130142 	select HAVE_CMPXCHG_LOCAL
131
-	select HAVE_COPY_THREAD_TLS
132143 	select HAVE_DEBUG_KMEMLEAK
133144 	select HAVE_DMA_CONTIGUOUS
134
-	select DMA_DIRECT_OPS
135145 	select HAVE_DYNAMIC_FTRACE
136146 	select HAVE_DYNAMIC_FTRACE_WITH_REGS
147
+	select HAVE_FAST_GUP
137148 	select HAVE_EFFICIENT_UNALIGNED_ACCESS
138149 	select HAVE_FENTRY
139150 	select HAVE_FTRACE_MCOUNT_RECORD
151
+	select HAVE_FUNCTION_ERROR_INJECTION
140152 	select HAVE_FUNCTION_GRAPH_TRACER
141153 	select HAVE_FUNCTION_TRACER
142154 	select HAVE_FUTEX_CMPXCHG if FUTEX
143155 	select HAVE_GCC_PLUGINS
156
+	select HAVE_GENERIC_VDSO
157
+	select HAVE_IOREMAP_PROT if PCI
158
+	select HAVE_IRQ_EXIT_ON_IRQ_STACK
144159 	select HAVE_KERNEL_BZIP2
145160 	select HAVE_KERNEL_GZIP
146161 	select HAVE_KERNEL_LZ4
....@@ -149,34 +164,47 @@
149164 	select HAVE_KERNEL_UNCOMPRESSED
150165 	select HAVE_KERNEL_XZ
151166 	select HAVE_KPROBES
167
+	select HAVE_KPROBES_ON_FTRACE
152168 	select HAVE_KRETPROBES
153169 	select HAVE_KVM
154170 	select HAVE_LIVEPATCH
155171 	select HAVE_PERF_REGS
156172 	select HAVE_PERF_USER_STACK_DUMP
157
-	select HAVE_MEMBLOCK
158
-	select HAVE_MEMBLOCK_NODE_MAP
159173 	select HAVE_MEMBLOCK_PHYS_MAP
174
+	select MMU_GATHER_NO_GATHER
160175 	select HAVE_MOD_ARCH_SPECIFIC
161176 	select HAVE_NOP_MCOUNT
162177 	select HAVE_OPROFILE
178
+	select HAVE_PCI
163179 	select HAVE_PERF_EVENTS
180
+	select MMU_GATHER_RCU_TABLE_FREE
164181 	select HAVE_REGS_AND_STACK_ACCESS_API
182
+	select HAVE_RELIABLE_STACKTRACE
165183 	select HAVE_RSEQ
166184 	select HAVE_SYSCALL_TRACEPOINTS
167185 	select HAVE_VIRT_CPU_ACCOUNTING
186
+	select IOMMU_HELPER		if PCI
187
+	select IOMMU_SUPPORT		if PCI
168188 	select MODULES_USE_ELF_RELA
169
-	select NO_BOOTMEM
189
+	select NEED_DMA_MAP_STATE	if PCI
190
+	select NEED_SG_DMA_LENGTH	if PCI
170191 	select OLD_SIGACTION
171192 	select OLD_SIGSUSPEND3
193
+	select PCI_DOMAINS		if PCI
194
+	select PCI_MSI			if PCI
195
+	select PCI_MSI_ARCH_FALLBACKS	if PCI_MSI
196
+	select SET_FS
172197 	select SPARSE_IRQ
173198 	select SYSCTL_EXCEPTION_TRACE
174199 	select THREAD_INFO_IN_TASK
175200 	select TTY
176201 	select VIRT_CPU_ACCOUNTING
177202 	select ARCH_HAS_SCALED_CPUTIME
178
-	select VIRT_TO_BUS
179203 	select HAVE_NMI
204
+	select ARCH_HAS_FORCE_DMA_UNENCRYPTED
205
+	select SWIOTLB
206
+	select GENERIC_ALLOCATOR
207
+	imply IMA_SECURE_AND_OR_TRUSTED_BOOT
180208 
181209 
182210 config SCHED_OMIT_FRAME_POINTER
....@@ -221,6 +249,10 @@
221249 	def_bool n
222250 	select HAVE_MARCH_Z13_FEATURES
223251 
252
+config HAVE_MARCH_Z15_FEATURES
253
+	def_bool n
254
+	select HAVE_MARCH_Z14_FEATURES
255
+
224256 choice
225257 	prompt "Processor type"
226258 	default MARCH_Z196
....@@ -228,6 +260,7 @@
228260 config MARCH_Z900
229261 	bool "IBM zSeries model z800 and z900"
230262 	select HAVE_MARCH_Z900_FEATURES
263
+	depends on $(cc-option,-march=z900)
231264 	help
232265 	  Select this to enable optimizations for model z800/z900 (2064 and
233266 	  2066 series). This will enable some optimizations that are not
....@@ -236,6 +269,7 @@
236269 config MARCH_Z990
237270 	bool "IBM zSeries model z890 and z990"
238271 	select HAVE_MARCH_Z990_FEATURES
272
+	depends on $(cc-option,-march=z990)
239273 	help
240274 	  Select this to enable optimizations for model z890/z990 (2084 and
241275 	  2086 series). The kernel will be slightly faster but will not work
....@@ -244,6 +278,7 @@
244278 config MARCH_Z9_109
245279 	bool "IBM System z9"
246280 	select HAVE_MARCH_Z9_109_FEATURES
281
+	depends on $(cc-option,-march=z9-109)
247282 	help
248283 	  Select this to enable optimizations for IBM System z9 (2094 and
249284 	  2096 series). The kernel will be slightly faster but will not work
....@@ -252,6 +287,7 @@
252287 config MARCH_Z10
253288 	bool "IBM System z10"
254289 	select HAVE_MARCH_Z10_FEATURES
290
+	depends on $(cc-option,-march=z10)
255291 	help
256292 	  Select this to enable optimizations for IBM System z10 (2097 and
257293 	  2098 series). The kernel will be slightly faster but will not work
....@@ -260,6 +296,7 @@
260296 config MARCH_Z196
261297 	bool "IBM zEnterprise 114 and 196"
262298 	select HAVE_MARCH_Z196_FEATURES
299
+	depends on $(cc-option,-march=z196)
263300 	help
264301 	  Select this to enable optimizations for IBM zEnterprise 114 and 196
265302 	  (2818 and 2817 series). The kernel will be slightly faster but will
....@@ -268,6 +305,7 @@
268305 config MARCH_ZEC12
269306 	bool "IBM zBC12 and zEC12"
270307 	select HAVE_MARCH_ZEC12_FEATURES
308
+	depends on $(cc-option,-march=zEC12)
271309 	help
272310 	  Select this to enable optimizations for IBM zBC12 and zEC12 (2828 and
273311 	  2827 series). The kernel will be slightly faster but will not work on
....@@ -276,6 +314,7 @@
276314 config MARCH_Z13
277315 	bool "IBM z13s and z13"
278316 	select HAVE_MARCH_Z13_FEATURES
317
+	depends on $(cc-option,-march=z13)
279318 	help
280319 	  Select this to enable optimizations for IBM z13s and z13 (2965 and
281320 	  2964 series). The kernel will be slightly faster but will not work on
....@@ -284,9 +323,19 @@
284323 config MARCH_Z14
285324 	bool "IBM z14 ZR1 and z14"
286325 	select HAVE_MARCH_Z14_FEATURES
326
+	depends on $(cc-option,-march=z14)
287327 	help
288328 	  Select this to enable optimizations for IBM z14 ZR1 and z14 (3907
289329 	  and 3906 series). The kernel will be slightly faster but will not
330
+	  work on older machines.
331
+
332
+config MARCH_Z15
333
+	bool "IBM z15"
334
+	select HAVE_MARCH_Z15_FEATURES
335
+	depends on $(cc-option,-march=z15)
336
+	help
337
+	  Select this to enable optimizations for IBM z15 (8562
338
+	  and 8561 series). The kernel will be slightly faster but will not
290339 	  work on older machines.
291340 
292341 endchoice
....@@ -315,6 +364,9 @@
315364 config MARCH_Z14_TUNE
316365 	def_bool TUNE_Z14 || MARCH_Z14 && TUNE_DEFAULT
317366 
367
+config MARCH_Z15_TUNE
368
+	def_bool TUNE_Z15 || MARCH_Z15 && TUNE_DEFAULT
369
+
318370 choice
319371 	prompt "Tune code generation"
320372 	default TUNE_DEFAULT
....@@ -334,27 +386,39 @@
334386 
335387 config TUNE_Z900
336388 	bool "IBM zSeries model z800 and z900"
389
+	depends on $(cc-option,-mtune=z900)
337390 
338391 config TUNE_Z990
339392 	bool "IBM zSeries model z890 and z990"
393
+	depends on $(cc-option,-mtune=z990)
340394 
341395 config TUNE_Z9_109
342396 	bool "IBM System z9"
397
+	depends on $(cc-option,-mtune=z9-109)
343398 
344399 config TUNE_Z10
345400 	bool "IBM System z10"
401
+	depends on $(cc-option,-mtune=z10)
346402 
347403 config TUNE_Z196
348404 	bool "IBM zEnterprise 114 and 196"
405
+	depends on $(cc-option,-mtune=z196)
349406 
350407 config TUNE_ZEC12
351408 	bool "IBM zBC12 and zEC12"
409
+	depends on $(cc-option,-mtune=zEC12)
352410 
353411 config TUNE_Z13
354
-	bool "IBM z13"
412
+	bool "IBM z13s and z13"
413
+	depends on $(cc-option,-mtune=z13)
355414 
356415 config TUNE_Z14
357
-	bool "IBM z14"
416
+	bool "IBM z14 ZR1 and z14"
417
+	depends on $(cc-option,-mtune=z14)
418
+
419
+config TUNE_Z15
420
+	bool "IBM z15"
421
+	depends on $(cc-option,-mtune=z15)
358422 
359423 endchoice
360424 
....@@ -367,6 +431,7 @@
367431 	select COMPAT_BINFMT_ELF if BINFMT_ELF
368432 	select ARCH_WANT_OLD_COMPAT_IPC
369433 	select COMPAT_OLD_SIGACTION
434
+	select HAVE_UID16
370435 	depends on MULTIUSER
371436 	help
372437 	  Select this option if you want to enable your system kernel to
....@@ -379,27 +444,10 @@
379444 
380445 config SMP
381446 	def_bool y
382
-	prompt "Symmetric multi-processing support"
383
-	---help---
384
-	  This enables support for systems with more than one CPU. If you have
385
-	  a system with only one CPU, like most personal computers, say N. If
386
-	  you have a system with more than one CPU, say Y.
387
-
388
-	  If you say N here, the kernel will run on uni- and multiprocessor
389
-	  machines, but will use only one CPU of a multiprocessor machine. If
390
-	  you say Y here, the kernel will run on many, but not all,
391
-	  uniprocessor machines. On a uniprocessor machine, the kernel
392
-	  will run faster if you say N here.
393
-
394
-	  See also the SMP-HOWTO available at
395
-	  <http://www.tldp.org/docs.html#howto>.
396
-
397
-	  Even if you don't know what to do here, say Y.
398447 
399448 config NR_CPUS
400449 	int "Maximum number of CPUs (2-512)"
401450 	range 2 512
402
-	depends on SMP
403451 	default "64"
404452 	help
405453 	  This allows you to specify the maximum number of CPUs which this
....@@ -411,82 +459,20 @@
411459 
412460 config HOTPLUG_CPU
413461 	def_bool y
414
-	prompt "Support for hot-pluggable CPUs"
415
-	depends on SMP
416
-	help
417
-	  Say Y here to be able to turn CPUs off and on. CPUs
418
-	  can be controlled through /sys/devices/system/cpu/cpu#.
419
-	  Say N if you want to disable CPU hotplug.
420
-
421
-# Some NUMA nodes have memory ranges that span
422
-# other nodes.	Even though a pfn is valid and
423
-# between a node's start and end pfns, it may not
424
-# reside on that node.	See memmap_init_zone()
425
-# for details. <- They meant memory holes!
426
-config NODES_SPAN_OTHER_NODES
427
-	def_bool NUMA
428462 
429463 config NUMA
430464 	bool "NUMA support"
431
-	depends on SMP && SCHED_TOPOLOGY
465
+	depends on SCHED_TOPOLOGY
432466 	default n
433467 	help
434468 	  Enable NUMA support
435469 
436470 	  This option adds NUMA support to the kernel.
437471 
438
-	  An operation mode can be selected by appending
439
-	  numa=<method> to the kernel command line.
440
-
441
-	  The default behaviour is identical to appending numa=plain to
442
-	  the command line. This will create just one node with all
443
-	  available memory and all CPUs in it.
444
-
445472 config NODES_SHIFT
446
-	int "Maximum NUMA nodes (as a power of 2)"
447
-	range 1 10
448
-	depends on NUMA
449
-	default "4"
450
-	help
451
-	  Specify the maximum number of NUMA nodes available on the target
452
-	  system. Increases memory reserved to accommodate various tables.
453
-
454
-menu "Select NUMA modes"
455
-	depends on NUMA
456
-
457
-config NUMA_EMU
458
-	bool "NUMA emulation"
459
-	default y
460
-	help
461
-	  Numa emulation mode will split the available system memory into
462
-	  equal chunks which then are distributed over the configured number
463
-	  of nodes in a round-robin manner.
464
-
465
-	  The number of fake nodes is limited by the number of available memory
466
-	  chunks (i.e. memory size / fake size) and the number of supported
467
-	  nodes in the kernel.
468
-
469
-	  The CPUs are assigned to the nodes in a way that partially respects
470
-	  the original machine topology (if supported by the machine).
471
-	  Fair distribution of the CPUs is not guaranteed.
472
-
473
-config EMU_SIZE
474
-	hex "NUMA emulation memory chunk size"
475
-	default 0x10000000
476
-	range 0x400000 0x100000000
477
-	depends on NUMA_EMU
478
-	help
479
-	  Select the default size by which the memory is chopped and then
480
-	  assigned to emulated NUMA nodes.
481
-
482
-	  This can be overridden by specifying
483
-
484
-	  emu_size=<n>
485
-
486
-	  on the kernel command line where also suffixes K, M, G, and T are
487
-	  supported.
488
-
489
-endmenu
473
+	int
474
+	depends on NEED_MULTIPLE_NODES
475
+	default "1"
490476 
491477 config SCHED_SMT
492478 	def_bool n
....@@ -503,7 +489,6 @@
503489 config SCHED_TOPOLOGY
504490 	def_bool y
505491 	prompt "Topology scheduler support"
506
-	depends on SMP
507492 	select SCHED_SMT
508493 	select SCHED_MC
509494 	select SCHED_BOOK
....@@ -513,7 +498,7 @@
513498 	  making when dealing with machines that have multi-threading,
514499 	  multiple cores or multiple books.
515500 
516
-source kernel/Kconfig.hz
501
+source "kernel/Kconfig.hz"
517502 
518503 config KEXEC
519504 	def_bool y
....@@ -522,7 +507,6 @@
522507 config KEXEC_FILE
523508 	bool "kexec file based system call"
524509 	select KEXEC_CORE
525
-	select BUILD_BIN2C
526510 	depends on CRYPTO
527511 	depends on CRYPTO_SHA256
528512 	depends on CRYPTO_SHA256_S390
....@@ -534,6 +518,17 @@
534518 config ARCH_HAS_KEXEC_PURGATORY
535519 	def_bool y
536520 	depends on KEXEC_FILE
521
+
522
+config KEXEC_SIG
523
+	bool "Verify kernel signature during kexec_file_load() syscall"
524
+	depends on KEXEC_FILE && MODULE_SIG_FORMAT
525
+	help
526
+	  This option makes kernel signature verification mandatory for
527
+	  the kexec_file_load() syscall.
528
+
529
+	  In addition to that option, you need to enable signature
530
+	  verification for the corresponding kernel image type being
531
+	  loaded in order for this to work.
537532 
538533 config ARCH_RANDOM
539534 	def_bool y
....@@ -595,6 +590,29 @@
595590 
596591 endchoice
597592 
593
+config RELOCATABLE
594
+	bool "Build a relocatable kernel"
595
+	select MODULE_REL_CRCS if MODVERSIONS
596
+	default y
597
+	help
598
+	  This builds a kernel image that retains relocation information
599
+	  so it can be loaded at an arbitrary address.
600
+	  The kernel is linked as a position-independent executable (PIE)
601
+	  and contains dynamic relocations which are processed early in the
602
+	  bootup process.
603
+	  The relocations make the kernel image about 15% larger (compressed
604
+	  10%), but are discarded at runtime.
605
+
606
+config RANDOMIZE_BASE
607
+	bool "Randomize the address of the kernel image (KASLR)"
608
+	depends on RELOCATABLE
609
+	default y
610
+	help
611
+	  In support of Kernel Address Space Layout Randomization (KASLR),
612
+	  this randomizes the address at which the kernel image is loaded,
613
+	  as a security feature that deters exploit attempts relying on
614
+	  knowledge of the location of kernel internals.
615
+
598616 endmenu
599617 
600618 menu "Memory setup"
....@@ -607,9 +625,6 @@
607625 config ARCH_SPARSEMEM_DEFAULT
608626 	def_bool y
609627 
610
-config ARCH_SELECT_MEMORY_MODEL
611
-	def_bool y
612
-
613628 config ARCH_ENABLE_MEMORY_HOTPLUG
614629 	def_bool y if SPARSEMEM
615630 
....@@ -618,10 +633,6 @@
618633 
619634 config ARCH_ENABLE_SPLIT_PMD_PTLOCK
620635 	def_bool y
621
-
622
-config FORCE_MAX_ZONEORDER
623
-	int
624
-	default "9"
625636 
626637 config MAX_PHYSMEM_BITS
627638 	int "Maximum size of supported physical memory in bits (42-53)"
....@@ -649,6 +660,7 @@
649660 
650661 config CHECK_STACK
651662 	def_bool y
663
+	depends on !VMAP_STACK
652664 	prompt "Detect kernel stack overflow"
653665 	help
654666 	  This option enables the compiler option -mstack-guard and
....@@ -689,7 +701,7 @@
689701 config QDIO
690702 	def_tristate y
691703 	prompt "QDIO support"
692
-	---help---
704
+	help
693705 	  This driver provides the Queued Direct I/O base support for
694706 	  IBM System z.
695707 
....@@ -697,17 +709,6 @@
697709 	  module will be called qdio.
698710 
699711 	  If unsure, say Y.
700
-
701
-menuconfig PCI
702
-	bool "PCI support"
703
-	select PCI_MSI
704
-	select IOMMU_HELPER
705
-	select IOMMU_SUPPORT
706
-	select NEED_DMA_MAP_STATE
707
-	select NEED_SG_DMA_LENGTH
708
-
709
-	help
710
-	  Enable PCI support.
711712 
712713 if PCI
713714 
....@@ -719,12 +720,7 @@
719720 	  This allows you to specify the maximum number of PCI functions which
720721 	  this kernel will support.
721722 
722
-source "drivers/pci/Kconfig"
723
-
724
-endif	# PCI
725
-
726
-config PCI_DOMAINS
727
-	def_bool PCI
723
+endif # PCI
728724 
729725 config HAS_IOMEM
730726 	def_bool PCI
....@@ -773,53 +769,35 @@
773769 	  To compile this driver as a module, choose M here: the
774770 	  module will be called vfio_ccw.
775771 
772
+config VFIO_AP
773
+	def_tristate n
774
+	prompt "VFIO support for AP devices"
775
+	depends on S390_AP_IOMMU && VFIO_MDEV_DEVICE && KVM
776
+	depends on ZCRYPT
777
+	help
778
+		This driver grants access to Adjunct Processor (AP) devices
779
+		via the VFIO mediated device interface.
780
+
781
+		To compile this driver as a module, choose M here: the module
782
+		will be called vfio_ap.
783
+
776784 endmenu
777785 
778786 menu "Dump support"
779787 
780788 config CRASH_DUMP
781789 	bool "kernel crash dumps"
782
-	depends on SMP
783790 	select KEXEC
784791 	help
785792 	  Generate crash dump after being started by kexec.
786793 	  Crash dump kernels are loaded in the main kernel with kexec-tools
787794 	  into a specially reserved region and then later executed after
788795 	  a crash by kdump/kexec.
789
-	  Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
796
+	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.
790797 	  This option also enables s390 zfcpdump.
791
-	  See also <file:Documentation/s390/zfcpdump.txt>
798
+	  See also <file:Documentation/s390/zfcpdump.rst>
792799 
793800 endmenu
794
-
795
-config SECCOMP
796
-	def_bool y
797
-	prompt "Enable seccomp to safely compute untrusted bytecode"
798
-	depends on PROC_FS
799
-	help
800
-	  This kernel feature is useful for number crunching applications
801
-	  that may need to compute untrusted bytecode during their
802
-	  execution. By using pipes or other transports made available to
803
-	  the process as file descriptors supporting the read/write
804
-	  syscalls, it's possible to isolate those applications in
805
-	  their own address space using seccomp. Once seccomp is
806
-	  enabled via /proc/<pid>/seccomp, it cannot be disabled
807
-	  and the task is only allowed to execute a few safe syscalls
808
-	  defined by each seccomp mode.
809
-
810
-	  If unsure, say Y.
811
-
812
-menu "Power Management"
813
-
814
-config ARCH_HIBERNATION_POSSIBLE
815
-	def_bool y
816
-
817
-source "kernel/power/Kconfig"
818
-
819
-endmenu
820
-
821
-config PCMCIA
822
-	def_bool n
823801 
824802 config CCW
825803 	def_bool y
....@@ -829,6 +807,18 @@
829807 	default (SMC || CCWGROUP)
830808 
831809 menu "Virtualization"
810
+
811
+config PROTECTED_VIRTUALIZATION_GUEST
812
+	def_bool n
813
+	prompt "Protected virtualization guest support"
814
+	select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
815
+	help
816
+	  Select this option, if you want to be able to run this
817
+	  kernel as a protected virtualization KVM guest.
818
+	  Protected virtualization capable machines have a mini hypervisor
819
+	  located at machine level (an ultravisor). With help of the
820
+	  Ultravisor, KVM will be able to run "protected" VMs, special
821
+	  VMs whose memory and management data are unavailable to KVM.
832822 
833823 config PFAULT
834824 	def_bool y
....@@ -944,7 +934,6 @@
944934 	select TTY
945935 	select VIRTUALIZATION
946936 	select VIRTIO
947
-	select VIRTIO_CONSOLE
948937 	help
949938 	  Enabling this option adds support for virtio based paravirtual device
950939 	  drivers on s390.
....@@ -953,3 +942,17 @@
953942 	  the KVM hypervisor.
954943 
955944 endmenu
945
+
946
+menu "Selftests"
947
+
948
+config S390_UNWIND_SELFTEST
949
+	def_tristate n
950
+	prompt "Test unwind functions"
951
+	help
952
+	  This option enables s390 specific stack unwinder testing kernel
953
+	  module. This option is not useful for distributions or general
954
+	  kernels, but only for kernel developers working on architecture code.
955
+
956
+	  Say N if you are unsure.
957
+
958
+endmenu