Commit 1408fca0 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Make slice specific to book3s/64 



Since commit 555904d0 ("powerpc/8xx: MM_SLICE is not needed
anymore") only book3s/64 selects CONFIG_PPC_MM_SLICES.

Move slice.c into mm/book3s64/

Move necessary stuff in asm/book3s/64/slice.h and
remove asm/slice.h

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/4a0d74ef1966a5902b5fd4ac4b513a760a6d675a.1649523076.git.christophe.leroy@csgroup.eu
parent 93ea9102

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * complete pgtable.h but only a portion of it.

 */

#include <asm/book3s/64/pgtable.h>

#include <asm/book3s/64/slice.h>

#include <asm/task_size_64.h>

#include <asm/cpu_has_feature.h>

arch/powerpc/include/asm/book3s/64/slice.h

+18 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H

#define _ASM_POWERPC_BOOK3S_64_SLICE_H



#ifndef __ASSEMBLY__



#define SLICE_LOW_SHIFT		28

#define SLICE_LOW_TOP		(0x100000000ul)

#define SLICE_NUM_LOW		(SLICE_LOW_TOP >> SLICE_LOW_SHIFT)
@@ -13,4 +15,20 @@ 


#define SLB_ADDR_LIMIT_DEFAULT	DEFAULT_MAP_WINDOW_USER64



struct mm_struct;



unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,

				      unsigned long flags, unsigned int psize,

				      int topdown);



unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr);



void slice_set_range_psize(struct mm_struct *mm, unsigned long start,

			   unsigned long len, unsigned int psize);



void slice_init_new_context_exec(struct mm_struct *mm);

void slice_setup_new_exec(void);



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */

arch/powerpc/include/asm/page.h

+0 −1
Original line number Diff line number Diff line
@@ -333,6 +333,5 @@ static inline unsigned long kaslr_offset(void) 


#include <asm-generic/memory_model.h>

#endif /* __ASSEMBLY__ */

#include <asm/slice.h>



#endif /* _ASM_POWERPC_PAGE_H */

arch/powerpc/include/asm/slice.h

deleted100644 → 0
+0 −46
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_POWERPC_SLICE_H

#define _ASM_POWERPC_SLICE_H



#ifdef CONFIG_PPC_BOOK3S_64

#include <asm/book3s/64/slice.h>

#endif



#ifndef __ASSEMBLY__



struct mm_struct;



#ifdef CONFIG_PPC_MM_SLICES



#ifdef CONFIG_HUGETLB_PAGE

#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA

#endif

#define HAVE_ARCH_UNMAPPED_AREA

#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN



unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,

				      unsigned long flags, unsigned int psize,

				      int topdown);



unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr);



void slice_set_range_psize(struct mm_struct *mm, unsigned long start,

			   unsigned long len, unsigned int psize);



void slice_init_new_context_exec(struct mm_struct *mm);

void slice_setup_new_exec(void);



#else /* CONFIG_PPC_MM_SLICES */



static inline void slice_init_new_context_exec(struct mm_struct *mm) {}



static inline unsigned int get_slice_psize(struct mm_struct *mm, unsigned long addr)

{

	return 0;

}



#endif /* CONFIG_PPC_MM_SLICES */



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_SLICE_H */

arch/powerpc/mm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_PPC_MMU_NOHASH) += nohash/ 
obj-$(CONFIG_PPC_BOOK3S_32)	+= book3s32/

obj-$(CONFIG_PPC_BOOK3S_64)	+= book3s64/

obj-$(CONFIG_NUMA) += numa.o

obj-$(CONFIG_PPC_MM_SLICES)	+= slice.o

obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o

obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o

obj-$(CONFIG_PPC_COPRO_BASE)	+= copro_fault.o