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

Commit 5d83d666 authored by David S. Miller's avatar David S. Miller
Browse files

sparc32: Move cache and TLB flushes over to method ops. 



This eliminated most of the remaining users of btfixup.

There are some complications because of the special cases we
have for sun4d, leon, and some flavors of viking.

It was found that there are no cases where a flush_page_for_dma
method was not hooked up to something, so the "noflush" iommu
methods were removed.

Add some documentation to the viking_sun4d_smp_ops to describe exactly
the hardware bug which causes us to need special TLB flushing on
sun4d.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b25e74b1

arch/sparc/include/asm/cacheflush_32.h

+18 −55
Original line number Diff line number Diff line 
#ifndef _SPARC_CACHEFLUSH_H

#define _SPARC_CACHEFLUSH_H



#include <linux/mm.h>		/* Common for other includes */

// #include <linux/kernel.h> from pgalloc.h

// #include <linux/sched.h>  from pgalloc.h



// #include <asm/page.h>

#include <asm/btfixup.h>



/*

 * Fine grained cache flushing.

 */

#ifdef CONFIG_SMP



BTFIXUPDEF_CALL(void, local_flush_cache_all, void)

BTFIXUPDEF_CALL(void, local_flush_cache_mm, struct mm_struct *)

BTFIXUPDEF_CALL(void, local_flush_cache_range, struct vm_area_struct *, unsigned long, unsigned long)

BTFIXUPDEF_CALL(void, local_flush_cache_page, struct vm_area_struct *, unsigned long)



#define local_flush_cache_all() BTFIXUP_CALL(local_flush_cache_all)()

#define local_flush_cache_mm(mm) BTFIXUP_CALL(local_flush_cache_mm)(mm)

#define local_flush_cache_range(vma,start,end) BTFIXUP_CALL(local_flush_cache_range)(vma,start,end)

#define local_flush_cache_page(vma,addr) BTFIXUP_CALL(local_flush_cache_page)(vma,addr)



BTFIXUPDEF_CALL(void, local_flush_page_to_ram, unsigned long)

BTFIXUPDEF_CALL(void, local_flush_sig_insns, struct mm_struct *, unsigned long)



#define local_flush_page_to_ram(addr) BTFIXUP_CALL(local_flush_page_to_ram)(addr)

#define local_flush_sig_insns(mm,insn_addr) BTFIXUP_CALL(local_flush_sig_insns)(mm,insn_addr)



extern void smp_flush_cache_all(void);

extern void smp_flush_cache_mm(struct mm_struct *mm);

extern void smp_flush_cache_range(struct vm_area_struct *vma,

				  unsigned long start,

				  unsigned long end);

extern void smp_flush_cache_page(struct vm_area_struct *vma, unsigned long page);



extern void smp_flush_page_to_ram(unsigned long page);

extern void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr);



#endif /* CONFIG_SMP */



BTFIXUPDEF_CALL(void, flush_cache_all, void)

BTFIXUPDEF_CALL(void, flush_cache_mm, struct mm_struct *)

BTFIXUPDEF_CALL(void, flush_cache_range, struct vm_area_struct *, unsigned long, unsigned long)

BTFIXUPDEF_CALL(void, flush_cache_page, struct vm_area_struct *, unsigned long)



#define flush_cache_all() BTFIXUP_CALL(flush_cache_all)()

#define flush_cache_mm(mm) BTFIXUP_CALL(flush_cache_mm)(mm)

#define flush_cache_dup_mm(mm) BTFIXUP_CALL(flush_cache_mm)(mm)

#define flush_cache_range(vma,start,end) BTFIXUP_CALL(flush_cache_range)(vma,start,end)

#define flush_cache_page(vma,addr,pfn) BTFIXUP_CALL(flush_cache_page)(vma,addr)

#include <asm/cachetlb_32.h>



#define flush_cache_all() \

	sparc32_cachetlb_ops->cache_all()

#define flush_cache_mm(mm) \

	sparc32_cachetlb_ops->cache_mm(mm)

#define flush_cache_dup_mm(mm) \

	sparc32_cachetlb_ops->cache_mm(mm)

#define flush_cache_range(vma,start,end) \

	sparc32_cachetlb_ops->cache_range(vma, start, end)

#define flush_cache_page(vma,addr,pfn) \

	sparc32_cachetlb_ops->cache_page(vma, addr)

#define flush_icache_range(start, end)		do { } while (0)

