Hi Konrad. Several comments - see below. It is getting better. Sam On Fri, Jun 12, 2009 at 10:43:29AM +0200, konrad@xxxxxxxxxxx wrote: > From: Konrad Eisele <konrad@xxxxxxxxxxx> > > --- > arch/sparc/Kconfig | 6 + > arch/sparc/include/asm/leon.h | 577 +++++++++++++++++++++++++++++++++++++++ > arch/sparc/kernel/leon_kernel.c | 201 ++++++++++++++ > arch/sparc/mm/leon_mm.c | 262 ++++++++++++++++++ > 4 files changed, 1046 insertions(+), 0 deletions(-) > create mode 100644 arch/sparc/include/asm/leon.h > create mode 100644 arch/sparc/kernel/leon_kernel.c > create mode 100644 arch/sparc/mm/leon_mm.c > > diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig > index 2185cf9..cf621bf 100644 > --- a/arch/sparc/Kconfig > +++ b/arch/sparc/Kconfig > @@ -435,6 +435,12 @@ config SERIAL_CONSOLE > > If unsure, say N. > > +config SPARC_LEON > + bool "Sparc Leon processor family" > + depends on SPARC32 > + ---help--- > + If you say Y here if you are running on a SPARC-LEON processor. Please be much more verbose here. People may be curious what is this sparc-leon thing. It would be nice if the help entry could include: 1) What spac-leon is 2) where to find more info 3) maybe a pointer where to find a toolchain > new file mode 100644 > index 0000000..9bc721a > --- /dev/null > +++ b/arch/sparc/include/asm/leon.h > @@ -0,0 +1,577 @@ > +/* > +*Copyright (C) 2004 Konrad Eisele (eiselekd@xxxxxx, > +*konrad@xxxxxxxxxxx), Gaisler Research > +*Copyright (C) 2004 Stefan Holst (mail@xxxxxxxxxx), Uni-Stuttgart > +*Copyright (C) 2009 Daniel Hellstrom (daniel@xxxxxxxxxxx), > +*Konrad Eisele (konrad@xxxxxxxxxxx) Aeroflex Gaisler AB > +*/ Kernel documentation style is: /* * Copyright (C) 2004 Konrad Eisele (eiselekd@xxxxxx, konrad@xxxxxxxxxxx), Gaisler Research * Copyright (C) 2004 Stefan Holst (mail@xxxxxxxxxx), Uni-Stuttgart * Copyright (C) 2009 Daniel Hellstrom (daniel@xxxxxxxxxxx) * Copyright (C) 2009 Konrad Eisele (konrad@xxxxxxxxxxx) Aeroflex Gaisler AB */ > + > +#ifndef LEON_H_INCLUDE > +#define LEON_H_INCLUDE > + > +#ifdef CONFIG_SPARC_LEON > + > +#define CONFIG_LEON > +#define CONFIG_LEON_3 The CONFIG_* namespace are reserved for Kconfig - you need to find another name. > +#define SPARC_LEON_STATIC Please drop this. Either a function is static or not. > +#define LEON3_BYPASS_LOAD_PA(x) (leon_load_reg((unsigned long)(x))) > +#define LEON3_BYPASS_STORE_PA(x, v) (leon_store_reg((unsigned long)(x), (unsigned long)(v))) > +#define LEON3_BYPASS_ANDIN_PA(x, v) LEON3_BYPASS_STORE_PA(x, LEON3_BYPASS_LOAD_PA(x) & v) > +#define LEON3_BYPASS_ORIN_PA(x, v) LEON3_BYPASS_STORE_PA(x, LEON3_BYPASS_LOAD_PA(x) | v) > +#define LEON_BYPASS_LOAD_PA(x) leon_load_reg((unsigned long)(x)) > +#define LEON_BYPASSCACHE_LOAD_VA(x) leon_readnobuffer_reg((unsigned long)(x)) > +#define LEON_BYPASS_STORE_PA(x, v) leon_store_reg((unsigned long)(x), (unsigned long)(v)) > +#define LEON_REGLOAD_PA(x) leon_load_reg((unsigned long)(x)+LEON_PREGS) > +#define LEON_REGSTORE_PA(x, v) leon_store_reg((unsigned long)(x)+LEON_PREGS, (unsigned long)(v)) > +#define LEON_REGSTORE_OR_PA(x, v) LEON_REGSTORE_PA(x, LEON_REGLOAD_PA(x) | (unsigned long)(v)) > +#define LEON_REGSTORE_AND_PA(x, v) LEON_REGSTORE_PA(x, LEON_REGLOAD_PA(x) & (unsigned long)(v)) Please consider dropping this macro obscufation. Either inline function or open code this. Some of the above macros are not even used - at least not in this patch. Drop the ones that are not used at all. > + > +#define HARDDBG_PRINTF(fmt, arg...) do { \ > + char b[1000]; \ > + sprintf(b, fmt, ## arg); \ > + console_print_LEON(b); } while (0) > +#define HARDDBG_FUNC \ > + HARDDBG_PRINTF("[->%03d @ %22s()]:\n" , __LINE__, __func__); > +#define HARDDBG_FUNCOUT \ > + HARDDBG_PRINTF("[<-%03d @ %22s()]:\n" , __LINE__, __func__); > +#define HARDDBG_OUT(fmt, arg...) \ > + HARDDBG_PRINTF("[->%03d @ %22s()]:" fmt , __LINE__, __func__, ## arg); > + > +void console_print_LEON(const char *p); > + The above are not used - drop it. > +#endif /* !ASM */ It is spelled __ASSEMBLY__ > +#ifndef __ASSEMBLER__ > + > +struct amba_prom_registers { > + unsigned int phys_addr; /* The physical address of this register */ > + unsigned int reg_size; /* How many bytes does this register take up? */ > +}; Consider moving the leon amba specific stuff to leon_amba.h to have the bus specific stuff in one place. > + > +struct leon3_IrqCtrl_Regs_Map { > + u32 ilevel; > + u32 ipend; > + u32 iforce; > + u32 iclear; > + u32 mpstatus; > + u32 mpbroadcast; > + u32 notused02; > + u32 notused03; > + u32 notused10; > + u32 notused11; > + u32 notused12; > + u32 notused13; > + u32 notused20; > + u32 notused21; > + u32 notused22; > + u32 notused23; > + u32 mask[16]; > + u32 force[16]; > + /* Extended IRQ registers */ > + u32 intid[16]; /* 0xc0 */ > +} ; You are still using MixedCasing for your structs - please use small caps. > + > +struct leon3_APBUART_Regs_Map { > + u32 data; > + u32 status; > + u32 ctrl; > + u32 scaler; > +} ; Small caps. > + > +struct leon3_GpTimerElem_Regs_Map { > + u32 val; > + u32 rld; > + u32 ctrl; > + u32 unused; > +} ; Small caps. > + > +struct leon3_GpTimer_Regs_Map { > + u32 scalar; > + u32 scalar_reload; > + u32 config; > + u32 unused; > + struct leon3_GpTimerElem_Regs_Map e[8]; > +}; Small caps. > + > +#define GPTIMER_CONFIG_IRQNT(a) (((a) >> 3) & 0x1f) > +#define GPTIMER_CONFIG_ISSEP(a) ((a) & (1 << 8)) > +#define GPTIMER_CONFIG_NTIMERS(a) ((a) & (0x7)) > +#define LEON3_GPTIMER_CTRL_PENDING 0x10 > +#define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7) > +#define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0) > + > +/* > + * Types and structure used for AMBA Plug & Play bus scanning > + */ > + > +#define AMBA_MAXAPB_DEVS 64 > +#define AMBA_MAXAPB_DEVS_PERBUS 16 > + > +struct amba_device_table { > + int devnr; /* number of devices on AHB or APB bus */ > + /* addresses to the devices configuration tables */ > + unsigned int *addr[16]; > + /* 0=unallocated, 1=allocated driver */ > + unsigned int allocbits[1]; > +}; Consider: struct amba_device_table { int devnr; /* number of devices on AHB or APB bus */ unsigned int *addr[16]; /* addresses to the devices configuration tables */ unsigned int allocbits[1]; /* 0=unallocated, 1=allocated driver */ }; This comments apply for several structs - I will not repeat. > + > +struct amba_apbslv_device_table { > + int devnr; /* number of devices on AHB or APB bus */ > + /* addresses to the devices configuration tables */ > + unsigned int *addr[AMBA_MAXAPB_DEVS]; > + /* apb master if a entry is a apb slave */ > + unsigned int apbmst[AMBA_MAXAPB_DEVS]; > + /* apb master idx if a entry is a apb slave */ > + unsigned int apbmstidx[AMBA_MAXAPB_DEVS]; > + unsigned int allocbits[4];/* 0=unallocated, 1=allocated driver */ > +}; > + > +struct amba_confarea_type { > + struct amba_confarea_type *next;/* next bus in chain */ > + struct amba_device_table ahbmst; > + struct amba_device_table ahbslv; > + struct amba_apbslv_device_table apbslv; > + unsigned int apbmst; > +}; > + > +/* collect apb slaves */ > +struct amba_apb_device { > + unsigned int start, irq, bus_id; > + struct amba_confarea_type *bus; > +}; > + > +/* collect ahb slaves */ > +struct amba_ahb_device { > + unsigned int start[4], irq, bus_id; > + struct amba_confarea_type *bus; > +}; > + > +extern void sparc_leon_eirq_register(int eirq); > +extern void leon_init(void) ; > +extern void leon_switch_mm(void) ; > + > + > +#if defined(CONFIG_SMP) > +# define LEON3_IRQ_RESCHEDULE 13 > +# define LEON3_IRQ_TICKER (leon_percpu_timer_dev[0].irq) > +# define LEON3_IRQ_CROSS_CALL 15 > +#endif > + > +#define ASI_LEON3_SYSCTRL 0x02 > +#define ASI_LEON3_SYSCTRL_ICFG 0x08 > +#define ASI_LEON3_SYSCTRL_DCFG 0x0c > +#define ASI_LEON3_SYSCTRL_CFG_SNOOPING (1 << 27) > +#define ASI_LEON3_SYSCTRL_CFG_SSIZE(c) (1 << ((c >> 20) & 0xf)) > + > +extern inline unsigned long sparc_leon3_get_dcachecfg(void) > +{ > + unsigned int retval; > + __asm__ __volatile__("lda [%1] %2, %0\n\t" : > + "=r"(retval) : > + "r"(ASI_LEON3_SYSCTRL_DCFG), > + "i"(ASI_LEON3_SYSCTRL)); > + return retval; > +} > + > +/*enable snooping*/ /* enable snooping */ > +extern inline void sparc_leon3_enable_snooping(void) > +{ > + __asm__ __volatile__ ("lda [%%g0] 2, %%l1\n\t" > + "set 0x800000, %%l2\n\t" > + "or %%l2, %%l1, %%l2\n\t" > + "sta %%l2, [%%g0] 2\n\t" : : : "l1", "l2"); > +}; > + > +extern inline void sparc_leon3_disable_cache(void) > +{ > + __asm__ __volatile__ ("lda [%%g0] 2, %%l1\n\t" > + "set 0x00000f, %%l2\n\t" > + "andn %%l2, %%l1, %%l2\n\t" > + "sta %%l2, [%%g0] 2\n\t" : : : "l1", "l2"); > +}; > + > +#endif /*!__ASSEMBLER__*/ > + > +#if defined(PAGE_SIZE_LEON_8K) > +#define CONFIG_PAGE_SIZE_LEON 1 > +#elif defined(PAGE_SIZE_LEON_16K) > +#define CONFIG_PAGE_SIZE_LEON 2) > +#else > +#define CONFIG_PAGE_SIZE_LEON 0 > +#endif > + Do not misuse CONFIG_* namespace > +/* struct that hold LEON3 cache configuration registers */ > +struct leon3_cacheregs { /* ASI=2 Address - name */ The comment about ASI=2 looks like it is out of context. > + unsigned long ccr; /* 0x00 - Cache Control Register */ > + /* 0x08 - Instruction Cache Configuration Register */ > + unsigned long iccr; > + unsigned long dccr; /* 0x0c - Data Cache Configuration Register */ > +}; > + > +/* struct that hold LEON2 cache configuration register > + & configuration register */ /* * struct that hold LEON2 cache configuration * register & configuration register */ > +struct leon2_cacheregs { > + unsigned long ccr, cfg; > +}; > + > +/* macros used in leon_m.c */ You renamed this file to a sensible name - so this comments needs an update. > +#define PFN(x) ((x) >> PAGE_SHIFT) > +#define _pfn_valid(pfn) ((pfn < last_valid_pfn) && (pfn >= PFN(phys_base))) > +#define _SRMMU_PTE_PMASK_LEON 0xffffffff > + > +#else /* defined(CONFIG_SPARC_LEON) */ > + > +#define SPARC_LEON_STATIC static > + > +#define leon_init() > +#define leon_switch_mm() > + > +#endif /* !defined(CONFIG_SPARC_LEON) */ > + > +#endif > diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c > new file mode 100644 > index 0000000..d26b29a > --- /dev/null > +++ b/arch/sparc/kernel/leon_kernel.c > @@ -0,0 +1,201 @@ > +/* Copyright (C) 2009 Daniel Hellstrom (daniel@xxxxxxxxxxx), > + Konrad Eisele (konrad@xxxxxxxxxxx) Aeroflex Gaisler AB */ Kernel comment style.. > + > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/errno.h> > +#include <linux/mutex.h> > +#include <linux/slab.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/interrupt.h> > +#include <linux/of_device.h> > +#include <asm/oplib.h> > +#include <asm/timer.h> > +#include <asm/prom.h> > +#include <asm/leon.h> > + > +#include "prom.h" > +#include "irq.h" > + > +struct leon3_IrqCtrl_Regs_Map *LEON3_IrqCtrl_Regs; /* interrupt controller base address, initialized by amba_init() */ > +struct leon3_GpTimer_Regs_Map *LEON3_GpTimer_Regs; /* timer controller base address, initialized by amba_init() */ > +struct amba_apb_device leon_percpu_timer_dev[16]; An empty lines please. And use small caps for variable names. I did not see any declaration - should the definition be static? > +#define LEON3_SMPTicker_Regs \ > + ((struct leon3_GpTimer_Regs_Map *)leon_percpu_timer_dev[0].start) Is this macro used? > +int leondebug_irq_disable; > +int leon_debug_irqout; > +static int dummy_master_l10_counter; > +extern void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp); > + > +unsigned long LEON3_GpTimer_Irq; /* interrupt controller irq number, initialized by amba_init() */ > +unsigned int sparc_leon_eirq; > +#define LEON_IMASK ((&LEON3_IrqCtrl_Regs->mask[0])) > + > +/* Return the IRQ of the pending IRQ on the extended IRQ controller */ > +int sparc_leon_eirq_get(int eirq, int cpu) > +{ > + return LEON3_BYPASS_LOAD_PA(&LEON3_IrqCtrl_Regs->intid[cpu]) & 0x1f; > +} > + > +irqreturn_t sparc_leon_eirq_isr(int dummy, void *dev_id) > +{ > + printk(KERN_ERR "sparc_leon_eirq_isr: ERROR EXTENDED IRQ\n"); > + return IRQ_HANDLED; > +} > + > +/* The extended IRQ controller has been found, this function registers it */ > +void sparc_leon_eirq_register(int eirq) > +{ > + int irq; > + > + /* Register a "BAD" handler for this interrupt, > + it should never happen */ kernel comment style. > + irq = request_irq(eirq, sparc_leon_eirq_isr, > + (IRQF_DISABLED | SA_STATIC_ALLOC), "extirq", NULL); > + > + if (irq) { > + printk(KERN_ERR > + "sparc_leon_eirq_register: unable to attach IRQ%d\n", > + eirq); > + } else { > + sparc_leon_eirq = eirq; > + } > + > +} > + > +static inline unsigned long get_irqmask(unsigned int irq) > +{ > + unsigned long mask; > + > + if (!irq || ((irq > 0xf) && !sparc_leon_eirq) > + || ((irq > 0x1f) && sparc_leon_eirq)) { > + printk(KERN_ERR > + "leon_get_irqmask: false irq number: %d\n", irq); > + mask = 0; > + } else { > + mask = LEON_HARD_INT(irq); > + } > + return mask; > +} > + > +static void leon_enable_irq(unsigned int irq_nr) > +{ > + unsigned long mask, flags; > + mask = get_irqmask(irq_nr); > + local_irq_save(flags); > + LEON3_BYPASS_STORE_PA(LEON_IMASK, > + (LEON3_BYPASS_LOAD_PA(LEON_IMASK) | (mask))); > + local_irq_restore(flags); > +} > + > +static void leon_disable_irq(unsigned int irq_nr) > +{ > + unsigned long mask, flags; > + mask = get_irqmask(irq_nr); > + local_irq_save(flags); > + LEON3_BYPASS_STORE_PA(LEON_IMASK, > + (LEON3_BYPASS_LOAD_PA(LEON_IMASK) & ~(mask))); > + local_irq_restore(flags); > + > +} > + > +void __init leon_init_timers(irq_handler_t counter_fn) > +{ > + int irq; > + > + leondebug_irq_disable = 0; > + leon_debug_irqout = 0; > + master_l10_counter = &dummy_master_l10_counter; > + dummy_master_l10_counter = 0; > + > + if (LEON3_GpTimer_Regs && LEON3_IrqCtrl_Regs) { > + LEON3_BYPASS_STORE_PA(&LEON3_GpTimer_Regs->e[0].val, 0); > + LEON3_BYPASS_STORE_PA(&LEON3_GpTimer_Regs->e[0].rld, > + (((1000000 / 100) - 1))); > + LEON3_BYPASS_STORE_PA(&LEON3_GpTimer_Regs->e[0].ctrl, 0); > + > + } else { > + while (1) > + printk(KERN_ERR "No Timer/irqctrl found\n"); BUG()? > + } > + > + irq = request_irq(LEON3_GpTimer_Irq, > + counter_fn, > + (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL); > + > + if (irq) { > + printk(KERN_ERR "leon_time_init: unable to attach IRQ%d\n", > + LEON_INTERRUPT_TIMER1); > + prom_halt(); > + } > + > + if (LEON3_GpTimer_Regs) { > + LEON3_BYPASS_STORE_PA(&LEON3_GpTimer_Regs->e[0].ctrl, > + LEON3_GPTIMER_EN | > + LEON3_GPTIMER_RL | > + LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN); > + } > +} > + > +void leon_clear_clock_irq(void) > +{ > +} > + > +void leon_load_profile_irq(int cpu, unsigned int limit) > +{ > + BUG(); > +} > + > +void _amba_init(struct device_node *dp, struct device_node ***nextp); This belongs in a header file (leon_amba.h?) > + > + > + > +void __init leon_trans_init(struct device_node *dp) > +{ > + if (strcmp(dp->type, "cpu") == 0 && strcmp(dp->name, "<NULL>") == 0) { > + struct property *p; > + p = of_find_property(dp, "mid", 0); > + if (p) { > + int mid; > + dp->name = prom_early_alloc(5 + 1); > + memcpy(&mid, p->value, p->length); > + sprintf((char *)dp->name, "cpu%.2d", mid); > + } > + } > +} > + > +void __init leon_node_init(struct device_node *dp, struct device_node ***nextp) > +{ > + if (strcmp(dp->type, "ambapp") == 0 && > + strcmp(dp->name, "ambapp0") == 0) { > + _amba_init(dp, nextp); > + } > +} > + > +void __init leon_init_IRQ(void) > +{ > + sparc_init_timers = leon_init_timers; > + > + BTFIXUPSET_CALL(enable_irq, leon_enable_irq, BTFIXUPCALL_NORM); > + BTFIXUPSET_CALL(disable_irq, leon_disable_irq, BTFIXUPCALL_NORM); > + BTFIXUPSET_CALL(enable_pil_irq, leon_enable_irq, BTFIXUPCALL_NORM); > + BTFIXUPSET_CALL(disable_pil_irq, leon_disable_irq, BTFIXUPCALL_NORM); > + > + BTFIXUPSET_CALL(clear_clock_irq, leon_clear_clock_irq, > + BTFIXUPCALL_NORM); > + BTFIXUPSET_CALL(load_profile_irq, leon_load_profile_irq, > + BTFIXUPCALL_NOP); > + > +#ifdef CONFIG_SMP > + BTFIXUPSET_CALL(set_cpu_int, leon_set_cpu_int, BTFIXUPCALL_NORM); > + BTFIXUPSET_CALL(clear_cpu_int, leon_clear_ipi, BTFIXUPCALL_NORM); > + BTFIXUPSET_CALL(set_irq_udt, leon_set_udt, BTFIXUPCALL_NORM); > +#endif > + > +} > + > +void __init leon_init(void) > +{ > + prom_build_more = &leon_node_init; > +} > diff --git a/arch/sparc/mm/leon_mm.c b/arch/sparc/mm/leon_mm.c > new file mode 100644 > index 0000000..571a24c > --- /dev/null > +++ b/arch/sparc/mm/leon_mm.c > @@ -0,0 +1,262 @@ > +/* > + * linux/arch/sparc/mm/leon_m.c > + * > + * Copyright (C) 2004 Konrad Eisele > + * (eiselekd@xxxxxx, konrad@xxxxxxxxxxx), Gaisler Research > + * Copyright (C) 2009 Daniel Hellstrom (daniel@xxxxxxxxxxx), > + * Konrad Eisele (konrad@xxxxxxxxxxx) Aeroflex Gaisler AB > + * > + * do srmmu probe in software > + */ > + > +#include <linux/kernel.h> > +#include <linux/mm.h> > +#include <asm/asi.h> > +#include <asm/leon.h> > +#include <asm/tlbflush.h> > + > +int leon_flush_during_switch = 1; > + > +extern unsigned long last_valid_pfn; this belongs in a header file. > + > +int srmmu_swprobe_trace; static? > +unsigned long srmmu_swprobe(unsigned long vaddr, unsigned long *paddr) > +{ > + > + unsigned int ctxtbl; > + unsigned int pgd, pmd, ped; > + unsigned int ptr; > + unsigned int lvl, pte, paddrbase; > + unsigned int ctx; > + unsigned int paddr_calc; > + > + paddrbase = 0; > + > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: trace on\n"); > + > + ctxtbl = srmmu_get_ctable_ptr(); > + if (!(ctxtbl)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: srmmu_get_ctable_ptr returned 0=>0\n"); > + return 0; > + } > + if (!_pfn_valid(PFN(ctxtbl))) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO > + "swprobe: !_pfn_valid(%x)=>0\n", > + PFN(ctxtbl)); > + return 0; > + } > + > + ctx = srmmu_get_context(); > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: --- ctx (%x) ---\n", ctx); > + > + pgd = LEON_BYPASS_LOAD_PA(ctxtbl + (ctx * 4)); > + > + if (((pgd & SRMMU_ET_MASK) == SRMMU_ET_PTE)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: pgd is entry level 3\n"); > + lvl = 3; > + pte = pgd; > + paddrbase = pgd & _SRMMU_PTE_PMASK_LEON; > + goto ready; > + } > + if (((pgd & SRMMU_ET_MASK) != SRMMU_ET_PTD)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: pgd is invalid => 0\n"); > + return 0; > + } > + > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: --- pgd (%x) ---\n", pgd); > + > + ptr = (pgd & SRMMU_PTD_PMASK) << 4; > + ptr += ((((vaddr) >> LEON_PGD_SH) & LEON_PGD_M) * 4); > + if (!_pfn_valid(PFN(ptr))) > + return 0; > + > + pmd = LEON_BYPASS_LOAD_PA(ptr); > + if (((pmd & SRMMU_ET_MASK) == SRMMU_ET_PTE)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: pmd is entry level 2\n"); > + lvl = 2; > + pte = pmd; > + paddrbase = pmd & _SRMMU_PTE_PMASK_LEON; > + goto ready; > + } > + if (((pmd & SRMMU_ET_MASK) != SRMMU_ET_PTD)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: pmd is invalid => 0\n"); > + return 0; > + } > + > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: --- pmd (%x) ---\n", pmd); > + > + ptr = (pmd & SRMMU_PTD_PMASK) << 4; > + ptr += (((vaddr >> LEON_PMD_SH) & LEON_PMD_M) * 4); > + if (!_pfn_valid(PFN(ptr))) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: !_pfn_valid(%x)=>0\n", > + PFN(ptr)); > + return 0; > + } > + > + ped = LEON_BYPASS_LOAD_PA(ptr); > + > + if (((ped & SRMMU_ET_MASK) == SRMMU_ET_PTE)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: ped is entry level 1\n"); > + lvl = 1; > + pte = ped; > + paddrbase = ped & _SRMMU_PTE_PMASK_LEON; > + goto ready; > + } > + if (((ped & SRMMU_ET_MASK) != SRMMU_ET_PTD)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: ped is invalid => 0\n"); > + return 0; > + } > + > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: --- ped (%x) ---\n", ped); > + > + ptr = (ped & SRMMU_PTD_PMASK) << 4; > + ptr += (((vaddr >> LEON_PTE_SH) & LEON_PTE_M) * 4); > + if (!_pfn_valid(PFN(ptr))) > + return 0; > + > + ptr = LEON_BYPASS_LOAD_PA(ptr); > + if (((ptr & SRMMU_ET_MASK) == SRMMU_ET_PTE)) { > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: ptr is entry level 0\n"); > + lvl = 0; > + pte = ptr; > + paddrbase = ptr & _SRMMU_PTE_PMASK_LEON; > + goto ready; > + } > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: ptr is invalid => 0\n"); > + return 0; > + > +ready: > + switch (lvl) { > + case 0: > + paddr_calc = > + (vaddr & ~(-1 << LEON_PTE_SH)) | ((pte & ~0xff) << 4); > + break; > + case 1: > + paddr_calc = > + (vaddr & ~(-1 << LEON_PMD_SH)) | ((pte & ~0xff) << 4); > + break; > + case 2: > + paddr_calc = > + (vaddr & ~(-1 << LEON_PGD_SH)) | ((pte & ~0xff) << 4); > + break; > + default: > + case 3: > + paddr_calc = vaddr; > + break; > + } > + if (srmmu_swprobe_trace) > + printk(KERN_INFO "swprobe: padde %x\n", paddr_calc); > + if (paddr) > + *paddr = paddr_calc; > + return paddrbase; > +} > + > +void leon_flush_icache_all(void) > +{ > + __asm__ __volatile__(" flush "); /*iflush*/ > +} > + > +void leon_flush_dcache_all(void) > +{ > + __asm__ __volatile__("sta %%g0, [%%g0] %0\n\t" : : > + "i"(ASI_LEON_DFLUSH) : "memory"); > +} > + > +void leon_flush_pcache_all(struct vm_area_struct *vma, unsigned long page) > +{ > + if (vma->vm_flags & VM_EXEC) > + leon_flush_icache_all(); > + leon_flush_dcache_all(); > +} > + > +void leon_flush_cache_all(void) > +{ > + __asm__ __volatile__(" flush "); /*iflush*/ > + __asm__ __volatile__("sta %%g0, [%%g0] %0\n\t" : : > + "i"(ASI_LEON_DFLUSH) : "memory"); > +} > + > +void leon_flush_tlb_all(void) > +{ > + leon_flush_cache_all(); > + __asm__ __volatile__("sta %%g0, [%0] %1\n\t" : : "r"(0x400), > + "i"(ASI_LEON_MMUFLUSH) : "memory"); > +} > + > +/* get all cache regs */ > +void leon3_getCacheRegs(struct leon3_cacheregs *regs) > +{ > + unsigned long ccr, iccr, dccr; > + > + if (!regs) > + return; > + /* Get Cache regs from "Cache ASI" address 0x0, 0x8 and 0xC */ > + __asm__ __volatile__("lda [%%g0] %3, %0\n\t" > + "mov 0x08, %%g1\n\t" > + "lda [%%g1] %3, %1\n\t" > + "mov 0x0c, %%g1\n\t" > + "lda [%%g1] %3, %2\n\t" > + : "=r"(ccr), "=r"(iccr), "=r"(dccr) > + /* output */ > + : "i"(ASI_LEON_CACHEREGS) /* input */ > + : "g1" /* clobber list */ > + ); > + regs->ccr = ccr; > + regs->iccr = iccr; > + regs->dccr = dccr; > +} > + > +/* Due to virtual cache we need to check cache configuration if > + * it is possible to skip flushing in some cases. > + * > + * Leon2 and Leon3 differ in their way of telling cache information > + * > + */ > +int leon_flush_needed(void) > +{ > + int flush_needed = -1; > + unsigned int ssize, sets; > + char *setStr[4] = > + { "direct mapped", "2-way associative", "3-way associative", > + "4-way associative" > + }; > + /* leon 3 */ > + struct leon3_cacheregs cregs; > + leon3_getCacheRegs(&cregs); > + sets = (cregs.dccr & LEON3_XCCR_SETS_MASK) >> 24; > + /* (ssize=>realsize) 0=>1k, 1=>2k, 2=>4k, 3=>8k ... */ > + ssize = 1 << ((cregs.dccr & LEON3_XCCR_SSIZE_MASK) >> 20); > + > + printk(KERN_INFO "CACHE: %s cache, set size %dk\n", > + sets > 3 ? "unknown" : setStr[sets], ssize); > + if ((ssize <= (PAGE_SIZE / 1024)) && (sets == 0)) { > + /* Set Size <= Page size ==> > + flush on every context switch not needed. */ > + flush_needed = 0; > + printk(KERN_INFO "CACHE: not flushing on every context switch\n"); > + } > + return flush_needed; > +} > + > +void leon_switch_mm(void) > +{ > + flush_tlb_mm(0); > + if (leon_flush_during_switch) > + leon_flush_cache_all(); > +} -- 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