aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2016-07-26 06:09:30 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2016-07-31 21:14:53 -0400
commit1a01dc87e09b6e60d22c417e00f470a72f00ec80 (patch)
tree1520319bb743b3d5485ca95a8a48f97c5509f4cb /arch/powerpc
parentbad60e6f259a01cf9f29a1ef8d435ab6c60b2de9 (diff)
powerpc/mm: Add mmu_early_init_devtree()
Empty for now, but we'll add to it in the next patch. Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/book3s/64/mmu.h1
-rw-r--r--arch/powerpc/include/asm/mmu.h1
-rw-r--r--arch/powerpc/kernel/prom.c2
-rw-r--r--arch/powerpc/mm/init_64.c6
4 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h
index d4eda6420523..4eb4bd019716 100644
--- a/arch/powerpc/include/asm/book3s/64/mmu.h
+++ b/arch/powerpc/include/asm/book3s/64/mmu.h
@@ -107,6 +107,7 @@ extern int mmu_vmemmap_psize;
107extern int mmu_io_psize; 107extern int mmu_io_psize;
108 108
109/* MMU initialization */ 109/* MMU initialization */
110void mmu_early_init_devtree(void);
110extern void radix_init_native(void); 111extern void radix_init_native(void);
111extern void hash__early_init_mmu(void); 112extern void hash__early_init_mmu(void);
112extern void radix__early_init_mmu(void); 113extern void radix__early_init_mmu(void);
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 54471228f7b8..14220c5c12c9 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -210,6 +210,7 @@ extern void early_init_mmu(void);
210extern void early_init_mmu_secondary(void); 210extern void early_init_mmu_secondary(void);
211extern void setup_initial_memory_limit(phys_addr_t first_memblock_base, 211extern void setup_initial_memory_limit(phys_addr_t first_memblock_base,
212 phys_addr_t first_memblock_size); 212 phys_addr_t first_memblock_size);
213static inline void mmu_early_init_devtree(void) { }
213#endif /* __ASSEMBLY__ */ 214#endif /* __ASSEMBLY__ */
214#endif 215#endif
215 216
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index bae3db791150..9686984e79c4 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -750,6 +750,8 @@ void __init early_init_devtree(void *params)
750 if (disable_radix) 750 if (disable_radix)
751 cur_cpu_spec->mmu_features &= ~MMU_FTR_RADIX; 751 cur_cpu_spec->mmu_features &= ~MMU_FTR_RADIX;
752 752
753 mmu_early_init_devtree();
754
753#ifdef CONFIG_PPC_POWERNV 755#ifdef CONFIG_PPC_POWERNV
754 /* Scan and build the list of machine check recoverable ranges */ 756 /* Scan and build the list of machine check recoverable ranges */
755 of_scan_flat_dt(early_init_dt_scan_recoverable_ranges, NULL); 757 of_scan_flat_dt(early_init_dt_scan_recoverable_ranges, NULL);
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 33709bdb0419..d0fb33ac3db2 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -411,3 +411,9 @@ struct page *realmode_pfn_to_page(unsigned long pfn)
411EXPORT_SYMBOL_GPL(realmode_pfn_to_page); 411EXPORT_SYMBOL_GPL(realmode_pfn_to_page);
412 412
413#endif /* CONFIG_SPARSEMEM_VMEMMAP/CONFIG_FLATMEM */ 413#endif /* CONFIG_SPARSEMEM_VMEMMAP/CONFIG_FLATMEM */
414
415#ifdef CONFIG_PPC_STD_MMU_64
416void __init mmu_early_init_devtree(void)
417{
418}
419#endif /* CONFIG_PPC_STD_MMU_64 */