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

Commit a9d244a2 authored by Matt Fleming's avatar Matt Fleming Committed by Paul Mundt
Browse files

sh: Account for cache aliases in flush_icache_range() 



The icache may also contain aliases so we must account for them just
like we do when manipulating the dcache. We usually get away with
aliases in the icache because the instructions that are read from memory
are read-only, i.e. they never change. However, the place where this
bites us is when the code has been modified.

Signed-off-by: default avatarMatt Fleming <matt@console-pimps.org>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 421b5411

arch/sh/mm/cache-sh4.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -72,6 +72,7 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args) 




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

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

		unsigned long icacheaddr;

		unsigned long icacheaddr;

		int j, n;





		__ocbwb(v);

		__ocbwb(v);
@@ -79,8 +80,10 @@ static void __uses_jump_to_uncached sh4_flush_icache_range(void *args) 
				cpu_data->icache.entry_mask);

				cpu_data->icache.entry_mask);





		/* Clear i-cache line valid-bit */

		/* Clear i-cache line valid-bit */

		n = boot_cpu_data.icache.n_aliases;

		for (i = 0; i < cpu_data->icache.ways; i++) {

		for (i = 0; i < cpu_data->icache.ways; i++) {

			__raw_writel(0, icacheaddr);

			for (j = 0; j < n; j++)

				__raw_writel(0, icacheaddr + (j * PAGE_SIZE));

			icacheaddr += cpu_data->icache.way_incr;

			icacheaddr += cpu_data->icache.way_incr;

		}

		}

	}

	}