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

Commit 81742527 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Split out SH-4 __flush_xxx_region() ops. 



This splits out the SH-4 __flush_xxx_region() functions and defines them
as weak symbols. This allows us to provide optimized versions without
having to ifdef cache-sh4.c to death.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d14d751f

arch/sh/mm/Makefile_32

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ifndef CONFIG_CACHE_OFF 
cache-$(CONFIG_CPU_SH2)		:= cache-sh2.o

cache-$(CONFIG_CPU_SH2A)	:= cache-sh2a.o

cache-$(CONFIG_CPU_SH3)		:= cache-sh3.o

cache-$(CONFIG_CPU_SH4)		:= cache-sh4.o

cache-$(CONFIG_CPU_SH4)		:= cache-sh4.o flush-sh4.o

cache-$(CONFIG_SH7705_CACHE_32KB)	+= cache-sh7705.o

endif

arch/sh/mm/cache-sh4.c

+0 −60
Original line number Diff line number Diff line
@@ -118,66 +118,6 @@ void __init p3_cache_init(void) 
	emit_cache_params();

}



/*

 * Write back the dirty D-caches, but not invalidate them.

 *

 * START: Virtual Address (U0, P1, or P3)

 * SIZE: Size of the region.

 */

void __flush_wback_region(void *start, int size)

{

	unsigned long v;

	unsigned long begin, end;



	begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);

	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)

		& ~(L1_CACHE_BYTES-1);

	for (v = begin; v < end; v+=L1_CACHE_BYTES) {

		asm volatile("ocbwb	%0"

			     : /* no output */

			     : "m" (__m(v)));

	}

}



/*

 * Write back the dirty D-caches and invalidate them.

 *

 * START: Virtual Address (U0, P1, or P3)

 * SIZE: Size of the region.

 */

void __flush_purge_region(void *start, int size)

{

	unsigned long v;

	unsigned long begin, end;



	begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);

	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)

		& ~(L1_CACHE_BYTES-1);

	for (v = begin; v < end; v+=L1_CACHE_BYTES) {

		asm volatile("ocbp	%0"

			     : /* no output */

			     : "m" (__m(v)));

	}

}



/*

 * No write back please

 */

void __flush_invalidate_region(void *start, int size)

{

	unsigned long v;

	unsigned long begin, end;



	begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);

	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)

		& ~(L1_CACHE_BYTES-1);

	for (v = begin; v < end; v+=L1_CACHE_BYTES) {

		asm volatile("ocbi	%0"

			     : /* no output */

			     : "m" (__m(v)));

	}

}



/*

 * Write back the range of D-cache, and purge the I-cache.

 *

arch/sh/mm/flush-sh4.c

0 → 100644
+63 −0
Original line number Diff line number Diff line 
#include <linux/mm.h>

#include <asm/mmu_context.h>

#include <asm/cacheflush.h>



/*

 * Write back the dirty D-caches, but not invalidate them.

 *

 * START: Virtual Address (U0, P1, or P3)

 * SIZE: Size of the region.

 */

void __weak __flush_wback_region(void *start, int size)

{

	unsigned long v;

	unsigned long begin, end;



	begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);

	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)

		& ~(L1_CACHE_BYTES-1);

	for (v = begin; v < end; v+=L1_CACHE_BYTES) {

		asm volatile("ocbwb	%0"

			     : /* no output */

			     : "m" (__m(v)));

	}

}



/*

 * Write back the dirty D-caches and invalidate them.

 *

 * START: Virtual Address (U0, P1, or P3)

 * SIZE: Size of the region.

 */

void __weak __flush_purge_region(void *start, int size)

{

	unsigned long v;

	unsigned long begin, end;



	begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);

	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)

		& ~(L1_CACHE_BYTES-1);

	for (v = begin; v < end; v+=L1_CACHE_BYTES) {

		asm volatile("ocbp	%0"

			     : /* no output */

			     : "m" (__m(v)));

	}

}



/*

 * No write back please

 */

void __weak __flush_invalidate_region(void *start, int size)

{

	unsigned long v;

	unsigned long begin, end;



	begin = (unsigned long)start & ~(L1_CACHE_BYTES-1);

	end = ((unsigned long)start + size + L1_CACHE_BYTES-1)

		& ~(L1_CACHE_BYTES-1);

	for (v = begin; v < end; v+=L1_CACHE_BYTES) {

		asm volatile("ocbi	%0"

			     : /* no output */

			     : "m" (__m(v)));

	}

}