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

Commit 2f0b1926 authored by Russell King's avatar Russell King
Browse files

ARM: Avoid duplicated implementation for VIVT cache flushing 



We had two copies of the wrapper code for VIVT cache flushing - one in
asm/cacheflush.h and one in arch/arm/mm/flush.c.  Reduce this down to
one common copy.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 29e55363

arch/arm/include/asm/cacheflush.h

+15 −5
Original line number Diff line number Diff line
@@ -331,15 +331,15 @@ static inline void outer_flush_range(unsigned long start, unsigned long end) 
 * Convert calls to our calling convention.

 */

#define flush_cache_all()		__cpuc_flush_kern_all()

#ifndef CONFIG_CPU_CACHE_VIPT

static inline void flush_cache_mm(struct mm_struct *mm)



static inline void vivt_flush_cache_mm(struct mm_struct *mm)

{

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm)))

		__cpuc_flush_user_all();

}



static inline void

flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)

vivt_flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)

{

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)))

		__cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),
@@ -347,7 +347,7 @@ flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long 
}



static inline void

flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)

vivt_flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)

{

	if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {

		unsigned long addr = user_addr & PAGE_MASK;
@@ -356,7 +356,7 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned l 
}



static inline void

flush_ptrace_access(struct vm_area_struct *vma, struct page *page,

vivt_flush_ptrace_access(struct vm_area_struct *vma, struct page *page,

			 unsigned long uaddr, void *kaddr,

			 unsigned long len, int write)

{
@@ -365,6 +365,16 @@ flush_ptrace_access(struct vm_area_struct *vma, struct page *page, 
		__cpuc_coherent_kern_range(addr, addr + len);

	}

}



#ifndef CONFIG_CPU_CACHE_VIPT

#define flush_cache_mm(mm) \

		vivt_flush_cache_mm(mm)

#define flush_cache_range(vma,start,end) \

		vivt_flush_cache_range(vma,start,end)

#define flush_cache_page(vma,addr,pfn) \

		vivt_flush_cache_page(vma,addr,pfn)

#define flush_ptrace_access(vma,page,ua,ka,len,write) \

		vivt_flush_ptrace_access(vma,page,ua,ka,len,write)

#else

extern void flush_cache_mm(struct mm_struct *mm);

extern void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end);

arch/arm/mm/flush.c

+4 −13
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ static void flush_pfn_alias(unsigned long pfn, unsigned long vaddr) 
void flush_cache_mm(struct mm_struct *mm)

{

	if (cache_is_vivt()) {

		if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm)))

			__cpuc_flush_user_all();

		vivt_flush_cache_mm(mm);

		return;

	}
@@ -59,9 +58,7 @@ void flush_cache_mm(struct mm_struct *mm) 
void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)

{

	if (cache_is_vivt()) {

		if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm)))

			__cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),

						vma->vm_flags);

		vivt_flush_cache_range(vma, start, end);

		return;

	}
@@ -78,10 +75,7 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned 
void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)

{

	if (cache_is_vivt()) {

		if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {

			unsigned long addr = user_addr & PAGE_MASK;

			__cpuc_flush_user_range(addr, addr + PAGE_SIZE, vma->vm_flags);

		}

		vivt_flush_cache_page(vma, user_addr, pfn);

		return;

	}
@@ -94,10 +88,7 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page, 
			 unsigned long len, int write)

{

	if (cache_is_vivt()) {

		if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {

			unsigned long addr = (unsigned long)kaddr;

			__cpuc_coherent_kern_range(addr, addr + len);

		}

		vivt_flush_ptrace_access(vma, page, uaddr, kaddr, len, write);

		return;

	}