#define flush_icache_page(vma, pg)		do { } while (0)
@@ -67,11 +29,12 @@ BTFIXUPDEF_CALL(void, flush_cache_page, struct vm_area_struct *, unsigned long) 
		memcpy(dst, src, len);				\

	} while (0)



BTFIXUPDEF_CALL(void, __flush_page_to_ram, unsigned long)

BTFIXUPDEF_CALL(void, flush_sig_insns, struct mm_struct *, unsigned long)



#define __flush_page_to_ram(addr) BTFIXUP_CALL(__flush_page_to_ram)(addr)

#define flush_sig_insns(mm,insn_addr) BTFIXUP_CALL(flush_sig_insns)(mm,insn_addr)

#define __flush_page_to_ram(addr) \

	sparc32_cachetlb_ops->page_to_ram(addr)

#define flush_sig_insns(mm,insn_addr) \

	sparc32_cachetlb_ops->sig_insns(mm, insn_addr)

#define flush_page_for_dma(addr) \

	sparc32_cachetlb_ops->page_for_dma(addr)



extern void sparc_flush_page_to_ram(struct page *page);

arch/sparc/include/asm/cachetlb_32.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
#ifndef _SPARC_CACHETLB_H

#define _SPARC_CACHETLB_H



struct mm_struct;

struct vm_area_struct;



struct sparc32_cachetlb_ops {

	void (*cache_all)(void);

	void (*cache_mm)(struct mm_struct *);

	void (*cache_range)(struct vm_area_struct *, unsigned long,

			    unsigned long);

	void (*cache_page)(struct vm_area_struct *, unsigned long);



	void (*tlb_all)(void);

	void (*tlb_mm)(struct mm_struct *);

	void (*tlb_range)(struct vm_area_struct *, unsigned long,

			  unsigned long);

	void (*tlb_page)(struct vm_area_struct *, unsigned long);



	void (*page_to_ram)(unsigned long);

	void (*sig_insns)(struct mm_struct *, unsigned long);

	void (*page_for_dma)(unsigned long);

};

extern const struct sparc32_cachetlb_ops *sparc32_cachetlb_ops;

#ifdef CONFIG_SMP

extern const struct sparc32_cachetlb_ops *local_ops;

#endif



#endif /* SPARC_CACHETLB_H */

arch/sparc/include/asm/tlbflush_32.h

+10 −46
Original line number Diff line number Diff line 
#ifndef _SPARC_TLBFLUSH_H

#define _SPARC_TLBFLUSH_H



#include <linux/mm.h>

// #include <asm/processor.h>



/*

 * TLB flushing:

 *

 *  - flush_tlb() flushes the current mm struct TLBs	XXX Exists?

 *  - flush_tlb_all() flushes all processes TLBs

 *  - flush_tlb_mm(mm) flushes the specified mm context TLB's

 *  - flush_tlb_page(vma, vmaddr) flushes one page

 *  - flush_tlb_range(vma, start, end) flushes a range of pages

 *  - flush_tlb_kernel_range(start, end) flushes a range of kernel pages

 */



#ifdef CONFIG_SMP



BTFIXUPDEF_CALL(void, local_flush_tlb_all, void)

BTFIXUPDEF_CALL(void, local_flush_tlb_mm, struct mm_struct *)

BTFIXUPDEF_CALL(void, local_flush_tlb_range, struct vm_area_struct *, unsigned long, unsigned long)

BTFIXUPDEF_CALL(void, local_flush_tlb_page, struct vm_area_struct *, unsigned long)



#define local_flush_tlb_all() BTFIXUP_CALL(local_flush_tlb_all)()

#define local_flush_tlb_mm(mm) BTFIXUP_CALL(local_flush_tlb_mm)(mm)

#define local_flush_tlb_range(vma,start,end) BTFIXUP_CALL(local_flush_tlb_range)(vma,start,end)

#define local_flush_tlb_page(vma,addr) BTFIXUP_CALL(local_flush_tlb_page)(vma,addr)



extern void smp_flush_tlb_all(void);

extern void smp_flush_tlb_mm(struct mm_struct *mm);

extern void smp_flush_tlb_range(struct vm_area_struct *vma,

				  unsigned long start,

				  unsigned long end);

extern void smp_flush_tlb_page(struct vm_area_struct *mm, unsigned long page);



#endif /* CONFIG_SMP */



BTFIXUPDEF_CALL(void, flush_tlb_all, void)

BTFIXUPDEF_CALL(void, flush_tlb_mm, struct mm_struct *)

BTFIXUPDEF_CALL(void, flush_tlb_range, struct vm_area_struct *, unsigned long, unsigned long)

