forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d 
 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,48 @@
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 HAVE_VIRT_CPU_ACCOUNTING_IDLE
187
+	select IOMMU_HELPER		if PCI
188
+	select IOMMU_SUPPORT		if PCI
168189 	select MODULES_USE_ELF_RELA
169
-	select NO_BOOTMEM
190
+	select NEED_DMA_MAP_STATE	if PCI
191
+	select NEED_SG_DMA_LENGTH	if PCI
170192 	select OLD_SIGACTION
171193 	select OLD_SIGSUSPEND3
194
+	select PCI_DOMAINS		if PCI
195
+	select PCI_MSI			if PCI
196
+	select PCI_MSI_ARCH_FALLBACKS	if PCI_MSI
197
+	select SET_FS
172198 	select SPARSE_IRQ
173199 	select SYSCTL_EXCEPTION_TRACE
174200 	select THREAD_INFO_IN_TASK
175201 	select TTY
176202 	select VIRT_CPU_ACCOUNTING
177203 	select ARCH_HAS_SCALED_CPUTIME
178
-	select VIRT_TO_BUS
179204 	select HAVE_NMI
205
+	select ARCH_HAS_FORCE_DMA_UNENCRYPTED
206
+	select SWIOTLB
207
+	select GENERIC_ALLOCATOR
208
+	imply IMA_SECURE_AND_OR_TRUSTED_BOOT
180209 
181210 
182211 config SCHED_OMIT_FRAME_POINTER
....@@ -221,6 +250,10 @@
221250 	def_bool n
222251 	select HAVE_MARCH_Z13_FEATURES
223252 
253
+config HAVE_MARCH_Z15_FEATURES
254
+	def_bool n
255
+	select HAVE_MARCH_Z14_FEATURES
256
+
224257 choice
225258 	prompt "Processor type"
226259 	default MARCH_Z196
....@@ -228,6 +261,7 @@
228261 config MARCH_Z900
229262 	bool "IBM zSeries model z800 and z900"
230263 	select HAVE_MARCH_Z900_FEATURES
264
+	depends on $(cc-option,-march=z900)
231265 	help
232266 	  Select this to enable optimizations for model z800/z900 (2064 and
233267 	  2066 series). This will enable some optimizations that are not
....@@ -236,6 +270,7 @@
236270 config MARCH_Z990
237271 	bool "IBM zSeries model z890 and z990"
238272 	select HAVE_MARCH_Z990_FEATURES
273
+	depends on $(cc-option,-march=z990)
239274 	help
240275 	  Select this to enable optimizations for model z890/z990 (2084 and
241276 	  2086 series). The kernel will be slightly faster but will not work
....@@ -244,6 +279,7 @@
244279 config MARCH_Z9_109
245280 	bool "IBM System z9"
246281 	select HAVE_MARCH_Z9_109_FEATURES
282
+	depends on $(cc-option,-march=z9-109)
247283 	help
248284 	  Select this to enable optimizations for IBM System z9 (2094 and
249285 	  2096 series). The kernel will be slightly faster but will not work
....@@ -252,6 +288,7 @@
252288 config MARCH_Z10
253289 	bool "IBM System z10"
254290 	select HAVE_MARCH_Z10_FEATURES
291
+	depends on $(cc-option,-march=z10)
255292 	help
256293 	  Select this to enable optimizations for IBM System z10 (2097 and
257294 	  2098 series). The kernel will be slightly faster but will not work
....@@ -260,6 +297,7 @@
260297 config MARCH_Z196
261298 	bool "IBM zEnterprise 114 and 196"
262299 	select HAVE_MARCH_Z196_FEATURES
300
+	depends on $(cc-option,-march=z196)
263301 	help
264302 	  Select this to enable optimizations for IBM zEnterprise 114 and 196
265303 	  (2818 and 2817 series). The kernel will be slightly faster but will
....@@ -268,6 +306,7 @@
268306 config MARCH_ZEC12
269307 	bool "IBM zBC12 and zEC12"
270308 	select HAVE_MARCH_ZEC12_FEATURES
309
+	depends on $(cc-option,-march=zEC12)
271310 	help
272311 	  Select this to enable optimizations for IBM zBC12 and zEC12 (2828 and
273312 	  2827 series). The kernel will be slightly faster but will not work on
....@@ -276,6 +315,7 @@
276315 config MARCH_Z13
277316 	bool "IBM z13s and z13"
278317 	select HAVE_MARCH_Z13_FEATURES
318
+	depends on $(cc-option,-march=z13)
279319 	help
280320 	  Select this to enable optimizations for IBM z13s and z13 (2965 and
281321 	  2964 series). The kernel will be slightly faster but will not work on
....@@ -284,9 +324,19 @@
284324 config MARCH_Z14
285325 	bool "IBM z14 ZR1 and z14"
286326 	select HAVE_MARCH_Z14_FEATURES
327
+	depends on $(cc-option,-march=z14)
287328 	help
288329 	  Select this to enable optimizations for IBM z14 ZR1 and z14 (3907
289330 	  and 3906 series). The kernel will be slightly faster but will not
331
+	  work on older machines.
332
+
333
+config MARCH_Z15
334
+	bool "IBM z15"
335
+	select HAVE_MARCH_Z15_FEATURES
336
+	depends on $(cc-option,-march=z15)
337
+	help
338
+	  Select this to enable optimizations for IBM z15 (8562
339
+	  and 8561 series). The kernel will be slightly faster but will not
290340 	  work on older machines.
291341 
292342 endchoice
....@@ -315,6 +365,9 @@
315365 config MARCH_Z14_TUNE
316366 	def_bool TUNE_Z14 || MARCH_Z14 && TUNE_DEFAULT
317367 
368
+config MARCH_Z15_TUNE
369
+	def_bool TUNE_Z15 || MARCH_Z15 && TUNE_DEFAULT
370
+
318371 choice
319372 	prompt "Tune code generation"
320373 	default TUNE_DEFAULT
....@@ -334,27 +387,39 @@
334387 
335388 config TUNE_Z900
336389 	bool "IBM zSeries model z800 and z900"
390
+	depends on $(cc-option,-mtune=z900)
337391 
338392 config TUNE_Z990
339393 	bool "IBM zSeries model z890 and z990"
394
+	depends on $(cc-option,-mtune=z990)
340395 
341396 config TUNE_Z9_109
342397 	bool "IBM System z9"
398
+	depends on $(cc-option,-mtune=z9-109)
343399 
344400 config TUNE_Z10
345401 	bool "IBM System z10"
402
+	depends on $(cc-option,-mtune=z10)
346403 
347404 config TUNE_Z196
348405 	bool "IBM zEnterprise 114 and 196"
406
+	depends on $(cc-option,-mtune=z196)
349407 
350408 config TUNE_ZEC12
351409 	bool "IBM zBC12 and zEC12"
410
+	depends on $(cc-option,-mtune=zEC12)
352411 
353412 config TUNE_Z13
354
-	bool "IBM z13"
413
+	bool "IBM z13s and z13"
414
+	depends on $(cc-option,-mtune=z13)
355415 
356416 config TUNE_Z14
357
-	bool "IBM z14"
417
+	bool "IBM z14 ZR1 and z14"
418
+	depends on $(cc-option,-mtune=z14)
419
+
420
+config TUNE_Z15
421
+	bool "IBM z15"
422
+	depends on $(cc-option,-mtune=z15)
358423 
359424 endchoice
360425 
....@@ -367,6 +432,7 @@
367432 	select COMPAT_BINFMT_ELF if BINFMT_ELF
368433 	select ARCH_WANT_OLD_COMPAT_IPC
369434 	select COMPAT_OLD_SIGACTION
435
+	select HAVE_UID16
370436 	depends on MULTIUSER
371437 	help
372438 	  Select this option if you want to enable your system kernel to
....@@ -379,27 +445,10 @@
379445 
380446 config SMP
381447 	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.
398448 
399449 config NR_CPUS
400450 	int "Maximum number of CPUs (2-512)"
401451 	range 2 512
402
-	depends on SMP
403452 	default "64"
404453 	help
405454 	  This allows you to specify the maximum number of CPUs which this
....@@ -411,82 +460,20 @@
411460 
412461 config HOTPLUG_CPU
413462 	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
428463 
429464 config NUMA
430465 	bool "NUMA support"
431
-	depends on SMP && SCHED_TOPOLOGY
466
+	depends on SCHED_TOPOLOGY
432467 	default n
433468 	help
434469 	  Enable NUMA support
435470 
436471 	  This option adds NUMA support to the kernel.
437472 
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
-
445473 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
474
+	int
475
+	depends on NEED_MULTIPLE_NODES
476
+	default "1"
490477 
491478 config SCHED_SMT
492479 	def_bool n
....@@ -503,7 +490,6 @@
503490 config SCHED_TOPOLOGY
504491 	def_bool y
505492 	prompt "Topology scheduler support"
506
-	depends on SMP
507493 	select SCHED_SMT
508494 	select SCHED_MC
509495 	select SCHED_BOOK
....@@ -513,7 +499,7 @@
513499 	  making when dealing with machines that have multi-threading,
514500 	  multiple cores or multiple books.
515501 
516
-source kernel/Kconfig.hz
502
+source "kernel/Kconfig.hz"
517503 
518504 config KEXEC
519505 	def_bool y
....@@ -522,7 +508,6 @@
522508 config KEXEC_FILE
523509 	bool "kexec file based system call"
524510 	select KEXEC_CORE
525
-	select BUILD_BIN2C
526511 	depends on CRYPTO
527512 	depends on CRYPTO_SHA256
528513 	depends on CRYPTO_SHA256_S390
....@@ -534,6 +519,17 @@
534519 config ARCH_HAS_KEXEC_PURGATORY
535520 	def_bool y
536521 	depends on KEXEC_FILE
522
+
523
+config KEXEC_SIG
524
+	bool "Verify kernel signature during kexec_file_load() syscall"
525
+	depends on KEXEC_FILE && MODULE_SIG_FORMAT
526
+	help
527
+	  This option makes kernel signature verification mandatory for
528
+	  the kexec_file_load() syscall.
529
+
530
+	  In addition to that option, you need to enable signature
531
+	  verification for the corresponding kernel image type being
532
+	  loaded in order for this to work.
537533 
538534 config ARCH_RANDOM
539535 	def_bool y
....@@ -595,6 +591,29 @@
595591 
596592 endchoice
597593 
594
+config RELOCATABLE
595
+	bool "Build a relocatable kernel"
596
+	select MODULE_REL_CRCS if MODVERSIONS
597
+	default y
598
+	help
599
+	  This builds a kernel image that retains relocation information
600
+	  so it can be loaded at an arbitrary address.
601
+	  The kernel is linked as a position-independent executable (PIE)
602
+	  and contains dynamic relocations which are processed early in the
603
+	  bootup process.
604
+	  The relocations make the kernel image about 15% larger (compressed
605
+	  10%), but are discarded at runtime.
606
+
607
+config RANDOMIZE_BASE
608
+	bool "Randomize the address of the kernel image (KASLR)"
609
+	depends on RELOCATABLE
610
+	default y
611
+	help
612
+	  In support of Kernel Address Space Layout Randomization (KASLR),
613
+	  this randomizes the address at which the kernel image is loaded,
614
+	  as a security feature that deters exploit attempts relying on
615
+	  knowledge of the location of kernel internals.
616
+
598617 endmenu
599618 
600619 menu "Memory setup"
....@@ -607,9 +626,6 @@
607626 config ARCH_SPARSEMEM_DEFAULT
608627 	def_bool y
609628 
610
-config ARCH_SELECT_MEMORY_MODEL
611
-	def_bool y
612
-
613629 config ARCH_ENABLE_MEMORY_HOTPLUG
614630 	def_bool y if SPARSEMEM
615631 
....@@ -618,10 +634,6 @@
618634 
619635 config ARCH_ENABLE_SPLIT_PMD_PTLOCK
620636 	def_bool y
621
-
622
-config FORCE_MAX_ZONEORDER
623
-	int
624
-	default "9"
625637 
626638 config MAX_PHYSMEM_BITS
627639 	int "Maximum size of supported physical memory in bits (42-53)"
....@@ -649,6 +661,7 @@
649661 
650662 config CHECK_STACK
651663 	def_bool y
664
+	depends on !VMAP_STACK
652665 	prompt "Detect kernel stack overflow"
653666 	help
654667 	  This option enables the compiler option -mstack-guard and
....@@ -689,7 +702,7 @@
689702 config QDIO
690703 	def_tristate y
691704 	prompt "QDIO support"
692
-	---help---
705
+	help
693706 	  This driver provides the Queued Direct I/O base support for
694707 	  IBM System z.
695708 
....@@ -697,17 +710,6 @@
697710 	  module will be called qdio.
698711 
699712 	  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.
711713 
712714 if PCI
713715 
....@@ -719,12 +721,7 @@
719721 	  This allows you to specify the maximum number of PCI functions which
720722 	  this kernel will support.
721723 
722
-source "drivers/pci/Kconfig"
723
-
724
-endif	# PCI
725
-
726
-config PCI_DOMAINS
727
-	def_bool PCI
724
+endif # PCI
728725 
729726 config HAS_IOMEM
730727 	def_bool PCI
....@@ -773,53 +770,35 @@
773770 	  To compile this driver as a module, choose M here: the
774771 	  module will be called vfio_ccw.
775772 
773
+config VFIO_AP
774
+	def_tristate n
775
+	prompt "VFIO support for AP devices"
776
+	depends on S390_AP_IOMMU && VFIO_MDEV_DEVICE && KVM
777
+	depends on ZCRYPT
778
+	help
779
+		This driver grants access to Adjunct Processor (AP) devices
780
+		via the VFIO mediated device interface.
781
+
782
+		To compile this driver as a module, choose M here: the module
783
+		will be called vfio_ap.
784
+
776785 endmenu
777786 
778787 menu "Dump support"
779788 
780789 config CRASH_DUMP
781790 	bool "kernel crash dumps"
782
-	depends on SMP
783791 	select KEXEC
784792 	help
785793 	  Generate crash dump after being started by kexec.
786794 	  Crash dump kernels are loaded in the main kernel with kexec-tools
787795 	  into a specially reserved region and then later executed after
788796 	  a crash by kdump/kexec.
789
-	  Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
797
+	  Refer to <file:Documentation/s390/zfcpdump.rst> for more details on this.
790798 	  This option also enables s390 zfcpdump.
791
-	  See also <file:Documentation/s390/zfcpdump.txt>
799
+	  See also <file:Documentation/s390/zfcpdump.rst>
792800 
793801 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
823802 
824803 config CCW
825804 	def_bool y
....@@ -829,6 +808,18 @@
829808 	default (SMC || CCWGROUP)
830809 
831810 menu "Virtualization"
811
+
812
+config PROTECTED_VIRTUALIZATION_GUEST
813
+	def_bool n
814
+	prompt "Protected virtualization guest support"
815
+	select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
816
+	help
817
+	  Select this option, if you want to be able to run this
818
+	  kernel as a protected virtualization KVM guest.
819
+	  Protected virtualization capable machines have a mini hypervisor
820
+	  located at machine level (an ultravisor). With help of the
821
+	  Ultravisor, KVM will be able to run "protected" VMs, special
822
+	  VMs whose memory and management data are unavailable to KVM.
832823 
833824 config PFAULT
834825 	def_bool y
....@@ -944,7 +935,6 @@
944935 	select TTY
945936 	select VIRTUALIZATION
946937 	select VIRTIO
947
-	select VIRTIO_CONSOLE
948938 	help
949939 	  Enabling this option adds support for virtio based paravirtual device
950940 	  drivers on s390.
....@@ -953,3 +943,17 @@
953943 	  the KVM hypervisor.
954944 
955945 endmenu
946
+
947
+menu "Selftests"
948
+
949
+config S390_UNWIND_SELFTEST
950
+	def_tristate n
951
+	prompt "Test unwind functions"
952
+	help
953
+	  This option enables s390 specific stack unwinder testing kernel
954
+	  module. This option is not useful for distributions or general
955
+	  kernels, but only for kernel developers working on architecture code.
956
+
957
+	  Say N if you are unsure.
958
+
959
+endmenu