From f97c0196cec782e9789a7290c0b294b1c13cd179 Mon Sep 17 00:00:00 2001 From: Radha Mohan Chintakuntla Date: Wed, 20 Aug 2014 15:10:58 -0700 Subject: [PATCH] UBUNTU: SAUCE: (no-up) arm64: gicv3: its: Increase FORCE_MAX_ZONEORDER for Cavium ThunderX BugLink: http://bugs.launchpad.net/bugs/1558828 In case of ARCH_THUNDER, there is a need to allocate the GICv3 ITS table which is bigger than the allowed max order. So we are forcing it only in case of 4KB page size. Signed-off-by: Radha Mohan Chintakuntla Signed-off-by: Robert Richter [ dannf: Depend on ARM64_4K_PAGES instead of !ARM64_64K_PAGES now that 16K pages are available ] Signed-off-by: dann frazier Signed-off-by: Tim Gardner [ arighi: context adjustment for 6.4-rc1 ] Signed-off-by: Andrea Righi --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index aa7c1d435139..91489b3becde 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1550,7 +1550,7 @@ config XEN # 64K | 29 | 16 | 13 | 13 | config ARCH_FORCE_MAX_ORDER int - default "13" if ARM64_64K_PAGES + default "13" if ARM64_64K_PAGES || (ARCH_THUNDER && ARM64_4K_PAGES) default "11" if ARM64_16K_PAGES default "10" help