powerpc: Fix booting P9 hash with CONFIG_PPC_RADIX_MMU=N
authorMichael Neuling <mikey@neuling.org>
Wed, 24 May 2017 07:03:26 +0000 (17:03 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 25 May 2017 13:07:44 +0000 (23:07 +1000)
commitd957fb4d173647640a2b83e7c7e56a580e7fc7e7
treea94621575b6942491a3dbc5a32a4240de999866d
parent415ba3c157b9de7edc59468d19d48c1d15972a75
powerpc: Fix booting P9 hash with CONFIG_PPC_RADIX_MMU=N

Currently if you disable CONFIG_PPC_RADIX_MMU you'll crash on boot on
a P9. This is because we still set MMU_FTR_TYPE_RADIX via
ibm,pa-features and MMU_FTR_TYPE_RADIX is what's used for code patching
in much of the asm code (ie. slb_miss_realmode)

This patch fixes the problem by stopping MMU_FTR_TYPE_RADIX from being
set from ibm.pa-features.

We may eventually end up removing the CONFIG_PPC_RADIX_MMU option
completely but until then this fixes the issue.

Fixes: 17a3dd2f5fc7 ("powerpc/mm/radix: Use firmware feature to enable Radix MMU")
Cc: stable@vger.kernel.org # v4.7+
Signed-off-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/prom.c