| Message ID | 20170321013802.GA21037@fergus.ozlabs.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, 2017-03-21 at 01:38:02 UTC, Paul Mackerras wrote: > This reverts commit 3f91a89d424a79f8082525db5a375e438887bb3e. > > Now that we do have the machinery for using the radix MMU under a > hypervisor, the extra check and comment introduced in 3f91a89d424a are > no longer correct. The result is that when booted under a hypervisor > that only allows use of radix, we clear the MMU_FTR_TYPE_RADIX and > then set it again, and print a warning about ignoring the > disable_radix command line option, even though the command line does > not include "disable_radix". > > Signed-off-by: Paul Mackerras <paulus@ozlabs.org> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/fc36a903265c18d124cefaba364a7f cheers
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 9be9920..c22f207 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -397,8 +397,7 @@ static void early_check_vec5(void) void __init mmu_early_init_devtree(void) { /* Disable radix mode based on kernel command line. */ - /* We don't yet have the machinery to do radix as a guest. */ - if (disable_radix || !(mfmsr() & MSR_HV)) + if (disable_radix) cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX; /*
This reverts commit 3f91a89d424a79f8082525db5a375e438887bb3e. Now that we do have the machinery for using the radix MMU under a hypervisor, the extra check and comment introduced in 3f91a89d424a are no longer correct. The result is that when booted under a hypervisor that only allows use of radix, we clear the MMU_FTR_TYPE_RADIX and then set it again, and print a warning about ignoring the disable_radix command line option, even though the command line does not include "disable_radix". Signed-off-by: Paul Mackerras <paulus@ozlabs.org> --- This should go into 4.11. arch/powerpc/mm/init_64.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)