]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
powerpc: Rename PPC_NATIVE to PPC_HASH_MMU_NATIVE
authorNicholas Piggin <npiggin@gmail.com>
Wed, 1 Dec 2021 14:41:37 +0000 (00:41 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 2 Dec 2021 11:57:22 +0000 (22:57 +1100)
PPC_NATIVE now only controls the native HPT code, so rename it to be
more descriptive. Restrict it to Book3S only.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211201144153.2456614-3-npiggin@gmail.com
13 files changed:
arch/powerpc/mm/book3s64/Makefile
arch/powerpc/mm/book3s64/hash_utils.c
arch/powerpc/platforms/52xx/Kconfig
arch/powerpc/platforms/Kconfig
arch/powerpc/platforms/cell/Kconfig
arch/powerpc/platforms/chrp/Kconfig
arch/powerpc/platforms/embedded6xx/Kconfig
arch/powerpc/platforms/maple/Kconfig
arch/powerpc/platforms/microwatt/Kconfig
arch/powerpc/platforms/pasemi/Kconfig
arch/powerpc/platforms/powermac/Kconfig
arch/powerpc/platforms/powernv/Kconfig
arch/powerpc/platforms/pseries/Kconfig

index 1b56d3af47d4a2cdc0386bb5cf1abd2fcf8dcdeb..319f4b7f335749710a74a4af3b38fbe75b919398 100644 (file)
@@ -6,7 +6,7 @@ CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE)
 
 obj-y                          += hash_pgtable.o hash_utils.o slb.o \
                                   mmu_context.o pgtable.o hash_tlb.o
-obj-$(CONFIG_PPC_NATIVE)       += hash_native.o
+obj-$(CONFIG_PPC_HASH_MMU_NATIVE)      += hash_native.o
 obj-$(CONFIG_PPC_RADIX_MMU)    += radix_pgtable.o radix_tlb.o
 obj-$(CONFIG_PPC_4K_PAGES)     += hash_4k.o
 obj-$(CONFIG_PPC_64K_PAGES)    += hash_64k.o
index cfd45245d00932bcd0ed6edf649337bed60f1815..92680da5229a39d9f89241ffdd2e3868e9ca7b19 100644 (file)
@@ -1091,7 +1091,7 @@ void __init hash__early_init_mmu(void)
                ps3_early_mm_init();
        else if (firmware_has_feature(FW_FEATURE_LPAR))
                hpte_init_pseries();
-       else if (IS_ENABLED(CONFIG_PPC_NATIVE))
+       else if (IS_ENABLED(CONFIG_PPC_HASH_MMU_NATIVE))
                hpte_init_native();
 
        if (!mmu_hash_ops.hpte_insert)
index 99d60acc20c8ceb34186ab5e26ce98dbcdaafbd8..b72ed2950ca8edc6536ae0ebb35cdb5585ad6e7c 100644 (file)
@@ -34,7 +34,7 @@ config PPC_EFIKA
        bool "bPlan Efika 5k2. MPC5200B based computer"
        depends on PPC_MPC52xx
        select PPC_RTAS
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
 
 config PPC_LITE5200
        bool "Freescale Lite5200 Eval Board"
index e02d29a9d12ff63a134c924a71f54a4ee967fa76..d41dad227de84c8aad20139101813acd7caab274 100644 (file)
@@ -40,9 +40,9 @@ config EPAPR_PARAVIRT
 
          In case of doubt, say Y
 
-config PPC_NATIVE
+config PPC_HASH_MMU_NATIVE
        bool
-       depends on PPC_BOOK3S_32 || PPC64
+       depends on PPC_BOOK3S
        help
          Support for running natively on the hardware, i.e. without
          a hypervisor. This option is not user-selectable but should
index cb70c5f25bc6f1b7079d4731b87dc07e6f19ba2d..db4465c51b56e425db47526c3564f5c563d24716 100644 (file)
@@ -8,7 +8,7 @@ config PPC_CELL_COMMON
        select PPC_DCR_MMIO
        select PPC_INDIRECT_PIO
        select PPC_INDIRECT_MMIO
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select PPC_RTAS
        select IRQ_EDGE_EOI_HANDLER
 
index 9b5c5505718a337b69346bbe59ada414b7aab564..ff30ed579a394eebfdb4503a3d1cc70c4efc3cd2 100644 (file)
@@ -11,6 +11,6 @@ config PPC_CHRP
        select RTAS_ERROR_LOGGING
        select PPC_MPC106
        select PPC_UDBG_16550
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select FORCE_PCI
        default y
index 4c6d703a4284b988345a3f9f0529a9947ad4e1d7..c54786f8461eaa30acc5e7d686b6eec980655634 100644 (file)
@@ -55,7 +55,7 @@ config MVME5100
        select FORCE_PCI
        select PPC_INDIRECT_PCI
        select PPC_I8259
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select PPC_UDBG_16550
        help
          This option enables support for the Motorola (now Emerson) MVME5100
index 86ae210bee9a6183ff209c0f4102c3818a8d06b7..7fd84311ade58c219060cb12325bfa5536637db6 100644 (file)
@@ -9,7 +9,7 @@ config PPC_MAPLE
        select GENERIC_TBSYNC
        select PPC_UDBG_16550
        select PPC_970_NAP
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select PPC_RTAS
        select MMIO_NVRAM
        select ATA_NONSTANDARD if ATA
index 8f6a81978461fc492ed752e93aeb36c61cdad58f..62b51e37fc05a9e81a974c56aa7a899a7d8def70 100644 (file)
@@ -5,7 +5,7 @@ config PPC_MICROWATT
        select PPC_XICS
        select PPC_ICS_NATIVE
        select PPC_ICP_NATIVE
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select PPC_UDBG_16550
        select ARCH_RANDOM
        help
index c52731a7773f81b3d6f689beebc3be41feac8530..bc7137353a7f194e86a16b65e57e162e62a15d2f 100644 (file)
@@ -5,7 +5,7 @@ config PPC_PASEMI
        select MPIC
        select FORCE_PCI
        select PPC_UDBG_16550
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select MPIC_BROKEN_REGREAD
        help
          This option enables support for PA Semi's PWRficient line
index b97bf12801eb2e1ea25546cf5dca7e6c2bff8857..2b56df145b824e15a196b28ba6ab28f003fe25b2 100644 (file)
@@ -6,7 +6,7 @@ config PPC_PMAC
        select FORCE_PCI
        select PPC_INDIRECT_PCI if PPC32
        select PPC_MPC106 if PPC32
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select ZONE_DMA if PPC32
        default y
 
index 043eefbbdd286f8f8175c9689415b269a2c89ac5..cd754e1161848b43be8bc66b4f73639dd7d2eca7 100644 (file)
@@ -2,7 +2,7 @@
 config PPC_POWERNV
        depends on PPC64 && PPC_BOOK3S
        bool "IBM PowerNV (Non-Virtualized) platform support"
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select PPC_XICS
        select PPC_ICP_NATIVE
        select PPC_XIVE_NATIVE
index 9bd5421641288fc1a7d578629f8088054ae604c5..30618750bd9888d806d97356478b248d433abc67 100644 (file)
@@ -17,7 +17,7 @@ config PPC_PSERIES
        select PPC_RTAS_DAEMON
        select RTAS_ERROR_LOGGING
        select PPC_UDBG_16550
-       select PPC_NATIVE
+       select PPC_HASH_MMU_NATIVE
        select PPC_DOORBELL
        select HOTPLUG_CPU
        select ARCH_RANDOM