mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

powerpc/mm: Move slb_addr_linit to early_init_mmu

Browse source 
Avoid #ifdef in generic code. Also enables us to do this specific to
MMU translation mode on book3s64

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Aneesh Kumar K.V 2019-04-17 18:33:49 +05:30 committed by Michael Ellerman
parent 60458fba46
commit 67fda38f0d
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/powerpc/kernel/setup-common.c
View file

@ -947,17 +947,6 @@ void __init setup_arch(char **cmdline_p)
init_mm.end_data = (unsigned long) _edata; init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit; init_mm.brk = klimit;
#ifdef CONFIG_PPC_MM_SLICES
#ifdef CONFIG_PPC64
if (!radix_enabled())
init_mm.context.slb_addr_limit = DEFAULT_MAP_WINDOW_USER64;
#elif defined(CONFIG_PPC_8xx)
init_mm.context.slb_addr_limit = DEFAULT_MAP_WINDOW;
#else
#error "context.addr_limit not initialized."
#endif
#endif
#ifdef CONFIG_SPAPR_TCE_IOMMU #ifdef CONFIG_SPAPR_TCE_IOMMU
mm_iommu_init(&init_mm); mm_iommu_init(&init_mm);
#endif #endif

2
arch/powerpc/mm/hash_utils_64.c
View file

@ -1036,6 +1036,8 @@ void __init hash__early_init_mmu(void)
*/ */
htab_initialize(); htab_initialize();
init_mm.context.slb_addr_limit = DEFAULT_MAP_WINDOW_USER64;
pr_info("Initializing hash mmu with SLB\n"); pr_info("Initializing hash mmu with SLB\n");
/* Initialize SLB management */ /* Initialize SLB management */
slb_initialize(); slb_initialize();

6
arch/powerpc/mm/tlb_nohash.c
View file

@ -800,5 +800,11 @@ void __init early_init_mmu(void)
#ifdef CONFIG_PPC_47x #ifdef CONFIG_PPC_47x
early_init_mmu_47x(); early_init_mmu_47x();
#endif #endif
#ifdef CONFIG_PPC_MM_SLICES
#if defined(CONFIG_PPC_8xx)
init_mm.context.slb_addr_limit = DEFAULT_MAP_WINDOW;
#endif
#endif
} }
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */