Commit f22969a6 authored by Joel Stanley's avatar Joel Stanley Committed by Michael Ellerman
Browse files

powerpc/64s: Default to 64K pages for 64 bit book3s 



For 64-bit book3s the default should be 64K as that's what modern CPUs
are designed for.

The following defconfigs already set CONFIG_PPC_64K_PAGES:

 cell_defconfig
 pasemi_defconfig
 powernv_defconfig
 ppc64_defconfig
 pseries_defconfig
 skiroot_defconfig

The have the option removed from the defconfig, as it is now the
default.

The defconfigs that now need to set CONFIG_PPC_4K_PAGES to maintain
their existing behaviour are:

 g5_defconfig
 maple_defconfig
 microwatt_defconfig
 ps3_defconfig

Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
BugLink: https://github.com/linuxppc/issues/issues/109
Link: https://lore.kernel.org/r/20211015001649.45591-1-joel@jms.id.au
parent b7472e17

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ config ARCH_MEMORY_PROBE 


choice

	prompt "Page size"

	default PPC_64K_PAGES if PPC_BOOK3S_64

	default PPC_4K_PAGES

	help

	  Select the kernel logical page size. Increasing the page size

arch/powerpc/configs/cell_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ CONFIG_GEN_RTC=y 
CONFIG_BINFMT_MISC=m

CONFIG_IRQ_ALL_CPUS=y

CONFIG_NUMA=y

CONFIG_PPC_64K_PAGES=y

CONFIG_SCHED_SMT=y

CONFIG_PCIEPORTBUS=y

CONFIG_NET=y

arch/powerpc/configs/g5_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_CPU_FREQ_PMAC64=y 
CONFIG_GEN_RTC=y

CONFIG_KEXEC=y

CONFIG_IRQ_ALL_CPUS=y

CONFIG_PPC_4K_PAGES=y

CONFIG_PCI_MSI=y

CONFIG_NET=y

CONFIG_PACKET=y

arch/powerpc/configs/maple_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ CONFIG_UDBG_RTAS_CONSOLE=y 
CONFIG_GEN_RTC=y

CONFIG_KEXEC=y

CONFIG_IRQ_ALL_CPUS=y

CONFIG_PPC_4K_PAGES=y

CONFIG_PCI_MSI=y

CONFIG_NET=y

CONFIG_PACKET=y

arch/powerpc/configs/microwatt_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_PPC_MICROWATT=y 
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set

CONFIG_CPU_FREQ=y

CONFIG_HZ_100=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_MEM_KEYS is not set

# CONFIG_SECCOMP is not set

# CONFIG_MQ_IOSCHED_KYBER is not set