On Mon, Jun 22, 2009 at 12:02:49PM +0200, konrad@xxxxxxxxxxx wrote:
> From: Konrad Eisele <konrad@xxxxxxxxxxx>
>
> The macro CONFIG_SPARC_LEON will shield, if undefined, the sun-sparc
> code
> from LEON specific code. In particular include/asm/leon.h
> will get empty through #ifdef arch/sparc/kernel/leon.c not
> compiled through Makefile:obj-$(CONFIG_SPARC_LEON)
> arch/sparc/mm/leon.c not compiled through
> Makefile:obj-$(CONFIG_SPARC_LEON)
Please reformat your changelog.
You have manged to make it a bit unreadable..
>
> Signed-off-by: Konrad Eisele <konrad@xxxxxxxxxxx>
> ---
> arch/sparc/Kconfig | 11 ++
> arch/sparc/include/asm/leon.h | 332 ++++++++++++++++++++++++++++++++++++
> arch/sparc/include/asm/leon_amba.h | 255 +++++++++++++++++++++++++++
> arch/sparc/kernel/leon_kernel.c | 198 +++++++++++++++++++++
> arch/sparc/mm/leon_mm.c | 260 ++++++++++++++++++++++++++++
> 5 files changed, 1056 insertions(+), 0 deletions(-)
> create mode 100644 arch/sparc/include/asm/leon.h
> create mode 100644 arch/sparc/include/asm/leon_amba.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 3f8b6a9..53a38e3 100644
> --- a/arch/sparc/Kconfig
> +++ b/arch/sparc/Kconfig
> @@ -437,6 +437,17 @@ 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.
> + The LEON processor is a synthesizable VHDL model of the
> + SPARC-v8 standard. LEON is part of the GRLIB collection of
> + IP cores that are distributed under GPL. GRLIB can be downloaded
> + from www.gaisler.com. You can download a sparc-linux cross-compilation
> + toolchain at www.gaisler.com.
> +
> endmenu
>
> menu "Bus options (PCI etc.)"
> diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
> new file mode 100644
> index 0000000..7261a3f
> --- /dev/null
> +++ b/arch/sparc/include/asm/leon.h
> @@ -0,0 +1,332 @@
> +/*
> +*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
> +*/
The style is:
/*
* Copyright ...
*/
To avoid the overlong line you can do:
/*
* Copyright (C) 2009 Daniel Hellstrom (daniel@xxxxxxxxxxx) Aeroflex Gaisler AB
* Copyright (C) 2009 Konrad Eisele (konrad@xxxxxxxxxxx) Aeroflex Gaisler AB
(Yes - you had something similar before. I had not seen we hit the 80 char limit).
> +
> +#define LEON_USTAT_ERROR (LEON_USTAT_OV | LEON_USTAT_PE | LEON_USTAT_FE)
> +/*no break yet */
Missing space after /*
> +
> +extern void sparc_leon_eirq_register(int eirq);
> +extern void leon_init(void) ;
> +extern void leon_switch_mm(void) ;
2 x no space before ';'
> +/*enable snooping*/
spaces..
> +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__*/
It is spelled: __ASSEMBLY__
> +
> +#if defined(CONFIG_SMP)
Use:
#ifdef CONFIG_SMP
> +
> +/* struct that hold LEON2 cache configuration register
> + & configuration register */
/*
* ....
*/
style
> +
> +/* nop definitions for !LEON case */
> +#define leon_init()
> +#define leon_switch_mm()
> +#define leon_init_IRQ()
A common pattern is to use:
#define leon_init() do {} while(0)
Then we avoid dangling ';'
But the way they are used I do not see any problems.
If they had taken parameters we would have used
a small static inline so we got parameter check in the
non-leon case too. But this is not the case here.
> diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h
> new file mode 100644
Thanks!
> @@ -0,0 +1,255 @@
> +/*
> +*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
> +*/
Fix comment style.
> +#ifdef CONFIG_SPARC_LEON
I do not see the need for this protection.
(May come later in the file).
> +
> +#ifndef __ASSEMBLER__
It is spelled: __ASSEMBLY__
> +
> +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 */
> +} ;
drop space
> +
> +struct leon3_apbuart_regs_map {
> + u32 data;
> + u32 status;
> + u32 ctrl;
> + u32 scaler;
> +} ;
drop space
> +
> +struct leon3_gptimerelem_regs_map {
> + u32 val;
> + u32 rld;
> + u32 ctrl;
> + u32 unused;
> +} ;
drop space
> +
> +struct leon3_gptimer_regs_map {
> + u32 scalar;
> + u32 scalar_reload;
> + u32 config;
> + u32 unused;
> + struct leon3_gptimerelem_regs_map e[8];
> +};
> +
> +/*
> + * 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 */
> + unsigned int *addr[16]; /* addresses to the devices configuration tables */
> + unsigned int allocbits[1]; /* 0=unallocated, 1=allocated driver */
> +};
> +
> +struct amba_apbslv_device_table {
> + int devnr; /* number of devices on AHB or APB bus */
> + unsigned int *addr[AMBA_MAXAPB_DEVS]; /* addresses to the devices configuration tables */
> + unsigned int apbmst[AMBA_MAXAPB_DEVS]; /* apb master if a entry is a apb slave */
> + unsigned int apbmstidx[AMBA_MAXAPB_DEVS]; /* apb master idx if a entry is a apb slave */
> + 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;
> +};
> +
> +struct device_node;
> +void _amba_init(struct device_node *dp, struct device_node ***nextp);
> +
> +#endif /* __ASSEMBLER__ */
__ASSEMBLY__
> +struct leon3_irqctrl_regs_map *leon3_irqctrl_regs; /* interrupt controller base address, initialized by amba_init() */
static?
> +struct leon3_gptimer_regs_map *leon3_gptimer_regs; /* timer controller base address, initialized by amba_init() */
static?
> +struct amba_apb_device leon_percpu_timer_dev[16];
> +
> +int leondebug_irq_disable;
static?
> +int leon_debug_irqout;
static?
> +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;
static?
> +#define LEON_IMASK ((&leon3_irqctrl_regs->mask[0]))
> +
> +int leon_flush_during_switch = 1;
static?
> +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
