Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be3ebfe8 authored by Ian Munsie's avatar Ian Munsie Committed by Michael Ellerman
Browse files

powerpc/cell: Make spu_flush_all_slbs() generic 



This moves spu_flush_all_slbs() into a generic call copro_flush_all_slbs().

This will be useful when we add cxl which also needs a similar SLB flush call.

Signed-off-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 73d16a6e

arch/powerpc/include/asm/copro.h

+6 −0
Original line number Diff line number Diff line
@@ -20,4 +20,10 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea, 


int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb);





#ifdef CONFIG_PPC_COPRO_BASE

void copro_flush_all_slbs(struct mm_struct *mm);

#else

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

#endif

#endif /* _ASM_POWERPC_COPRO_H */

arch/powerpc/mm/copro_fault.c

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/export.h>

#include <asm/reg.h>

#include <asm/copro.h>

#include <asm/spu.h>



/*

 * This ought to be kept in sync with the powerpc specific do_page_fault
@@ -136,3 +137,11 @@ int copro_calculate_slb(struct mm_struct *mm, u64 ea, struct copro_slb *slb) 
	return 0;

}

EXPORT_SYMBOL_GPL(copro_calculate_slb);



void copro_flush_all_slbs(struct mm_struct *mm)

{

#ifdef CONFIG_SPU_BASE

	spu_flush_all_slbs(mm);

#endif

}

EXPORT_SYMBOL_GPL(copro_flush_all_slbs);

arch/powerpc/mm/hash_utils_64.c

+3 −7
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#include <asm/cacheflush.h>

#include <asm/cputable.h>

#include <asm/sections.h>

#include <asm/spu.h>

#include <asm/copro.h>

#include <asm/udbg.h>

#include <asm/code-patching.h>

#include <asm/fadump.h>
@@ -901,9 +901,7 @@ void demote_segment_4k(struct mm_struct *mm, unsigned long addr) 
	if (get_slice_psize(mm, addr) == MMU_PAGE_4K)

		return;

	slice_set_range_psize(mm, addr, 1, MMU_PAGE_4K);

#ifdef CONFIG_SPU_BASE

	spu_flush_all_slbs(mm);

#endif

	copro_flush_all_slbs(mm);

	if (get_paca_psize(addr) != MMU_PAGE_4K) {

		get_paca()->context = mm->context;

		slb_flush_and_rebolt();
@@ -1141,9 +1139,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) 
			       "to 4kB pages because of "

			       "non-cacheable mapping\n");

			psize = mmu_vmalloc_psize = MMU_PAGE_4K;

#ifdef CONFIG_SPU_BASE

			spu_flush_all_slbs(mm);

#endif

			copro_flush_all_slbs(mm);

		}

	}

arch/powerpc/mm/slice.c

+3 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/hugetlb.h>

#include <asm/mman.h>

#include <asm/mmu.h>

#include <asm/spu.h>

#include <asm/copro.h>

#include <asm/hugetlb.h>



/* some sanity checks */
@@ -234,9 +234,7 @@ static void slice_convert(struct mm_struct *mm, struct slice_mask mask, int psiz 


	spin_unlock_irqrestore(&slice_convert_lock, flags);



#ifdef CONFIG_SPU_BASE

	spu_flush_all_slbs(mm);

#endif

	copro_flush_all_slbs(mm);

}



/*
@@ -673,9 +671,7 @@ void slice_set_psize(struct mm_struct *mm, unsigned long address, 


	spin_unlock_irqrestore(&slice_convert_lock, flags);



#ifdef CONFIG_SPU_BASE

	spu_flush_all_slbs(mm);

#endif

	copro_flush_all_slbs(mm);

}



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