MIPS: c-r4k: Split r4k_flush_kernel_vmap_range() (a9341ae2) · Commits · 戴 / test

Split the operation of r4k_flush_kernel_vmap_range() into separate SMP callbacks for the indexed cache flush and hit cache flush cases, since the logic to determine which to use can be determined by the initiating CPU prior to doing any SMP calls. This will help when we change r4k_on_each_cpu() to distinguish indexed and hit cache ops in a later patch, preventing globalized hit cache ops being performed redundantly on multiple CPUs. Signed-off-by:

James Hogan <james.hogan@imgtec.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: Leonid Yegoshin <leonid.yegoshin@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/13806/ Signed-off-by:

Ralf Baechle <ralf@linux-mips.org>

arch/mips/mm/c-r4k.c

+17 −8

Original line number	Diff line number	Diff line
		@@ -978,6 +978,15 @@ struct flush_kernel_vmap_range_args {
		int size;
		};

		static inline void local_r4k_flush_kernel_vmap_range_index(void *args)
		{
		/*
		* Aliases only affect the primary caches so don't bother with
		* S-caches or T-caches.
		*/
		r4k_blast_dcache();
		}

		static inline void local_r4k_flush_kernel_vmap_range(void *args)
		{
		struct flush_kernel_vmap_range_args *vmra = args;
		@@ -988,13 +997,9 @@ static inline void local_r4k_flush_kernel_vmap_range(void *args)
		* Aliases only affect the primary caches so don't bother with
		* S-caches or T-caches.
		*/
		if (size >= dcache_size)
		r4k_blast_dcache();
		else {
		R4600_HIT_CACHEOP_WAR_IMPL;
		blast_dcache_range(vaddr, vaddr + size);
		}
		}

		static void r4k_flush_kernel_vmap_range(unsigned long vaddr, int size)
		{
		@@ -1003,7 +1008,11 @@ static void r4k_flush_kernel_vmap_range(unsigned long vaddr, int size)
		args.vaddr = (unsigned long) vaddr;
		args.size = size;

		r4k_on_each_cpu(R4K_HIT \| R4K_INDEX, local_r4k_flush_kernel_vmap_range,
		if (size >= dcache_size)
		r4k_on_each_cpu(R4K_INDEX,
		local_r4k_flush_kernel_vmap_range_index, NULL);
		else
		r4k_on_each_cpu(R4K_HIT, local_r4k_flush_kernel_vmap_range,
		&args);
		}

Admin message