powerpc/mm: Do radix device tree scanning earlier

Like we just did for hash, split the device tree scanning parts out and
call them from mmu_early_init_devtree().

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

2 files changed, 4 insertions, 3 deletions

diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index d023333c6c9a..e0ab33d20a10 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -427,7 +427,9 @@ void __init mmu_early_init_devtree(void)
         if (disable_radix)
                 cur_cpu_spec->mmu_features &= ~MMU_FTR_RADIX;
 
-        if (!radix_enabled())
+        if (radix_enabled())
+                radix__early_init_devtree();
+        else
                 hash__early_init_devtree();
 }
 #endif /* CONFIG_PPC_STD_MMU_64 */
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index 003ff48a11b6..f34ccdbe0fbd 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -264,7 +264,7 @@ static int __init radix_dt_scan_page_sizes(unsigned long node,
         return 1;
 }
 
-static void __init radix_init_page_sizes(void)
+void __init radix__early_init_devtree(void)
 {
         int rc;
 
@@ -343,7 +343,6 @@ void __init radix__early_init_mmu(void)
         __pte_frag_nr = H_PTE_FRAG_NR;
         __pte_frag_size_shift = H_PTE_FRAG_SIZE_SHIFT;
 
-        radix_init_page_sizes();
         if (!firmware_has_feature(FW_FEATURE_LPAR)) {
                 radix_init_native();
                 lpcr = mfspr(SPRN_LPCR);