powerpc/init: Do not advertise radix during client-architecture-support

aik · mpe · commit 79b468685702 · 2018-03-27T23:44:55.000+11:00
Currently the pseries kernel advertises radix MMU support even if
the actual support is disabled via the CONFIG_PPC_RADIX_MMU option.

This adds a check for CONFIG_PPC_RADIX_MMU to avoid advertising radix
to the hypervisor.

Suggested-by: Paul Mackerras &lt;paulus@ozlabs.org&gt;
Signed-off-by: Alexey Kardashevskiy &lt;aik@ozlabs.ru&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
@@ -1111,7 +1111,8 @@ static void __init prom_check_platform_support(void)
 		}
 	}
 
-	if (supported.radix_mmu && supported.radix_gtse) {
+	if (supported.radix_mmu && supported.radix_gtse &&
+	    IS_ENABLED(CONFIG_PPC_RADIX_MMU)) {
 		/* Radix preferred - but we require GTSE for now */
 		prom_debug("Asking for radix with GTSE\n");
 		ibm_architecture_vec.vec5.mmu = OV5_FEAT(OV5_MMU_RADIX);

Original file line number	Diff line number	Diff line change
`@@ -1111,7 +1111,8 @@ static void __init prom_check_platform_support(void)`
`1111`	`1111`	`}`
`1112`	`1112`	`}`
`1113`	`1113`
`1114`		`- if (supported.radix_mmu && supported.radix_gtse) {`
	`1114`	`+ if (supported.radix_mmu && supported.radix_gtse &&`
	`1115`	`+ IS_ENABLED(CONFIG_PPC_RADIX_MMU)) {`
`1115`	`1116`	`/* Radix preferred - but we require GTSE for now */`
`1116`	`1117`	`prom_debug("Asking for radix with GTSE\n");`
`1117`	`1118`	`ibm_architecture_vec.vec5.mmu = OV5_FEAT(OV5_MMU_RADIX);`