Commit 7ebc4903 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman

powerpc: Rename PPC_NATIVE to PPC_HASH_MMU_NATIVE

PPC_NATIVE now only controls the native HPT code, so rename it to be
more descriptive. Restrict it to Book3S only.
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211201144153.2456614-3-npiggin@gmail.com
parent 79b74a68
...@@ -6,7 +6,7 @@ CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE) ...@@ -6,7 +6,7 @@ CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE)
obj-y += hash_pgtable.o hash_utils.o slb.o \ obj-y += hash_pgtable.o hash_utils.o slb.o \
mmu_context.o pgtable.o hash_tlb.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_RADIX_MMU) += radix_pgtable.o radix_tlb.o
obj-$(CONFIG_PPC_4K_PAGES) += hash_4k.o obj-$(CONFIG_PPC_4K_PAGES) += hash_4k.o
obj-$(CONFIG_PPC_64K_PAGES) += hash_64k.o obj-$(CONFIG_PPC_64K_PAGES) += hash_64k.o
......
...@@ -1091,7 +1091,7 @@ void __init hash__early_init_mmu(void) ...@@ -1091,7 +1091,7 @@ void __init hash__early_init_mmu(void)
ps3_early_mm_init(); ps3_early_mm_init();
else if (firmware_has_feature(FW_FEATURE_LPAR)) else if (firmware_has_feature(FW_FEATURE_LPAR))
hpte_init_pseries(); hpte_init_pseries();
else if (IS_ENABLED(CONFIG_PPC_NATIVE)) else if (IS_ENABLED(CONFIG_PPC_HASH_MMU_NATIVE))
hpte_init_native(); hpte_init_native();
if (!mmu_hash_ops.hpte_insert) if (!mmu_hash_ops.hpte_insert)
......
...@@ -34,7 +34,7 @@ config PPC_EFIKA ...@@ -34,7 +34,7 @@ config PPC_EFIKA
bool "bPlan Efika 5k2. MPC5200B based computer" bool "bPlan Efika 5k2. MPC5200B based computer"
depends on PPC_MPC52xx depends on PPC_MPC52xx
select PPC_RTAS select PPC_RTAS
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
config PPC_LITE5200 config PPC_LITE5200
bool "Freescale Lite5200 Eval Board" bool "Freescale Lite5200 Eval Board"
......
...@@ -40,9 +40,9 @@ config EPAPR_PARAVIRT ...@@ -40,9 +40,9 @@ config EPAPR_PARAVIRT
In case of doubt, say Y In case of doubt, say Y
config PPC_NATIVE config PPC_HASH_MMU_NATIVE
bool bool
depends on PPC_BOOK3S_32 || PPC64 depends on PPC_BOOK3S
help help
Support for running natively on the hardware, i.e. without Support for running natively on the hardware, i.e. without
a hypervisor. This option is not user-selectable but should a hypervisor. This option is not user-selectable but should
......
...@@ -8,7 +8,7 @@ config PPC_CELL_COMMON ...@@ -8,7 +8,7 @@ config PPC_CELL_COMMON
select PPC_DCR_MMIO select PPC_DCR_MMIO
select PPC_INDIRECT_PIO select PPC_INDIRECT_PIO
select PPC_INDIRECT_MMIO select PPC_INDIRECT_MMIO
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select PPC_RTAS select PPC_RTAS
select IRQ_EDGE_EOI_HANDLER select IRQ_EDGE_EOI_HANDLER
......
...@@ -11,6 +11,6 @@ config PPC_CHRP ...@@ -11,6 +11,6 @@ config PPC_CHRP
select RTAS_ERROR_LOGGING select RTAS_ERROR_LOGGING
select PPC_MPC106 select PPC_MPC106
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select FORCE_PCI select FORCE_PCI
default y default y
...@@ -55,7 +55,7 @@ config MVME5100 ...@@ -55,7 +55,7 @@ config MVME5100
select FORCE_PCI select FORCE_PCI
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
select PPC_I8259 select PPC_I8259
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select PPC_UDBG_16550 select PPC_UDBG_16550
help help
This option enables support for the Motorola (now Emerson) MVME5100 This option enables support for the Motorola (now Emerson) MVME5100
......
...@@ -9,7 +9,7 @@ config PPC_MAPLE ...@@ -9,7 +9,7 @@ config PPC_MAPLE
select GENERIC_TBSYNC select GENERIC_TBSYNC
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_970_NAP select PPC_970_NAP
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select PPC_RTAS select PPC_RTAS
select MMIO_NVRAM select MMIO_NVRAM
select ATA_NONSTANDARD if ATA select ATA_NONSTANDARD if ATA
......
...@@ -5,7 +5,7 @@ config PPC_MICROWATT ...@@ -5,7 +5,7 @@ config PPC_MICROWATT
select PPC_XICS select PPC_XICS
select PPC_ICS_NATIVE select PPC_ICS_NATIVE
select PPC_ICP_NATIVE select PPC_ICP_NATIVE
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select PPC_UDBG_16550 select PPC_UDBG_16550
select ARCH_RANDOM select ARCH_RANDOM
help help
......
...@@ -5,7 +5,7 @@ config PPC_PASEMI ...@@ -5,7 +5,7 @@ config PPC_PASEMI
select MPIC select MPIC
select FORCE_PCI select FORCE_PCI
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select MPIC_BROKEN_REGREAD select MPIC_BROKEN_REGREAD
help help
This option enables support for PA Semi's PWRficient line This option enables support for PA Semi's PWRficient line
......
...@@ -6,7 +6,7 @@ config PPC_PMAC ...@@ -6,7 +6,7 @@ config PPC_PMAC
select FORCE_PCI select FORCE_PCI
select PPC_INDIRECT_PCI if PPC32 select PPC_INDIRECT_PCI if PPC32
select PPC_MPC106 if PPC32 select PPC_MPC106 if PPC32
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select ZONE_DMA if PPC32 select ZONE_DMA if PPC32
default y default y
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
config PPC_POWERNV config PPC_POWERNV
depends on PPC64 && PPC_BOOK3S depends on PPC64 && PPC_BOOK3S
bool "IBM PowerNV (Non-Virtualized) platform support" bool "IBM PowerNV (Non-Virtualized) platform support"
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select PPC_XICS select PPC_XICS
select PPC_ICP_NATIVE select PPC_ICP_NATIVE
select PPC_XIVE_NATIVE select PPC_XIVE_NATIVE
......
...@@ -17,7 +17,7 @@ config PPC_PSERIES ...@@ -17,7 +17,7 @@ config PPC_PSERIES
select PPC_RTAS_DAEMON select PPC_RTAS_DAEMON
select RTAS_ERROR_LOGGING select RTAS_ERROR_LOGGING
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_NATIVE select PPC_HASH_MMU_NATIVE
select PPC_DOORBELL select PPC_DOORBELL
select HOTPLUG_CPU select HOTPLUG_CPU
select ARCH_RANDOM select ARCH_RANDOM
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment