| Message ID | 20180109054520.31704-1-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 79b4686857029cdea97d0102d179aef2f58e5acb |
| Headers | show |
| Series | [kernel] powerpc/init: Do not advertise radix during client-architecture-support | expand |
On 09/01/18 16:45, Alexey Kardashevskiy wrote: > 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 <paulus@ozlabs.org> > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Ping? > --- > arch/powerpc/kernel/prom_init.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c > index 02190e9..65879df 100644 > --- a/arch/powerpc/kernel/prom_init.c > +++ b/arch/powerpc/kernel/prom_init.c > @@ -1109,7 +1109,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); >
On Tue, 2018-01-09 at 05:45:20 UTC, Alexey Kardashevskiy wrote: > 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 <paulus@ozlabs.org> > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/79b4686857029cdea97d0102d179ae cheers
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 02190e9..65879df 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -1109,7 +1109,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);
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 <paulus@ozlabs.org> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- arch/powerpc/kernel/prom_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)