BTFIXUPDEF_CALL(void, flush_tlb_page, struct vm_area_struct *, unsigned long)



#define flush_tlb_all() BTFIXUP_CALL(flush_tlb_all)()

#define flush_tlb_mm(mm) BTFIXUP_CALL(flush_tlb_mm)(mm)

#define flush_tlb_range(vma,start,end) BTFIXUP_CALL(flush_tlb_range)(vma,start,end)

#define flush_tlb_page(vma,addr) BTFIXUP_CALL(flush_tlb_page)(vma,addr)



// #define flush_tlb() flush_tlb_mm(current->active_mm)	/* XXX Sure? */

#include <asm/cachetlb_32.h>



#define flush_tlb_all() \

	sparc32_cachetlb_ops->tlb_all()

#define flush_tlb_mm(mm) \

	sparc32_cachetlb_ops->tlb_mm(mm)

#define flush_tlb_range(vma, start, end) \

	sparc32_cachetlb_ops->tlb_range(vma, start, end)

#define flush_tlb_page(vma, addr) \

	sparc32_cachetlb_ops->tlb_page(vma, addr)



/*

 * This is a kludge, until I know better. --zaitcev XXX

arch/sparc/kernel/leon_kernel.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ void __init leon_init_timers(void) 
		 */

		local_irq_save(flags);

		patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */

		local_flush_cache_all();

		local_ops->cache_all();

		local_irq_restore(flags);

	}

#endif

arch/sparc/kernel/leon_smp.c

+13 −13
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ void __cpuinit leon_callin(void) 
{

	int cpuid = hard_smpleon_processor_id();



	local_flush_cache_all();

	local_flush_tlb_all();

	local_ops->cache_all();

	local_ops->tlb_all();

	leon_configure_cache_smp();



	notify_cpu_starting(cpuid);
@@ -87,8 +87,8 @@ void __cpuinit leon_callin(void) 
	calibrate_delay();

	smp_store_cpu_info(cpuid);



	local_flush_cache_all();

	local_flush_tlb_all();

	local_ops->cache_all();

	local_ops->tlb_all();



	/*

	 * Unblock the master CPU _only_ when the scheduler state
@@ -99,8 +99,8 @@ void __cpuinit leon_callin(void) 
	 */

	do_swap(&cpu_callin_map[cpuid], 1);



	local_flush_cache_all();

	local_flush_tlb_all();

	local_ops->cache_all();

	local_ops->tlb_all();



	/* Fix idle thread fields. */

	__asm__ __volatile__("ld [%0], %%g6\n\t" : : "r"(&current_set[cpuid])
@@ -143,8 +143,8 @@ void __init leon_configure_cache_smp(void) 
		}

	}



	local_flush_cache_all();

	local_flush_tlb_all();

	local_ops->cache_all();

	local_ops->tlb_all();

}



void leon_smp_setbroadcast(unsigned int mask)
@@ -199,7 +199,7 @@ void __init leon_boot_cpus(void) 
	leon_smp_setbroadcast(1 << LEON3_IRQ_TICKER);



	leon_configure_cache_smp();

	local_flush_cache_all();

	local_ops->cache_all();



}
@@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i) 
	/* whirrr, whirrr, whirrrrrrrrr... */

	printk(KERN_INFO "Starting CPU %d : (irqmp: 0x%x)\n", (unsigned int)i,

	       (unsigned int)&leon3_irqctrl_regs->mpstatus);

	local_flush_cache_all();

	local_ops->cache_all();



	/* Make sure all IRQs are of from the start for this new CPU */

	LEON_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[i], 0);
@@ -251,7 +251,7 @@ int __cpuinit leon_boot_one_cpu(int i) 
		leon_enable_irq_cpu(leon_ipi_irq, i);

	}



	local_flush_cache_all();

	local_ops->cache_all();

	return 0;

}
@@ -271,7 +271,7 @@ void __init leon_smp_done(void) 
		}

	}

	*prev = first;

	local_flush_cache_all();

	local_ops->cache_all();



	/* Free unneeded trap tables */

	if (!cpu_present(1)) {
@@ -337,7 +337,7 @@ static void __init leon_ipi_init(void) 
	local_irq_save(flags);

	trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (leon_ipi_irq - 1)];

	trap_table->inst_three += smpleon_ipi - real_irq_entry;

	local_flush_cache_all();

	local_ops->cache_all();

	local_irq_restore(flags);



	for_each_possible_cpu(cpu) {