Merge tag 'powerpc-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[platform/kernel/linux-rpi.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c831e20..54b9387 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -157,6 +157,7 @@ config PPC
        select ARCH_HAS_UBSAN_SANITIZE_ALL
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select ARCH_KEEP_MEMBLOCK
+       select ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE if PPC_RADIX_MMU
        select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_MIGHT_HAVE_PC_SERIO
        select ARCH_OPTIONAL_KERNEL_RWX         if ARCH_HAS_STRICT_KERNEL_RWX
@@ -174,6 +175,7 @@ config PPC
        select ARCH_WANT_IPC_PARSE_VERSION
        select ARCH_WANT_IRQS_OFF_ACTIVATE_MM
        select ARCH_WANT_LD_ORPHAN_WARN
+       select ARCH_WANT_OPTIMIZE_DAX_VMEMMAP   if PPC_RADIX_MMU
        select ARCH_WANTS_MODULES_DATA_IN_VMALLOC       if PPC_BOOK3S_32 || PPC_8xx
        select ARCH_WEAK_RELEASE_ACQUIRE
        select BINFMT_ELF
@@ -195,6 +197,7 @@ config PPC
        select GENERIC_EARLY_IOREMAP
        select GENERIC_GETTIMEOFDAY
        select GENERIC_IDLE_POLL_SETUP
+       select GENERIC_IOREMAP
        select GENERIC_IRQ_SHOW
        select GENERIC_IRQ_SHOW_LEVEL
        select GENERIC_PCI_IOMAP                if PCI
@@ -600,41 +603,21 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
        default "y" if PPC_POWERNV
        select ARCH_SUPPORTS_MEMORY_FAILURE
 
-config KEXEC
-       bool "kexec system call"
-       depends on PPC_BOOK3S || PPC_E500 || (44x && !SMP)
-       select KEXEC_CORE
-       help
-         kexec is a system call that implements the ability to shutdown your
-         current kernel, and to start another kernel.  It is like a reboot
-         but it is independent of the system firmware.   And like a reboot
-         you can start any kernel with it, not just Linux.
-
-         The name comes from the similarity to the exec system call.
-
-         It is an ongoing process to be certain the hardware in a machine
-         is properly shutdown, so do not be surprised if this code does not
-         initially work for you.  As of this writing the exact hardware
-         interface is strongly in flux, so no good recommendation can be
-         made.
-
-config KEXEC_FILE
-       bool "kexec file based system call"
-       select KEXEC_CORE
-       select HAVE_IMA_KEXEC if IMA
-       select KEXEC_ELF
-       depends on PPC64
-       depends on CRYPTO=y
-       depends on CRYPTO_SHA256=y
-       help
-         This is a new version of the kexec system call. This call is
-         file based and takes in file descriptors as system call arguments
-         for kernel and initramfs as opposed to a list of segments as is the
-         case for the older kexec call.
+config ARCH_SUPPORTS_KEXEC
+       def_bool PPC_BOOK3S || PPC_E500 || (44x && !SMP)
+
+config ARCH_SUPPORTS_KEXEC_FILE
+       def_bool PPC64 && CRYPTO=y && CRYPTO_SHA256=y
 
-config ARCH_HAS_KEXEC_PURGATORY
+config ARCH_SUPPORTS_KEXEC_PURGATORY
        def_bool KEXEC_FILE
 
+config ARCH_SELECTS_KEXEC_FILE
+       def_bool y
+       depends on KEXEC_FILE
+       select KEXEC_ELF
+       select HAVE_IMA_KEXEC if IMA
+
 config PPC64_BIG_ENDIAN_ELF_ABI_V2
        # Option is available to BFD, but LLD does not support ELFv1 so this is
        # always true there.
@@ -694,14 +677,13 @@ config RELOCATABLE_TEST
          loaded at, which tends to be non-zero and therefore test the
          relocation code.
 
-config CRASH_DUMP
-       bool "Build a dump capture kernel"
-       depends on PPC64 || PPC_BOOK3S_32 || PPC_85xx || (44x && !SMP)
+config ARCH_SUPPORTS_CRASH_DUMP
+       def_bool PPC64 || PPC_BOOK3S_32 || PPC_85xx || (44x && !SMP)
+
+config ARCH_SELECTS_CRASH_DUMP
+       def_bool y
+       depends on CRASH_DUMP
        select RELOCATABLE if PPC64 || 44x || PPC_85xx
-       help
-         Build a kernel suitable for use as a dump capture kernel.
-         The same kernel binary can be used as production kernel and dump
-         capture kernel.
 
 config FA_DUMP
        bool "Firmware-assisted dump"