From 2d9218e96936f51e58bae6901efa57b0fe5b7ff0 Mon Sep 17 00:00:00 2001 From: Balbir Singh Date: Thu, 27 Sep 2018 16:20:24 -0400 Subject: [PATCH] Revert "powerpc/powernv: Increase memory block size to 1GB on radix" BugLink: https://bugs.launchpad.net/bugs/1792102 This commit was a stop-gap to prevent crashes on hotunplug, caused by the mismatch between the 1G mappings used for the linear mapping and the memory block size. Those issues are now resolved because we split the linear mapping at hotunplug time if necessary, as implemented in commit 4dd5f8a99e79 ("powerpc/mm/radix: Split linear mapping on hot-unplug"). Signed-off-by: Balbir Singh Signed-off-by: Michael Neuling Tested-by: Rashmica Gupta Tested-by: Balbir Singh Signed-off-by: Michael Ellerman (cherry picked from commit 7acf50e4efa60270edcb95107f660f5e258a90f2) Signed-off-by: Joseph Salisbury Acked-by: Stefan Bader Acked-by: Kleber Souza Signed-off-by: Khalid Elmously --- arch/powerpc/platforms/powernv/setup.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c index fc0412d59149..34e36f91a38e 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -362,15 +362,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary) #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE static unsigned long pnv_memory_block_size(void) { - /* - * We map the kernel linear region with 1GB large pages on radix. For - * memory hot unplug to work our memory block size must be at least - * this size. - */ - if (radix_enabled()) - return 1UL * 1024 * 1024 * 1024; - else - return 256UL * 1024 * 1024; + return 256UL * 1024 * 1024; } #endif -- 2.39.2