From: Konrad Eisele <konrad@xxxxxxxxxxx> >> +#if defined(CONFIG_LEON) >> + >> +extern void leon_flush_icache_all(void); >> +extern void leon_flush_dcache_all(void); >> +extern void leon_flush_pcache_all(struct vm_area_struct *vma, >> + unsigned long page); >> +extern void leon_flush_cache_all(void); >> +extern void leon_flush_tlb_all(void); >> +extern int leon_flush_during_switch ; >> +extern int leon_flush_needed(void); >> +extern void leon_flush_pcache_all(struct vm_area_struct *vma, >> + unsigned long page); >> + > This is not a .h file. The other cpu types like viking do it the same way. If I'd include the definitions in leon.h I'll also have to define struct vm_area_struct etc. That makes it ugly. I think in this case a exception can be made (viking etc also got it) sparc-leon specific SRMMU initialization and bootup fixes. The sparc-leon caches are virtually tagged so a flush is needed on ctx switch. --- arch/sparc/mm/srmmu.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 06c9a7d..0cf201b 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -46,6 +46,10 @@ #include <asm/tsunami.h> #include <asm/swift.h> #include <asm/turbosparc.h> +#ifdef CONFIG_SPARC_LEON +#include <asm/leon.h> +#endif + #include <asm/btfixup.h> enum mbus_module srmmu_modtype; @@ -568,6 +572,11 @@ static void srmmu_switch_mm(struct mm_st srmmu_ctxd_set(&srmmu_context_table[mm->context], mm->pgd); } +#ifdef CONFIG_SPARC_LEON + flush_tlb_mm(0); + if (leon_flush_during_switch) + leon_flush_cache_all(); +#endif if (is_hypersparc) hyper_flush_whole_icache(); @@ -1976,6 +1985,57 @@ #endif poke_srmmu = poke_viking; } +#ifdef CONFIG_SPARC_LEON + +extern void leon_flush_icache_all(void); +extern void leon_flush_dcache_all(void); +extern void leon_flush_pcache_all(struct vm_area_struct *vma, + unsigned long page); +extern void leon_flush_cache_all(void); +extern void leon_flush_tlb_all(void); +extern int leon_flush_during_switch ; +extern int leon_flush_needed(void); +extern void leon_flush_pcache_all(struct vm_area_struct *vma, + unsigned long page); + +void __init poke_leonsparc(void) +{ +} + +void __init init_leon(void) +{ + + srmmu_name = "Leon"; + + BTFIXUPSET_CALL(flush_cache_all, leon_flush_cache_all, + BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_cache_mm, leon_flush_cache_all, + BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_cache_page, leon_flush_pcache_all, + BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_cache_range, leon_flush_cache_all, + BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_page_for_dma, leon_flush_dcache_all, + BTFIXUPCALL_NORM); + + BTFIXUPSET_CALL(flush_tlb_all, leon_flush_tlb_all, BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_tlb_mm, leon_flush_tlb_all, BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_tlb_page, leon_flush_tlb_all, BTFIXUPCALL_NORM); + BTFIXUPSET_CALL(flush_tlb_range, leon_flush_tlb_all, BTFIXUPCALL_NORM); + + BTFIXUPSET_CALL(__flush_page_to_ram, leon_flush_cache_all, + BTFIXUPCALL_NOP); + BTFIXUPSET_CALL(flush_sig_insns, leon_flush_cache_all, BTFIXUPCALL_NOP); + + poke_srmmu = poke_leonsparc; + + srmmu_cache_pagetables = 0; + + leon_flush_during_switch = leon_flush_needed(); +} + +#endif + /* Probe for the srmmu chip version. */ static void __init get_srmmu_type(void) { @@ -1991,6 +2051,13 @@ static void __init get_srmmu_type(void) psr_typ = (psr >> 28) & 0xf; psr_vers = (psr >> 24) & 0xf; +#ifdef CONFIG_SPARC_LEON + psr_typ = 0xf; /* hardcoded ids for older models/simulators */ + psr_vers = 2; + init_leon(); + return; +#endif + /* First, check for HyperSparc or Cypress. */ if(mod_typ == 1) { switch(mod_rev) { -- 1.4.2.1 -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html