| Message ID | 1308556402-10955-1-git-send-email-bs14@csr.com |
|---|---|
| State | New |
| Headers | show |
On Monday 20 June 2011, Barry Song wrote: > From: Binghua Duan <binghua.duan@csr.com> > > SiRFprimaII is the latest generation application processor from CSR’s > Multifunction SoC product family. Designed around an ARM cortex A9 core, > high-speed memory bus, advanced 3D accelerator and full-HD multi-format > video decoder, SiRFprimaII is able to meet the needs of complicated > applications for modern multifunction devices that require heavy concurrent > applications and fluid user experience. Integrated with GPS baseband, > analog and PMU, this new platform is designed to provide a cost effective > solution for Automotive and Consumer markets. > > This patch adds the basic support for this SoC and EVB board based on device > tree. It is following the ZYNQ of Grant Likely in some degree. Hi Binghua and Barry, Your platform looks pretty good already, it's good to see that you are progressing so well with the conversion to device tree. > diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts > new file mode 100644 > index 0000000..6e8b17c > --- /dev/null > +++ b/arch/arm/boot/dts/prima2-cb.dts > @@ -0,0 +1,44 @@ > +/dts-v1/; > +/ { > + model = "SIRF Prima2 EVB"; > + compatible = "sirf,prima2-cb", "sirf,prima2"; > + #address-cells = <1>; > + #size-cells = <1>; > + interrupt-parent = <&intc>; > + > + memory { > + reg = <0x00000000 0x20000000>; > + }; > + > + chosen { > + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS1 earlyprintk"; > + linux,stdout-path = &uart1; > + }; > + > + amba { > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges; > + > + intc: interrupt-controller@0x80020000 { > + interrupt-controller; > + compatible = "arm,sirfsoc"; > + reg = <0x80020000 0x1000>; > + #interrupt-cells = <1>; > + }; > + > + uart0: uart@0xb0050000 { > + compatible = "sirf,uart"; > + reg = <0xb0050000 0x1000>; > + interrupts = <17>; > + }; > + > + uart1: uart@0xb0060000 { > + compatible = "sirf,uart"; > + reg = <0xb0060000 0x1000>; > + interrupts = <18>; > + }; > + }; > +}; The "compatible" properties should really be more specific than this. You can list multiple alternatives in there, but please always have one that identifies the exact version of each of the macros uniquely. Please also model the device hierarchy as close as possible to the high-level block diagrams in the data sheet. I would e.g. expect this to have multiple AMBA buses, one at 0x80000000 and one at 0xb0000000, so just define them separately with a ranges property describing the location of the bus in the address space, and put the child devices at relative addresses to that. I would also recommend listing all devices in the device tree here, even if the drivers are not yet ported. Regarding the interrupt and timer drivers, there has been some discussion about moving them to drivers/irq and drivers/clocksource, respectively. > diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c > new file mode 100644 > index 0000000..a879fbf > --- /dev/null > +++ b/arch/arm/mach-prima2/clock.c I can't really comment on the clock support. A lot has changed here recently, so I hope someone else can comment. > +#define IOTABLE_ENTRY(region) {\ > + .virtual = SIRFSOC_##region##_VA_BASE, \ > + .pfn = __phys_to_pfn(SIRFSOC_##region##_PA_BASE),\ > + .length = SIRFSOC_##region##_SIZE, \ > + .type = MT_DEVICE, \ > +} > + > +static struct map_desc sirfsoc_iodesc[] __initdata = { > + IOTABLE_ENTRY(INTR), > + IOTABLE_ENTRY(UART1), > + IOTABLE_ENTRY(TIMER), > + IOTABLE_ENTRY(CLOCK), > +#ifdef CONFIG_CACHE_L2X0 > + IOTABLE_ENTRY(L2CC), > +#endif > +}; > + > +void __init sirfsoc_map_io(void) > +{ > + iotable_init(sirfsoc_iodesc, ARRAY_SIZE(sirfsoc_iodesc)); > +} > + > +#define L2X0_ADDR_FILTERING_START 0xC00 > +#define L2X0_ADDR_FILTERING_END 0xC04 > + > +static int __init sirfsoc_init(void) > +{ > +#ifdef CONFIG_CACHE_L2X0 > + if (!(readl_relaxed(SIRFSOC_L2CC_VA_BASE + L2X0_CTRL) & 1)) { > + /* > + * set the physical memory windows L2 cache will cover > + */ > + writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024, > + SIRFSOC_L2CC_VA_BASE + L2X0_ADDR_FILTERING_END); > + writel_relaxed(PHYS_OFFSET | 0x1, > + SIRFSOC_L2CC_VA_BASE + L2X0_ADDR_FILTERING_START); > + > + writel_relaxed(0, > + SIRFSOC_L2CC_VA_BASE + L2X0_TAG_LATENCY_CTRL); > + writel_relaxed(0, > + SIRFSOC_L2CC_VA_BASE + L2X0_DATA_LATENCY_CTRL); > + } > + l2x0_init((void __iomem *)SIRFSOC_L2CC_VA_BASE, 0x00040000, > + 0x00000000); > +#endif > + > + return 0; > +} > +arch_initcall(sirfsoc_init); > +#ifndef __MACH_PRIMA2_IO_H > +#define __MACH_PRIMA2_IO_H > + > +#define IO_SPACE_LIMIT 0xffffffff > + > +#define __mem_pci(x) (x) > +#define __io(a) ((void __iomem *)(a)) > + > +#endif This is broken for PCI I/O space windows. The same issue keeps coming up with every new platform, and I wish we could simply not have to define these. Do you have any PCI or PCMCIA devices? > diff --git a/arch/arm/mach-prima2/include/mach/isa-dma.h b/arch/arm/mach-prima2/include/mach/isa-dma.h > + > +#ifndef __MACH_PRIMA2_ISADMA_H > +#define __MACH_PRIMA2_ISADMA_H > + > +#define MAX_DMA_CHANNELS 32 > + > +#endif Would it make sense to convert the DMA support on your platform to the more modern dmaengine API? The old ISA DMA API is showing its age, and will cause trouble when you want to support different DMA controllers in a single kernel. > diff --git a/arch/arm/mach-prima2/include/mach/map.h b/arch/arm/mach-prima2/include/mach/map.h > new file mode 100644 > index 0000000..9a3ad94 > --- /dev/null > +++ b/arch/arm/mach-prima2/include/mach/map.h > + > +#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000)) > + > +/* INTR */ > +#define SIRFSOC_INTR_PA_BASE 0x80020000 > +#define SIRFSOC_INTR_VA_BASE SIRFSOC_VA(0x002000) > +#define SIRFSOC_INTR_SIZE SZ_4K > + > +/* L2 CACHE */ > +#define SIRFSOC_L2CC_PA_BASE 0x80040000 > +#define SIRFSOC_L2CC_VA_BASE SIRFSOC_VA(0x004000) > +#define SIRFSOC_L2CC_SIZE SZ_4K > + > +/* CLOCK */ > +#define SIRFSOC_CLOCK_PA_BASE 0x88000000 > +#define SIRFSOC_CLOCK_VA_BASE SIRFSOC_VA(0x005000) > +#define SIRFSOC_CLOCK_SIZE SZ_4K > + > +/* RESET CONTROLLER */ > +#define SIRFSOC_RSTC_PA_BASE 0x88010000 > +#define SIRFSOC_RSTC_VA_BASE SIRFSOC_VA(0x006000) > +#define SIRFSOC_RSTC_SIZE SZ_4K > + > +/* OS TIMER */ > +#define SIRFSOC_TIMER_PA_BASE 0xb0020000 > +#define SIRFSOC_TIMER_VA_BASE SIRFSOC_VA(0x00c000) > +#define SIRFSOC_TIMER_SIZE SZ_4K > + > +/* UART-1: used as serial debug port */ > +#define SIRFSOC_UART1_PA_BASE 0xb0060000 > +#define SIRFSOC_UART1_VA_BASE SIRFSOC_VA(0x060000) > +#define SIRFSOC_UART1_SIZE SZ_4K > + > +/* RAM BASE*/ > +#define SIRFSOC_SDRAM_PA 0x00000000 > + > +#endif I think these should all be converted into device tree properties if possible. Anything that can be initialized late enough should just do an ioremap at the time when you first need to access the registers. For the L2 cache, Rob already posted a binding, so best work with him on that one. > +/* > + * Restrict DMA-able region to workaround silicon limitation. > + * The limitation restricts buffers available for DMA to SD/MMC > + * hardware to be below 256MB > + */ > +#define ARM_DMA_ZONE_SIZE (SZ_256M) > + This is very unfortunate, but I guess there is no real way to avoid doing this, right? > +static void sirfsoc_irq_mask(struct irq_data *d) > +{ > + unsigned long mask; > + > + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) & > + ~(1 << ( d->irq % 32)); > + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); > +} Better use readl_relaxed here than __raw_readl. > +/* timer0 interrupt handler */ > +static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id) > +{ > + struct clock_event_device *ce = dev_id; > + > + WARN_ON(!(__raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS) & BIT(0))); > + > + /* clear timer0 interrupt */ > + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); Here, too. Arnd
Some comments inline, nothing really serious... On Mon, Jun 20, 2011 at 12:53:22AM -0700, Barry Song wrote: > +config ARCH_PRIMA2 > + bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" > + select CPU_V7 > + select GENERIC_TIME > + select GENERIC_CLOCKEVENTS > + select CLKDEV_LOOKUP > + select USE_OF > + select ISA_DMA_API Do you really provide the old ISA DMA API? Unless you're intending to use existing ISA drivers with their ISA DMA, you shouldn't define this. > diff --git a/arch/arm/Makefile b/arch/arm/Makefile > index f5b2b39..79e6edf 100644 > --- a/arch/arm/Makefile > +++ b/arch/arm/Makefile > @@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_VEXPRESS) := vexpress > machine-$(CONFIG_ARCH_VT8500) := vt8500 > machine-$(CONFIG_ARCH_W90X900) := w90x900 > machine-$(CONFIG_ARCH_NUC93X) := nuc93x > +machine-$(CONFIG_ARCH_PRIMA2) := prima2 The comment at the start of this list says: # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. and I thank the NUC93x people for also missing it. Please ignore the NUC93x entry and place yours appropriately. > diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts > new file mode 100644 > index 0000000..6e8b17c > --- /dev/null > +++ b/arch/arm/boot/dts/prima2-cb.dts > @@ -0,0 +1,44 @@ > +/dts-v1/; > +/ { > + model = "SIRF Prima2 EVB"; > + compatible = "sirf,prima2-cb", "sirf,prima2"; > + #address-cells = <1>; > + #size-cells = <1>; > + interrupt-parent = <&intc>; > + > + memory { > + reg = <0x00000000 0x20000000>; > + }; > + > + chosen { > + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS1 earlyprintk"; > + linux,stdout-path = &uart1; > + }; > + > + amba { You declare that you have an AMBA bus, does it have primcells on it? Should you be selecting ARM_AMBA in your kconfig? > diff --git a/arch/arm/mach-prima2/include/mach/entry-macro.S b/arch/arm/mach-prima2/include/mach/entry-macro.S > new file mode 100644 > index 0000000..af5611b > --- /dev/null > +++ b/arch/arm/mach-prima2/include/mach/entry-macro.S > @@ -0,0 +1,28 @@ > +/* > + * arch/arm/mach-prima2/include/mach/entry-macro.S > + * > + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. > + * > + * Licensed under GPLv2 or later. > + */ > + > +#include <mach/hardware.h> > + > +#define SIRFSOC_INT_ID 0x38 > + > + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp > + ldr \base, =SIRFSOC_INTR_VA_BASE Consider using get_irqnr_preamble to load the base address only once per IRQ exception. > diff --git a/arch/arm/mach-prima2/include/mach/isa-dma.h b/arch/arm/mach-prima2/include/mach/isa-dma.h > new file mode 100644 > index 0000000..f07e264 > --- /dev/null > +++ b/arch/arm/mach-prima2/include/mach/isa-dma.h > @@ -0,0 +1,14 @@ > +/* > + * arch/arm/mach-prima2/include/mach/io.h > + * > + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. > + * > + * Licensed under GPLv2 or later. > + */ > + > +#ifndef __MACH_PRIMA2_ISADMA_H > +#define __MACH_PRIMA2_ISADMA_H > + > +#define MAX_DMA_CHANNELS 32 > + > +#endif You don't need this if you don't define ISA_DMA_API. > diff --git a/arch/arm/mach-prima2/include/mach/uncompress.h b/arch/arm/mach-prima2/include/mach/uncompress.h > new file mode 100644 > index 0000000..e08d7b8 > --- /dev/null > +++ b/arch/arm/mach-prima2/include/mach/uncompress.h > @@ -0,0 +1,42 @@ > +/* > + * arch/arm/mach-prima2/include/mach/uncompress.h > + * > + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. > + * > + * Licensed under GPLv2 or later. > + */ > + > +#ifndef __ASM_ARCH_UNCOMPRESS_H > +#define __ASM_ARCH_UNCOMPRESS_H > + > +#include <linux/bitops.h> > +#include <linux/io.h> > +#include <asm/processor.h> > +#include <mach/hardware.h> > +#include <mach/uart.h> If you include all that, then you're in for problems with the decompressor. The decompressor is a _really_ limited environment, and most stuff from linux/ or platfform stuff will not be available. > diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c > new file mode 100644 > index 0000000..af65481 > --- /dev/null > +++ b/arch/arm/mach-prima2/irq.c > @@ -0,0 +1,81 @@ ... > +#define SIRFSOC_INT_PENDING0 0x0000 > +#define SIRFSOC_INT_PENDING1 0x0004 > +#define SIRFSOC_INT_IRQ_PENDING0 0x0008 > +#define SIRFSOC_INT_IRQ_PENDING1 0x000C > +#define SIRFSOC_INT_FIQ_PENDING0 0x0010 > +#define SIRFSOC_INT_FIQ_PENDING1 0x0014 > +#define SIRFSOC_INT_RISC_MASK0 0x0018 > +#define SIRFSOC_INT_RISC_MASK1 0x001C > +#define SIRFSOC_INT_RISC_LEVEL0 0x0020 > +#define SIRFSOC_INT_RISC_LEVEL1 0x0024 > + > +static void sirfsoc_irq_ack(struct irq_data *d) > +{ > +} > + > +static void sirfsoc_irq_mask(struct irq_data *d) > +{ > + unsigned long mask; > + > + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) & > + ~(1 << ( d->irq % 32)); > + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); > +} > + > +static void sirfsoc_irq_unmask(struct irq_data *d) > +{ > + unsigned long mask; > + > + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) | > + (1 << ( d->irq % 32)); > + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); > +} > + > +int sirfsoc_irq_settype(struct irq_data *d, unsigned int type) > +{ > + /* > + * Interrupt handler doesnt support setting trigger type > + */ > + if (type == IRQ_TYPE_NONE) > + return 0; > + > + return -EINVAL; > +} > + > +static struct irq_chip sirfsoc_irq_chip = { > + .name = "SiRF SoC", > + .irq_ack = sirfsoc_irq_ack, > + .irq_mask = sirfsoc_irq_mask, > + .irq_unmask = sirfsoc_irq_unmask, > + .irq_set_type = sirfsoc_irq_settype, > +}; Can you use the recently introduced generic irqchips stuff for this? > diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c > new file mode 100644 > index 0000000..f73928f > --- /dev/null > +++ b/arch/arm/mach-prima2/timer.c > @@ -0,0 +1,181 @@ ... > +/* initialize the kernel jiffy timer source */ > +static void __init sirfsoc_timer_init(void) > +{ > + unsigned long rate; > + /* timer's input clock is io clock */ > + struct clk *clk = clk_get(NULL, "io"); Rather than going down this broken path of specifying clock names as connection IDs, it would be better to obtain it by function: struct clk *clk = clk_get_sys("timer", NULL); Experience shows that people think that naming the clock signals themselves and passing strings around to drivers is easier. After a few years they find that what they thought was easy, is actually inflexible and has become a huge problem which they need to rework. (Samsung folk are currently going through this pain.) So please, don't fall into the trap of "lets give each clock signal a name and look up only by clock name". Use the device names as the primary matching and don't allow yourself to get into the trap of passing clock names around. > + > + BUG_ON(IS_ERR_OR_NULL(clk)); BUG_ON(IS_ERR(clk)); If clk_get() may return NULL, then clk_get_rate() should be able to eat that value without choking. > + > + rate = clk_get_rate(clk); > + clk_put(clk); It's much preferable not to clk_put() a clock which you're going to continue using. > + > + BUG_ON(rate < CLOCK_TICK_RATE); > + BUG_ON(rate % CLOCK_TICK_RATE); > + > + __raw_writel(rate / CLOCK_TICK_RATE / 2 - 1, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_DIV); > + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_LO); > + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_HI); > + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); > + > + if (clocksource_register_hz(&sirfsoc_clocksource, CLOCK_TICK_RATE)) > + BUG(); Confused. CLOCK_TICK_RATE is defined to be 100 * HZ, so 10kHz. Do your timers really tick at 10kHz? That seems needlessly slow for a 64-bit counter. Also consider BUG_ON() > + > + if (setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq)) > + BUG(); BUG_ON() here too.
2011/6/22 Russell King - ARM Linux <linux@arm.linux.org.uk>: > Some comments inline, nothing really serious... > > On Mon, Jun 20, 2011 at 12:53:22AM -0700, Barry Song wrote: >> +config ARCH_PRIMA2 >> + bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" >> + select CPU_V7 >> + select GENERIC_TIME >> + select GENERIC_CLOCKEVENTS >> + select CLKDEV_LOOKUP >> + select USE_OF >> + select ISA_DMA_API > > Do you really provide the old ISA DMA API? Unless you're intending to use > existing ISA drivers with their ISA DMA, you shouldn't define this. > >> diff --git a/arch/arm/Makefile b/arch/arm/Makefile >> index f5b2b39..79e6edf 100644 >> --- a/arch/arm/Makefile >> +++ b/arch/arm/Makefile >> @@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_VEXPRESS) := vexpress >> machine-$(CONFIG_ARCH_VT8500) := vt8500 >> machine-$(CONFIG_ARCH_W90X900) := w90x900 >> machine-$(CONFIG_ARCH_NUC93X) := nuc93x >> +machine-$(CONFIG_ARCH_PRIMA2) := prima2 > > The comment at the start of this list says: > > # Machine directory name. This list is sorted alphanumerically > # by CONFIG_* macro name. > > and I thank the NUC93x people for also missing it. Please ignore the > NUC93x entry and place yours appropriately. > >> diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts >> new file mode 100644 >> index 0000000..6e8b17c >> --- /dev/null >> +++ b/arch/arm/boot/dts/prima2-cb.dts >> @@ -0,0 +1,44 @@ >> +/dts-v1/; >> +/ { >> + model = "SIRF Prima2 EVB"; >> + compatible = "sirf,prima2-cb", "sirf,prima2"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + interrupt-parent = <&intc>; >> + >> + memory { >> + reg = <0x00000000 0x20000000>; >> + }; >> + >> + chosen { >> + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS1 earlyprintk"; >> + linux,stdout-path = &uart1; >> + }; >> + >> + amba { > > You declare that you have an AMBA bus, does it have primcells on it? > Should you be selecting ARM_AMBA in your kconfig? > >> diff --git a/arch/arm/mach-prima2/include/mach/entry-macro.S b/arch/arm/mach-prima2/include/mach/entry-macro.S >> new file mode 100644 >> index 0000000..af5611b >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/entry-macro.S >> @@ -0,0 +1,28 @@ >> +/* >> + * arch/arm/mach-prima2/include/mach/entry-macro.S >> + * >> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. >> + * >> + * Licensed under GPLv2 or later. >> + */ >> + >> +#include <mach/hardware.h> >> + >> +#define SIRFSOC_INT_ID 0x38 >> + >> + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp >> + ldr \base, =SIRFSOC_INTR_VA_BASE > > Consider using get_irqnr_preamble to load the base address only once per > IRQ exception. > >> diff --git a/arch/arm/mach-prima2/include/mach/isa-dma.h b/arch/arm/mach-prima2/include/mach/isa-dma.h >> new file mode 100644 >> index 0000000..f07e264 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/isa-dma.h >> @@ -0,0 +1,14 @@ >> +/* >> + * arch/arm/mach-prima2/include/mach/io.h >> + * >> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. >> + * >> + * Licensed under GPLv2 or later. >> + */ >> + >> +#ifndef __MACH_PRIMA2_ISADMA_H >> +#define __MACH_PRIMA2_ISADMA_H >> + >> +#define MAX_DMA_CHANNELS 32 >> + >> +#endif > > You don't need this if you don't define ISA_DMA_API. i don't need ISA_DMA at all. i was totally wrong for this. actually i only need a DMA zone due to DMA address can't be larger than 256MB for prima2 SD controller. So "#define ARM_DMA_ZONE_SIZE SZ_256M" is enough for me. > >> diff --git a/arch/arm/mach-prima2/include/mach/uncompress.h b/arch/arm/mach-prima2/include/mach/uncompress.h >> new file mode 100644 >> index 0000000..e08d7b8 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/uncompress.h >> @@ -0,0 +1,42 @@ >> +/* >> + * arch/arm/mach-prima2/include/mach/uncompress.h >> + * >> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. >> + * >> + * Licensed under GPLv2 or later. >> + */ >> + >> +#ifndef __ASM_ARCH_UNCOMPRESS_H >> +#define __ASM_ARCH_UNCOMPRESS_H >> + >> +#include <linux/bitops.h> >> +#include <linux/io.h> >> +#include <asm/processor.h> >> +#include <mach/hardware.h> >> +#include > > If you include all that, then you're in for problems with the decompressor. > The decompressor is a _really_ limited environment, and most stuff from > linux/ or platfform stuff will not be available. <mach/uart.h>, io.h, mach/map.h with memory mapping are needed here. others are redundant here. > >> diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c >> new file mode 100644 >> index 0000000..af65481 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/irq.c >> @@ -0,0 +1,81 @@ > ... >> +#define SIRFSOC_INT_PENDING0 0x0000 >> +#define SIRFSOC_INT_PENDING1 0x0004 >> +#define SIRFSOC_INT_IRQ_PENDING0 0x0008 >> +#define SIRFSOC_INT_IRQ_PENDING1 0x000C >> +#define SIRFSOC_INT_FIQ_PENDING0 0x0010 >> +#define SIRFSOC_INT_FIQ_PENDING1 0x0014 >> +#define SIRFSOC_INT_RISC_MASK0 0x0018 >> +#define SIRFSOC_INT_RISC_MASK1 0x001C >> +#define SIRFSOC_INT_RISC_LEVEL0 0x0020 >> +#define SIRFSOC_INT_RISC_LEVEL1 0x0024 >> + >> +static void sirfsoc_irq_ack(struct irq_data *d) >> +{ >> +} >> + >> +static void sirfsoc_irq_mask(struct irq_data *d) >> +{ >> + unsigned long mask; >> + >> + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) & >> + ~(1 << ( d->irq % 32)); >> + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); >> +} >> + >> +static void sirfsoc_irq_unmask(struct irq_data *d) >> +{ >> + unsigned long mask; >> + >> + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) | >> + (1 << ( d->irq % 32)); >> + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); >> +} >> + >> +int sirfsoc_irq_settype(struct irq_data *d, unsigned int type) >> +{ >> + /* >> + * Interrupt handler doesnt support setting trigger type >> + */ >> + if (type == IRQ_TYPE_NONE) >> + return 0; >> + >> + return -EINVAL; >> +} >> + >> +static struct irq_chip sirfsoc_irq_chip = { >> + .name = "SiRF SoC", >> + .irq_ack = sirfsoc_irq_ack, >> + .irq_mask = sirfsoc_irq_mask, >> + .irq_unmask = sirfsoc_irq_unmask, >> + .irq_set_type = sirfsoc_irq_settype, >> +}; > > Can you use the recently introduced generic irqchips stuff for this? agree, then i select GENERIC_IRQ_CHIP. > >> diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c >> new file mode 100644 >> index 0000000..f73928f >> --- /dev/null >> +++ b/arch/arm/mach-prima2/timer.c >> @@ -0,0 +1,181 @@ > ... >> +/* initialize the kernel jiffy timer source */ >> +static void __init sirfsoc_timer_init(void) >> +{ >> + unsigned long rate; >> + /* timer's input clock is io clock */ >> + struct clk *clk = clk_get(NULL, "io"); > > Rather than going down this broken path of specifying clock names as > connection IDs, it would be better to obtain it by function: > struct clk *clk = clk_get_sys("timer", NULL); agree. it makes the codes clearer a lot for sys level clock which doesn't bind with a device. > > Experience shows that people think that naming the clock signals themselves > and passing strings around to drivers is easier. After a few years they > find that what they thought was easy, is actually inflexible and has > become a huge problem which they need to rework. (Samsung folk are > currently going through this pain.) > > So please, don't fall into the trap of "lets give each clock signal a name > and look up only by clock name". Use the device names as the primary > matching and don't allow yourself to get into the trap of passing clock > names around. agree. to avoid device name issues, the current clock.c only include system timers like pll, cystal and bus level. i didn't place device level clocks like uart/lcd/gps/gpu/mmc and so on yet. then all of them should be changed to use dev_id but not con_id. then we get them by clk_get_sys(). so the problem still need to be solved since device names coming from DT is not that much "stable" as statically registered devices. the name from DT isn't the same as what board support code currently uses for statically registered platform_devices. Grant has two threads for this: 1. of: add clock providers to provide clk mapping in DT http://www.mail-archive.com/devicetree-discuss@lists.ozlabs.org/msg03016.html 2. " If Linux needs specific devices to have specific names, then it can pass in a lookup table that matches DT nodes to device names, which is considerably simpler and it leaves the platform setup code in control over how devices get instantiated." both seems not ready yet? > >> + >> + BUG_ON(IS_ERR_OR_NULL(clk)); > > BUG_ON(IS_ERR(clk)); > > If clk_get() may return NULL, then clk_get_rate() should be able to eat > that value without choking. agree. clk_get() has no chance to return NULL. > >> + >> + rate = clk_get_rate(clk); >> + clk_put(clk); > > It's much preferable not to clk_put() a clock which you're going to > continue using. agree. > >> + >> + BUG_ON(rate < CLOCK_TICK_RATE); >> + BUG_ON(rate % CLOCK_TICK_RATE); >> + >> + __raw_writel(rate / CLOCK_TICK_RATE / 2 - 1, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_DIV); >> + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_LO); >> + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_HI); >> + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); >> + >> + if (clocksource_register_hz(&sirfsoc_clocksource, CLOCK_TICK_RATE)) >> + BUG(); > > Confused. CLOCK_TICK_RATE is defined to be 100 * HZ, so 10kHz. Do > your timers really tick at 10kHz? That seems needlessly slow for a > 64-bit counter. Also consider BUG_ON() sorry for typo. it's my misoperation by copy/paste the file from another file. it actually is "#define CLOCK_TICK_RATE 1000000" > >> + >> + if (setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq)) >> + BUG(); > > BUG_ON() here too. Agree. > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
2011/6/21 Arnd Bergmann <arnd@arndb.de>: > On Monday 20 June 2011, Barry Song wrote: >> From: Binghua Duan <binghua.duan@csr.com> >> >> SiRFprimaII is the latest generation application processor from CSR’s >> Multifunction SoC product family. Designed around an ARM cortex A9 core, >> high-speed memory bus, advanced 3D accelerator and full-HD multi-format >> video decoder, SiRFprimaII is able to meet the needs of complicated >> applications for modern multifunction devices that require heavy concurrent >> applications and fluid user experience. Integrated with GPS baseband, >> analog and PMU, this new platform is designed to provide a cost effective >> solution for Automotive and Consumer markets. >> >> This patch adds the basic support for this SoC and EVB board based on device >> tree. It is following the ZYNQ of Grant Likely in some degree. > > Hi Binghua and Barry, > > Your platform looks pretty good already, it's good to see that you are > progressing so well with the conversion to device tree. really really thank you very much for your helping to track the threads of CSR platform from the beginning. you guide us in the right direction. > >> diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts >> new file mode 100644 >> index 0000000..6e8b17c >> --- /dev/null >> +++ b/arch/arm/boot/dts/prima2-cb.dts >> @@ -0,0 +1,44 @@ >> +/dts-v1/; >> +/ { >> + model = "SIRF Prima2 EVB"; >> + compatible = "sirf,prima2-cb", "sirf,prima2"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + interrupt-parent = <&intc>; >> + >> + memory { >> + reg = <0x00000000 0x20000000>; >> + }; >> + >> + chosen { >> + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS1 earlyprintk"; >> + linux,stdout-path = &uart1; >> + }; >> + >> + amba { >> + compatible = "simple-bus"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ranges; >> + >> + intc: interrupt-controller@0x80020000 { >> + interrupt-controller; >> + compatible = "arm,sirfsoc"; >> + reg = <0x80020000 0x1000>; >> + #interrupt-cells = <1>; >> + }; >> + >> + uart0: uart@0xb0050000 { >> + compatible = "sirf,uart"; >> + reg = <0xb0050000 0x1000>; >> + interrupts = <17>; >> + }; >> + >> + uart1: uart@0xb0060000 { >> + compatible = "sirf,uart"; >> + reg = <0xb0060000 0x1000>; >> + interrupts = <18>; >> + }; >> + }; >> +}; > > The "compatible" properties should really be more specific than this. You can > list multiple alternatives in there, but please always have one that identifies > the exact version of each of the macros uniquely. i guess you mean compatible = "sirf,uart", "sirf,prima2-uart", "sirf,altas6-uart" ? > > Please also model the device hierarchy as close as possible to the high-level > block diagrams in the data sheet. I would e.g. expect this to have > multiple AMBA buses, one at 0x80000000 and one at 0xb0000000, so just define > them separately with a ranges property describing the location of the bus > in the address space, and put the child devices at relative addresses to that. > > I would also recommend listing all devices in the device tree here, even if > the drivers are not yet ported. agree. i am working with IC guys on this. > > Regarding the interrupt and timer drivers, there has been some discussion > about moving them to drivers/irq and drivers/clocksource, respectively. i will keep an eye on them. > >> diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c >> new file mode 100644 >> index 0000000..a879fbf >> --- /dev/null >> +++ b/arch/arm/mach-prima2/clock.c > > I can't really comment on the clock support. A lot has changed here recently, > so I hope someone else can comment. > >> +#define IOTABLE_ENTRY(region) {\ >> + .virtual = SIRFSOC_##region##_VA_BASE, \ >> + .pfn = __phys_to_pfn(SIRFSOC_##region##_PA_BASE),\ >> + .length = SIRFSOC_##region##_SIZE, \ >> + .type = MT_DEVICE, \ >> +} >> + >> +static struct map_desc sirfsoc_iodesc[] __initdata = { >> + IOTABLE_ENTRY(INTR), >> + IOTABLE_ENTRY(UART1), >> + IOTABLE_ENTRY(TIMER), >> + IOTABLE_ENTRY(CLOCK), >> +#ifdef CONFIG_CACHE_L2X0 >> + IOTABLE_ENTRY(L2CC), >> +#endif >> +}; >> + >> +void __init sirfsoc_map_io(void) >> +{ >> + iotable_init(sirfsoc_iodesc, ARRAY_SIZE(sirfsoc_iodesc)); >> +} >> + >> +#define L2X0_ADDR_FILTERING_START 0xC00 >> +#define L2X0_ADDR_FILTERING_END 0xC04 >> + >> +static int __init sirfsoc_init(void) >> +{ >> +#ifdef CONFIG_CACHE_L2X0 >> + if (!(readl_relaxed(SIRFSOC_L2CC_VA_BASE + L2X0_CTRL) & 1)) { >> + /* >> + * set the physical memory windows L2 cache will cover >> + */ >> + writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024, >> + SIRFSOC_L2CC_VA_BASE + L2X0_ADDR_FILTERING_END); >> + writel_relaxed(PHYS_OFFSET | 0x1, >> + SIRFSOC_L2CC_VA_BASE + L2X0_ADDR_FILTERING_START); >> + >> + writel_relaxed(0, >> + SIRFSOC_L2CC_VA_BASE + L2X0_TAG_LATENCY_CTRL); >> + writel_relaxed(0, >> + SIRFSOC_L2CC_VA_BASE + L2X0_DATA_LATENCY_CTRL); >> + } >> + l2x0_init((void __iomem *)SIRFSOC_L2CC_VA_BASE, 0x00040000, >> + 0x00000000); >> +#endif >> + >> + return 0; >> +} >> +arch_initcall(sirfsoc_init); > > >> +#ifndef __MACH_PRIMA2_IO_H >> +#define __MACH_PRIMA2_IO_H >> + >> +#define IO_SPACE_LIMIT 0xffffffff >> + >> +#define __mem_pci(x) (x) >> +#define __io(a) ((void __iomem *)(a)) >> + >> +#endif > > This is broken for PCI I/O space windows. The same issue keeps coming > up with every new platform, and I wish we could simply not have to > define these. agree. > > Do you have any PCI or PCMCIA devices? we do have an internal PCI bridge. but it seems it is completely transparent to users and softwares just like we have no PCI bridge at all. anyway, i need the final confirmation from IC guys. Most platforms without PCI define io.h by giving a simple comment "We don't actually have real ISA nor PCI buses, but there is so many drivers out there that might just work if we fake them...". > >> diff --git a/arch/arm/mach-prima2/include/mach/isa-dma.h b/arch/arm/mach-prima2/include/mach/isa-dma.h >> + >> +#ifndef __MACH_PRIMA2_ISADMA_H >> +#define __MACH_PRIMA2_ISADMA_H >> + >> +#define MAX_DMA_CHANNELS 32 >> + >> +#endif > > Would it make sense to convert the DMA support on your platform to the > more modern dmaengine API? The old ISA DMA API is showing its age, and > will cause trouble when you want to support different DMA controllers > in a single kernel. sorry for my fault of selecting ISA_DMA . we don't need that at all. > >> diff --git a/arch/arm/mach-prima2/include/mach/map.h b/arch/arm/mach-prima2/include/mach/map.h >> new file mode 100644 >> index 0000000..9a3ad94 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/map.h >> + >> +#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000)) >> + >> +/* INTR */ >> +#define SIRFSOC_INTR_PA_BASE 0x80020000 >> +#define SIRFSOC_INTR_VA_BASE SIRFSOC_VA(0x002000) >> +#define SIRFSOC_INTR_SIZE SZ_4K >> + >> +/* L2 CACHE */ >> +#define SIRFSOC_L2CC_PA_BASE 0x80040000 >> +#define SIRFSOC_L2CC_VA_BASE SIRFSOC_VA(0x004000) >> +#define SIRFSOC_L2CC_SIZE SZ_4K >> + >> +/* CLOCK */ >> +#define SIRFSOC_CLOCK_PA_BASE 0x88000000 >> +#define SIRFSOC_CLOCK_VA_BASE SIRFSOC_VA(0x005000) >> +#define SIRFSOC_CLOCK_SIZE SZ_4K >> + >> +/* RESET CONTROLLER */ >> +#define SIRFSOC_RSTC_PA_BASE 0x88010000 >> +#define SIRFSOC_RSTC_VA_BASE SIRFSOC_VA(0x006000) >> +#define SIRFSOC_RSTC_SIZE SZ_4K >> + >> +/* OS TIMER */ >> +#define SIRFSOC_TIMER_PA_BASE 0xb0020000 >> +#define SIRFSOC_TIMER_VA_BASE SIRFSOC_VA(0x00c000) >> +#define SIRFSOC_TIMER_SIZE SZ_4K >> + >> +/* UART-1: used as serial debug port */ >> +#define SIRFSOC_UART1_PA_BASE 0xb0060000 >> +#define SIRFSOC_UART1_VA_BASE SIRFSOC_VA(0x060000) >> +#define SIRFSOC_UART1_SIZE SZ_4K >> + >> +/* RAM BASE*/ >> +#define SIRFSOC_SDRAM_PA 0x00000000 >> + >> +#endif > > I think these should all be converted into device tree properties if > possible. Anything that can be initialized late enough should just > do an ioremap at the time when you first need to access the registers. i totally agree with your opinion. but i guess SIRFSOC_UART1_PA_BASE/SIRFSOC_UART1_VA_BASE is necessary here since they are mapped very early for DEBUG_LL. i do find some patches about probing L2 cache and some other things by DT. i can provide them by DT and don't map them until we access them. but it seems a static io table is pretty simple for some low level hardwares. Another issue is that .init_early(fot this case, it is sirfsoc_init_clk) is called earlier than kernel mm init and later than .map_io(for this case, it is sirfsoc_map_io), the early static mapping makes .init_early can access mapped virtual memory too. > > For the L2 cache, Rob already posted a binding, so best work with him > on that one. agree > >> +/* >> + * Restrict DMA-able region to workaround silicon limitation. >> + * The limitation restricts buffers available for DMA to SD/MMC >> + * hardware to be below 256MB >> + */ >> +#define ARM_DMA_ZONE_SIZE (SZ_256M) >> + > > This is very unfortunate, but I guess there is no real way to avoid > doing this, right? a hardware issue limits DMA address must be less than 256MB for SD controller. to make sure SD controller get DMA buffer below 256MB, we need that DMA zone. But guess the size of the zone doesn't matter at all, it even can be 1MB, 2MB or any value less than 256MB. Anyway, we only need a DMA buffer for SD. if we reserve an area for SD DMA buffer, it seems ugly too? > >> +static void sirfsoc_irq_mask(struct irq_data *d) >> +{ >> + unsigned long mask; >> + >> + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) & >> + ~(1 << ( d->irq % 32)); >> + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); >> +} > > Better use readl_relaxed here than __raw_readl. Agree > > >> +/* timer0 interrupt handler */ >> +static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id) >> +{ >> + struct clock_event_device *ce = dev_id; >> + >> + WARN_ON(!(__raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS) & BIT(0))); >> + >> + /* clear timer0 interrupt */ >> + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); > > Here, too. Agree. > > Arnd > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
On Wednesday 22 June 2011, Barry Song wrote: > > > > The "compatible" properties should really be more specific than this. You can > > list multiple alternatives in there, but please always have one that identifies > > the exact version of each of the macros uniquely. > > i guess you mean compatible = "sirf,uart", "sirf,prima2-uart", > "sirf,altas6-uart" ? It depends on how specific prima2 and atlas6 really are. Are these specific pieces of silicon, or are they each a family of similar chips? Is one a superset of the other? If your device tree describes a board with a prima2 SoC on it, and all prima2 chips are identical, then ("sirf,uart", "sirf,prima2-uart") is fine. If prima2 is itself a family of chips, you should add a third entry like "sirf,prima2-1234-uart" where 1234 is the model number of that chip. My understanding is that prima2 and atlas6 are two separate chips, so you should not list them both in one device tree. If your hardware design team has an official nomenclature for different versions of the uart macro, you can also add that. E.g. if prima1 and atlas5 use version 3.1 of the uart, while prima2 and atlas6 use version 3.2, you can list that version too. A driver can then match on the uart version and doesn't have to know about the soc it's used in. This depends on how your hardware design team works. Also, if you buy hardware macros from other companies, it's useful to list those in the compatible property as well, to let the same driver automatically work across SoCs from multiple vendors that have licensed the same core, like you do for the ARM l2 cache controller. > > Do you have any PCI or PCMCIA devices? > > we do have an internal PCI bridge. but it seems it is completely > transparent to users and softwares just like we have no PCI bridge at > all. > anyway, i need the final confirmation from IC guys. I don't completely understand. If you have actual PCI devices with a proper configuration space in the system, I would strongly suggest that you export the PCI host bridge instead of the individual devices and let the PCI probing code take care of that. Using hardware probing mechanisms is normally preferred, because it means you don't have to list every device in the device tree. > Most platforms without PCI define io.h by giving a simple comment > "We don't actually have real ISA nor PCI buses, but there is so many > drivers out there that might just work if we fake them...". It's on my list to look into. > >> --- /dev/null > >> +++ b/arch/arm/mach-prima2/include/mach/map.h > >> + > >> +#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000)) > >> + > >> +/* INTR */ > >> +#define SIRFSOC_INTR_PA_BASE 0x80020000 > >> +#define SIRFSOC_INTR_VA_BASE SIRFSOC_VA(0x002000) > >> +#define SIRFSOC_INTR_SIZE SZ_4K > >> + > >> +/* L2 CACHE */ > >> +#define SIRFSOC_L2CC_PA_BASE 0x80040000 > >> +#define SIRFSOC_L2CC_VA_BASE SIRFSOC_VA(0x004000) > >> +#define SIRFSOC_L2CC_SIZE SZ_4K > >> + > >> +/* CLOCK */ > >> +#define SIRFSOC_CLOCK_PA_BASE 0x88000000 > >> +#define SIRFSOC_CLOCK_VA_BASE SIRFSOC_VA(0x005000) > >> +#define SIRFSOC_CLOCK_SIZE SZ_4K > >> + > >> +/* RESET CONTROLLER */ > >> +#define SIRFSOC_RSTC_PA_BASE 0x88010000 > >> +#define SIRFSOC_RSTC_VA_BASE SIRFSOC_VA(0x006000) > >> +#define SIRFSOC_RSTC_SIZE SZ_4K > >> + > >> +/* OS TIMER */ > >> +#define SIRFSOC_TIMER_PA_BASE 0xb0020000 > >> +#define SIRFSOC_TIMER_VA_BASE SIRFSOC_VA(0x00c000) > >> +#define SIRFSOC_TIMER_SIZE SZ_4K > >> + > >> +/* UART-1: used as serial debug port */ > >> +#define SIRFSOC_UART1_PA_BASE 0xb0060000 > >> +#define SIRFSOC_UART1_VA_BASE SIRFSOC_VA(0x060000) > >> +#define SIRFSOC_UART1_SIZE SZ_4K > >> + > >> +/* RAM BASE*/ > >> +#define SIRFSOC_SDRAM_PA 0x00000000 > >> + > >> +#endif > > > > I think these should all be converted into device tree properties if > > possible. Anything that can be initialized late enough should just > > do an ioremap at the time when you first need to access the registers. > > i totally agree with your opinion. but i guess > SIRFSOC_UART1_PA_BASE/SIRFSOC_UART1_VA_BASE is necessary here since > they are mapped very early for DEBUG_LL. Please make that code optional and dependent on CONFIG_DEBUG_LL then. I would also recommend splitting out all code related to DEBUG_LL into one separate patch so we can look at the base code independent of that. I believe we already have a problem with DEBUG_LL as soon as we get to multi-platform kernels. > Another issue is that .init_early(fot this case, it is > sirfsoc_init_clk) is called earlier than kernel mm init and later > than .map_io(for this case, it is sirfsoc_map_io), the early static > mapping makes .init_early can access mapped virtual memory too. But does sirfsoc_init_clk have to be called from init_early, or can you do it a bit later? > >> +/* > >> + * Restrict DMA-able region to workaround silicon limitation. > >> + * The limitation restricts buffers available for DMA to SD/MMC > >> + * hardware to be below 256MB > >> + */ > >> +#define ARM_DMA_ZONE_SIZE (SZ_256M) > >> + > > > > This is very unfortunate, but I guess there is no real way to avoid > > doing this, right? > > a hardware issue limits DMA address must be less than 256MB for SD > controller. to make sure SD controller get DMA buffer below 256MB, we > need that DMA zone. > But guess the size of the zone doesn't matter at all, it even can be > 1MB, 2MB or any value less than 256MB. Anyway, we only need a DMA > buffer for SD. > if we reserve an area for SD DMA buffer, it seems ugly too? Probably yes, it would also make the I/O slower because then you have to alway do bounce-buffering, while now you only have to do it when the user buffer is above 256 MB. You should definitely make sure that the SD device has the correct dma_mask set, which is required for correctness, while the right ARM_DMA_ZONE_SIZE is more a question of performance. When we get to multi-platform kernels, we can then just set the minimum of the configured platforms. Arnd
On Wed, Jun 22, 2011 at 1:36 AM, Barry Song <21cnbao@gmail.com> wrote: > so the problem still need to be solved since device names coming from DT is not > that much "stable" as statically registered devices. the name from DT > isn't the same > as what board support code currently uses for statically registered > platform_devices. > > Grant has two threads for this: > 1. of: add clock providers to provide clk mapping in DT > http://www.mail-archive.com/devicetree-discuss@lists.ozlabs.org/msg03016.html > 2. " If Linux needs specific devices to have specific names, then it > can pass in a lookup table that matches DT nodes to device names, > which is considerably simpler and it leaves the platform setup code in > control over how devices get instantiated." > > both seems not ready yet? I'm planning to merge the auxdata patch (thread 2 above) into linux-next in a couple of days. When I push out that branch, it can be merged into the subarch tree before picking up the sirfprimall support patch (assuming it gets picked up for v3.1) g.
2011/6/22 Arnd Bergmann <arnd@arndb.de>: > On Wednesday 22 June 2011, Barry Song wrote: >> > >> > The "compatible" properties should really be more specific than this. You can >> > list multiple alternatives in there, but please always have one that identifies >> > the exact version of each of the macros uniquely. >> >> i guess you mean compatible = "sirf,uart", "sirf,prima2-uart", >> "sirf,altas6-uart" ? > > It depends on how specific prima2 and atlas6 really are. Are these specific > pieces of silicon, or are they each a family of similar chips? Is one a superset > of the other? they are two different chips sharing many same IP cores. uart should be one. Comparing with PrimaII, the updated IP of Atlas6 include usb controller, cortexA9, ECC, and new IP include graphics. > > If your device tree describes a board with a prima2 SoC on it, and all prima2 > chips are identical, then ("sirf,uart", "sirf,prima2-uart") is fine. If > prima2 is itself a family of chips, you should add a third entry like > "sirf,prima2-1234-uart" where 1234 is the model number of that chip. i guess we can use ("sirf,uart", "sirf,prima2-uart", "sirf,prima2-1500-uart") for the moment. > > My understanding is that prima2 and atlas6 are two separate chips, so you > should not list them both in one device tree. > > If your hardware design team has an official nomenclature for different > versions of the uart macro, you can also add that. E.g. if prima1 and atlas5 > use version 3.1 of the uart, while prima2 and atlas6 use version 3.2, you > can list that version too. A driver can then match on the uart version > and doesn't have to know about the soc it's used in. This depends on how > your hardware design team works. > > Also, if you buy hardware macros from other companies, it's useful to > list those in the compatible property as well, to let the same driver > automatically work across SoCs from multiple vendors that have licensed > the same core, like you do for the ARM l2 cache controller. > >> > Do you have any PCI or PCMCIA devices? >> >> we do have an internal PCI bridge. but it seems it is completely >> transparent to users and softwares just like we have no PCI bridge at >> all. >> anyway, i need the final confirmation from IC guys. > > I don't completely understand. If you have actual PCI devices with a > proper configuration space in the system, I would strongly suggest that > you export the PCI host bridge instead of the individual devices and > let the PCI probing code take care of that. > > Using hardware probing mechanisms is normally preferred, because it > means you don't have to list every device in the device tree. Due to history reasons, SD controller is using ip core with pci interface. and its configuration is hard-coded in IC directly. and PrimaII doesn't support external pci devices too. PCI configuration and signals of SD are invisible to users and software at all. to software, we can't see anything related with pci from SD. when we are accessing sd controller, it looks like we are just accessing normal memory bus. The DMA limitation of 256MB is also due to the design of internal PCI bridge. the bridge only can cover below 256MB. > >> Most platforms without PCI define io.h by giving a simple comment >> "We don't actually have real ISA nor PCI buses, but there is so many >> drivers out there that might just work if we fake them...". > > It's on my list to look into. Great. > >> >> --- /dev/null >> >> +++ b/arch/arm/mach-prima2/include/mach/map.h >> >> + >> >> +#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000)) >> >> + >> >> +/* INTR */ >> >> +#define SIRFSOC_INTR_PA_BASE 0x80020000 >> >> +#define SIRFSOC_INTR_VA_BASE SIRFSOC_VA(0x002000) >> >> +#define SIRFSOC_INTR_SIZE SZ_4K >> >> + >> >> +/* L2 CACHE */ >> >> +#define SIRFSOC_L2CC_PA_BASE 0x80040000 >> >> +#define SIRFSOC_L2CC_VA_BASE SIRFSOC_VA(0x004000) >> >> +#define SIRFSOC_L2CC_SIZE SZ_4K >> >> + >> >> +/* CLOCK */ >> >> +#define SIRFSOC_CLOCK_PA_BASE 0x88000000 >> >> +#define SIRFSOC_CLOCK_VA_BASE SIRFSOC_VA(0x005000) >> >> +#define SIRFSOC_CLOCK_SIZE SZ_4K >> >> + >> >> +/* RESET CONTROLLER */ >> >> +#define SIRFSOC_RSTC_PA_BASE 0x88010000 >> >> +#define SIRFSOC_RSTC_VA_BASE SIRFSOC_VA(0x006000) >> >> +#define SIRFSOC_RSTC_SIZE SZ_4K >> >> + >> >> +/* OS TIMER */ >> >> +#define SIRFSOC_TIMER_PA_BASE 0xb0020000 >> >> +#define SIRFSOC_TIMER_VA_BASE SIRFSOC_VA(0x00c000) >> >> +#define SIRFSOC_TIMER_SIZE SZ_4K >> >> + >> >> +/* UART-1: used as serial debug port */ >> >> +#define SIRFSOC_UART1_PA_BASE 0xb0060000 >> >> +#define SIRFSOC_UART1_VA_BASE SIRFSOC_VA(0x060000) >> >> +#define SIRFSOC_UART1_SIZE SZ_4K >> >> + >> >> +/* RAM BASE*/ >> >> +#define SIRFSOC_SDRAM_PA 0x00000000 >> >> + >> >> +#endif >> > >> > I think these should all be converted into device tree properties if >> > possible. Anything that can be initialized late enough should just >> > do an ioremap at the time when you first need to access the registers. >> >> i totally agree with your opinion. but i guess >> SIRFSOC_UART1_PA_BASE/SIRFSOC_UART1_VA_BASE is necessary here since >> they are mapped very early for DEBUG_LL. > > Please make that code optional and dependent on CONFIG_DEBUG_LL then. > > I would also recommend splitting out all code related to DEBUG_LL > into one separate patch so we can look at the base code independent > of that. uart for DEBUG_LL require mapping twice. one in head.S, the other one in .map_io for static mapping. i can let the static mapping as the seperate patch. > > I believe we already have a problem with DEBUG_LL as soon as we get > to multi-platform kernels. > >> Another issue is that .init_early(fot this case, it is >> sirfsoc_init_clk) is called earlier than kernel mm init and later >> than .map_io(for this case, it is sirfsoc_map_io), the early static >> mapping makes .init_early can access mapped virtual memory too. > > But does sirfsoc_init_clk have to be called from init_early, or can > you do it a bit later? The sequence is temp mapping of DEBUG uart in head.S -> kernel paging_init() -> static mapping of .map_io(build new mapping for uart) -> .init_early(prepare clock which .timer will access for this case) -> kernel mm init -> .timer -> arch_initcall between mm init and .timer, there are irq/prio_tree init, both seem not the right place to prepare clock. if i can move clock init behind mm init, ioremap should be ok. Then make codes ugly. For other cases, some boards maybe use init_early to prepare some other things. and they maybe access virtual memory too. > >> >> +/* >> >> + * Restrict DMA-able region to workaround silicon limitation. >> >> + * The limitation restricts buffers available for DMA to SD/MMC >> >> + * hardware to be below 256MB >> >> + */ >> >> +#define ARM_DMA_ZONE_SIZE (SZ_256M) >> >> + >> > >> > This is very unfortunate, but I guess there is no real way to avoid >> > doing this, right? >> >> a hardware issue limits DMA address must be less than 256MB for SD >> controller. to make sure SD controller get DMA buffer below 256MB, we >> need that DMA zone. >> But guess the size of the zone doesn't matter at all, it even can be >> 1MB, 2MB or any value less than 256MB. Anyway, we only need a DMA >> buffer for SD. >> if we reserve an area for SD DMA buffer, it seems ugly too? > > Probably yes, it would also make the I/O slower because then you have > to alway do bounce-buffering, while now you only have to do it when > the user buffer is above 256 MB. > > You should definitely make sure that the SD device has the correct > dma_mask set, which is required for correctness, while the right > ARM_DMA_ZONE_SIZE is more a question of performance. When we get to > multi-platform kernels, we can then just set the minimum of the > configured platforms. yes. we should have right dma masking to 256MB. Anyway, DMA bouncing is required since data buffers are from filesystem, and they might be above 256MB. I guess we can define the zone size to 1MB for SiRFPrimaII, then result in less chance to cross normal and dma zone? > > Arnd >
On Thursday 23 June 2011 09:42:01 Barry Song wrote: > 2011/6/22 Arnd Bergmann <arnd@arndb.de>: > > On Wednesday 22 June 2011, Barry Song wrote: > > If your device tree describes a board with a prima2 SoC on it, and all prima2 > > chips are identical, then ("sirf,uart", "sirf,prima2-uart") is fine. If > > prima2 is itself a family of chips, you should add a third entry like > > "sirf,prima2-1234-uart" where 1234 is the model number of that chip. > > i guess we can use ("sirf,uart", "sirf,prima2-uart", > "sirf,prima2-1500-uart") for the moment. Ok. > > > > I don't completely understand. If you have actual PCI devices with a > > proper configuration space in the system, I would strongly suggest that > > you export the PCI host bridge instead of the individual devices and > > let the PCI probing code take care of that. > > > > Using hardware probing mechanisms is normally preferred, because it > > means you don't have to list every device in the device tree. > > Due to history reasons, SD controller is using ip core with pci > interface. and its configuration is hard-coded in IC directly. and > PrimaII doesn't support external pci devices too. PCI configuration > and signals of SD are invisible to users and software at all. to > software, we can't see anything related with pci from SD. when we are > accessing sd controller, it looks like we are just accessing normal > memory bus. > > The DMA limitation of 256MB is also due to the design of internal PCI > bridge. the bridge only can cover below 256MB. Ok. As a feedback to the hardware designers, maybe you can tell them that we would very much appreciate being able to probe devices by looking at hardware registers instead of having to hardcode device locations for every single board. PCI config space is a well-established way to do that, so if you already use PCI components it would be nice to make them visible and compliant. Obviously, it would also be really nice to not have to worry about arbitrary restrictions in DMA addresses. > > I believe we already have a problem with DEBUG_LL as soon as we get > > to multi-platform kernels. > > > >> Another issue is that .init_early(fot this case, it is > >> sirfsoc_init_clk) is called earlier than kernel mm init and later > >> than .map_io(for this case, it is sirfsoc_map_io), the early static > >> mapping makes .init_early can access mapped virtual memory too. > > > > But does sirfsoc_init_clk have to be called from init_early, or can > > you do it a bit later? > > The sequence is > > temp mapping of DEBUG uart in head.S -> kernel paging_init() -> static > mapping of .map_io(build new mapping for uart) -> > .init_early(prepare clock which .timer will access for this case) -> > kernel mm init -> .timer -> arch_initcall > > between mm init and .timer, there are irq/prio_tree init, both seem > not the right place to prepare clock. if i can move clock init behind > mm init, ioremap should be ok. Then make codes ugly. Ok, I see. I wonder if this is getting better with the common clk handling. > > Probably yes, it would also make the I/O slower because then you have > > to alway do bounce-buffering, while now you only have to do it when > > the user buffer is above 256 MB. > > > > You should definitely make sure that the SD device has the correct > > dma_mask set, which is required for correctness, while the right > > ARM_DMA_ZONE_SIZE is more a question of performance. When we get to > > multi-platform kernels, we can then just set the minimum of the > > configured platforms. > > yes. we should have right dma masking to 256MB. Anyway, DMA bouncing > is required since data buffers are from filesystem, and they might be > above 256MB. Bouncing will only be performed for pages that are actually over the limit, see __blk_queue_bounce(). If a system doesn't have over 256 MB, there will be no bouncing at all. > I guess we can define the zone size to 1MB for SiRFPrimaII, then > result in less chance to cross normal and dma zone? I don't see how that would help. Just leave it at 256 MB to give the allocator the most room. Arnd
2011/6/22 Russell King - ARM Linux <linux@arm.linux.org.uk>: > Some comments inline, nothing really serious... > > On Mon, Jun 20, 2011 at 12:53:22AM -0700, Barry Song wrote: >> +config ARCH_PRIMA2 >> + bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" >> + select CPU_V7 >> + select GENERIC_TIME >> + select GENERIC_CLOCKEVENTS >> + select CLKDEV_LOOKUP >> + select USE_OF >> + select ISA_DMA_API > > Do you really provide the old ISA DMA API? Unless you're intending to use > existing ISA drivers with their ISA DMA, you shouldn't define this. > >> diff --git a/arch/arm/Makefile b/arch/arm/Makefile >> index f5b2b39..79e6edf 100644 >> --- a/arch/arm/Makefile >> +++ b/arch/arm/Makefile >> @@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_VEXPRESS) := vexpress >> machine-$(CONFIG_ARCH_VT8500) := vt8500 >> machine-$(CONFIG_ARCH_W90X900) := w90x900 >> machine-$(CONFIG_ARCH_NUC93X) := nuc93x >> +machine-$(CONFIG_ARCH_PRIMA2) := prima2 > > The comment at the start of this list says: > > # Machine directory name. This list is sorted alphanumerically > # by CONFIG_* macro name. > > and I thank the NUC93x people for also missing it. Please ignore the > NUC93x entry and place yours appropriately. > >> diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts >> new file mode 100644 >> index 0000000..6e8b17c >> --- /dev/null >> +++ b/arch/arm/boot/dts/prima2-cb.dts >> @@ -0,0 +1,44 @@ >> +/dts-v1/; >> +/ { >> + model = "SIRF Prima2 EVB"; >> + compatible = "sirf,prima2-cb", "sirf,prima2"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + interrupt-parent = <&intc>; >> + >> + memory { >> + reg = <0x00000000 0x20000000>; >> + }; >> + >> + chosen { >> + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS1 earlyprintk"; >> + linux,stdout-path = &uart1; >> + }; >> + >> + amba { > > You declare that you have an AMBA bus, does it have primcells on it? > Should you be selecting ARM_AMBA in your kconfig? Russell, the chip has no primecells on it. And it seems we don't need ARM_AMBA. PrimaII uses AXI protocol, but has no AMBA IP controller. and many IP are self-defined. Nothing in the chip really has AMBA periph id. its layout is like AXI(0-0x3FFFFFFF) memory AXI(0x40000000-0xC0000000) CPUIF(sirf-iobus) INTC MEMC LCD VPP GRAPHIC MULTIMEDIA GPS UART ... hard-coded PCI bridge SD/MMC rtc-iobrg RTC > >> diff --git a/arch/arm/mach-prima2/include/mach/entry-macro.S b/arch/arm/mach-prima2/include/mach/entry-macro.S >> new file mode 100644 >> index 0000000..af5611b >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/entry-macro.S >> @@ -0,0 +1,28 @@ >> +/* >> + * arch/arm/mach-prima2/include/mach/entry-macro.S >> + * >> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. >> + * >> + * Licensed under GPLv2 or later. >> + */ >> + >> +#include <mach/hardware.h> >> + >> +#define SIRFSOC_INT_ID 0x38 >> + >> + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp >> + ldr \base, =SIRFSOC_INTR_VA_BASE > > Consider using get_irqnr_preamble to load the base address only once per > IRQ exception. > >> diff --git a/arch/arm/mach-prima2/include/mach/isa-dma.h b/arch/arm/mach-prima2/include/mach/isa-dma.h >> new file mode 100644 >> index 0000000..f07e264 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/isa-dma.h >> @@ -0,0 +1,14 @@ >> +/* >> + * arch/arm/mach-prima2/include/mach/io.h >> + * >> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. >> + * >> + * Licensed under GPLv2 or later. >> + */ >> + >> +#ifndef __MACH_PRIMA2_ISADMA_H >> +#define __MACH_PRIMA2_ISADMA_H >> + >> +#define MAX_DMA_CHANNELS 32 >> + >> +#endif > > You don't need this if you don't define ISA_DMA_API. > >> diff --git a/arch/arm/mach-prima2/include/mach/uncompress.h b/arch/arm/mach-prima2/include/mach/uncompress.h >> new file mode 100644 >> index 0000000..e08d7b8 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/include/mach/uncompress.h >> @@ -0,0 +1,42 @@ >> +/* >> + * arch/arm/mach-prima2/include/mach/uncompress.h >> + * >> + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. >> + * >> + * Licensed under GPLv2 or later. >> + */ >> + >> +#ifndef __ASM_ARCH_UNCOMPRESS_H >> +#define __ASM_ARCH_UNCOMPRESS_H >> + >> +#include <linux/bitops.h> >> +#include <linux/io.h> >> +#include <asm/processor.h> >> +#include <mach/hardware.h> >> +#include <mach/uart.h> > > If you include all that, then you're in for problems with the decompressor. > The decompressor is a _really_ limited environment, and most stuff from > linux/ or platfform stuff will not be available. > >> diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c >> new file mode 100644 >> index 0000000..af65481 >> --- /dev/null >> +++ b/arch/arm/mach-prima2/irq.c >> @@ -0,0 +1,81 @@ > ... >> +#define SIRFSOC_INT_PENDING0 0x0000 >> +#define SIRFSOC_INT_PENDING1 0x0004 >> +#define SIRFSOC_INT_IRQ_PENDING0 0x0008 >> +#define SIRFSOC_INT_IRQ_PENDING1 0x000C >> +#define SIRFSOC_INT_FIQ_PENDING0 0x0010 >> +#define SIRFSOC_INT_FIQ_PENDING1 0x0014 >> +#define SIRFSOC_INT_RISC_MASK0 0x0018 >> +#define SIRFSOC_INT_RISC_MASK1 0x001C >> +#define SIRFSOC_INT_RISC_LEVEL0 0x0020 >> +#define SIRFSOC_INT_RISC_LEVEL1 0x0024 >> + >> +static void sirfsoc_irq_ack(struct irq_data *d) >> +{ >> +} >> + >> +static void sirfsoc_irq_mask(struct irq_data *d) >> +{ >> + unsigned long mask; >> + >> + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) & >> + ~(1 << ( d->irq % 32)); >> + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); >> +} >> + >> +static void sirfsoc_irq_unmask(struct irq_data *d) >> +{ >> + unsigned long mask; >> + >> + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) | >> + (1 << ( d->irq % 32)); >> + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); >> +} >> + >> +int sirfsoc_irq_settype(struct irq_data *d, unsigned int type) >> +{ >> + /* >> + * Interrupt handler doesnt support setting trigger type >> + */ >> + if (type == IRQ_TYPE_NONE) >> + return 0; >> + >> + return -EINVAL; >> +} >> + >> +static struct irq_chip sirfsoc_irq_chip = { >> + .name = "SiRF SoC", >> + .irq_ack = sirfsoc_irq_ack, >> + .irq_mask = sirfsoc_irq_mask, >> + .irq_unmask = sirfsoc_irq_unmask, >> + .irq_set_type = sirfsoc_irq_settype, >> +}; > > Can you use the recently introduced generic irqchips stuff for this? > >> diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c >> new file mode 100644 >> index 0000000..f73928f >> --- /dev/null >> +++ b/arch/arm/mach-prima2/timer.c >> @@ -0,0 +1,181 @@ > ... >> +/* initialize the kernel jiffy timer source */ >> +static void __init sirfsoc_timer_init(void) >> +{ >> + unsigned long rate; >> + /* timer's input clock is io clock */ >> + struct clk *clk = clk_get(NULL, "io"); > > Rather than going down this broken path of specifying clock names as > connection IDs, it would be better to obtain it by function: > struct clk *clk = clk_get_sys("timer", NULL); > > Experience shows that people think that naming the clock signals themselves > and passing strings around to drivers is easier. After a few years they > find that what they thought was easy, is actually inflexible and has > become a huge problem which they need to rework. (Samsung folk are > currently going through this pain.) > > So please, don't fall into the trap of "lets give each clock signal a name > and look up only by clock name". Use the device names as the primary > matching and don't allow yourself to get into the trap of passing clock > names around. > >> + >> + BUG_ON(IS_ERR_OR_NULL(clk)); > > BUG_ON(IS_ERR(clk)); > > If clk_get() may return NULL, then clk_get_rate() should be able to eat > that value without choking. > >> + >> + rate = clk_get_rate(clk); >> + clk_put(clk); > > It's much preferable not to clk_put() a clock which you're going to > continue using. > >> + >> + BUG_ON(rate < CLOCK_TICK_RATE); >> + BUG_ON(rate % CLOCK_TICK_RATE); >> + >> + __raw_writel(rate / CLOCK_TICK_RATE / 2 - 1, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_DIV); >> + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_LO); >> + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_HI); >> + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); >> + >> + if (clocksource_register_hz(&sirfsoc_clocksource, CLOCK_TICK_RATE)) >> + BUG(); > > Confused. CLOCK_TICK_RATE is defined to be 100 * HZ, so 10kHz. Do > your timers really tick at 10kHz? That seems needlessly slow for a > 64-bit counter. Also consider BUG_ON() > >> + >> + if (setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq)) >> + BUG(); > > BUG_ON() here too. > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9adc278..7a0ce78 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -879,6 +879,19 @@ config ARCH_VT8500 select HAVE_PWM help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. + +config ARCH_PRIMA2 + bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" + select CPU_V7 + select GENERIC_TIME + select GENERIC_CLOCKEVENTS + select CLKDEV_LOOKUP + select USE_OF + select ISA_DMA_API + select ZONE_DMA + help + Support for CSR SiRFSoC ARM Cortex A9 Platform + endchoice # diff --git a/arch/arm/Makefile b/arch/arm/Makefile index f5b2b39..79e6edf 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -191,6 +191,7 @@ machine-$(CONFIG_ARCH_VEXPRESS) := vexpress machine-$(CONFIG_ARCH_VT8500) := vt8500 machine-$(CONFIG_ARCH_W90X900) := w90x900 machine-$(CONFIG_ARCH_NUC93X) := nuc93x +machine-$(CONFIG_ARCH_PRIMA2) := prima2 machine-$(CONFIG_FOOTBRIDGE) := footbridge machine-$(CONFIG_MACH_SPEAR300) := spear3xx machine-$(CONFIG_MACH_SPEAR310) := spear3xx diff --git a/arch/arm/boot/dts/prima2-cb.dts b/arch/arm/boot/dts/prima2-cb.dts new file mode 100644 index 0000000..6e8b17c --- /dev/null +++ b/arch/arm/boot/dts/prima2-cb.dts @@ -0,0 +1,44 @@ +/dts-v1/; +/ { + model = "SIRF Prima2 EVB"; + compatible = "sirf,prima2-cb", "sirf,prima2"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + memory { + reg = <0x00000000 0x20000000>; + }; + + chosen { + bootargs = "mem=512M real_root=/dev/mmcblk0p2 console=ttyS1 earlyprintk"; + linux,stdout-path = &uart1; + }; + + amba { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + intc: interrupt-controller@0x80020000 { + interrupt-controller; + compatible = "arm,sirfsoc"; + reg = <0x80020000 0x1000>; + #interrupt-cells = <1>; + }; + + uart0: uart@0xb0050000 { + compatible = "sirf,uart"; + reg = <0xb0050000 0x1000>; + interrupts = <17>; + }; + + uart1: uart@0xb0060000 { + compatible = "sirf,uart"; + reg = <0xb0060000 0x1000>; + interrupts = <18>; + }; + }; +}; + diff --git a/arch/arm/mach-prima2/Makefile b/arch/arm/mach-prima2/Makefile new file mode 100644 index 0000000..c51d60d --- /dev/null +++ b/arch/arm/mach-prima2/Makefile @@ -0,0 +1 @@ +obj-y := timer.o irq.o clock.o common.o board_dt.o diff --git a/arch/arm/mach-prima2/Makefile.boot b/arch/arm/mach-prima2/Makefile.boot new file mode 100644 index 0000000..d023db3 --- /dev/null +++ b/arch/arm/mach-prima2/Makefile.boot @@ -0,0 +1,3 @@ +zreladdr-y := 0x00008000 +params_phys-y := 0x00000100 +initrd_phys-y := 0x00800000 diff --git a/arch/arm/mach-prima2/board_dt.c b/arch/arm/mach-prima2/board_dt.c new file mode 100644 index 0000000..0994287 --- /dev/null +++ b/arch/arm/mach-prima2/board_dt.c @@ -0,0 +1,28 @@ +/* + * This file contains code for boards with device tree support. + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <linux/of.h> +#include <asm/mach/arch.h> +#include <asm/mach-types.h> +#include <mach/hardware.h> +#include "common.h" + +static const char *prima2cb_dt_match[] __initdata = { + "sirf,prima2-cb", + NULL +}; + +MACHINE_START(PRIMA2_EVB, "prima2cb") + .boot_params = SIRFSOC_SDRAM_PA + 0x100, + .init_early = sirfsoc_init_clk, + .map_io = sirfsoc_map_io, + .init_irq = sirfsoc_init_irq, + .timer = &sirfsoc_timer, + .init_machine = sirfsoc_mach_init, + .dt_compat = prima2cb_dt_match, +MACHINE_END diff --git a/arch/arm/mach-prima2/clock.c b/arch/arm/mach-prima2/clock.c new file mode 100644 index 0000000..a879fbf --- /dev/null +++ b/arch/arm/mach-prima2/clock.c @@ -0,0 +1,474 @@ +/* + * Clock tree for CSR SiRFprimaII + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <linux/module.h> +#include <linux/bitops.h> +#include <linux/err.h> +#include <linux/errno.h> +#include <linux/io.h> +#include <linux/clkdev.h> +#include <linux/clk.h> +#include <linux/spinlock.h> +#include <mach/map.h> + +#define SIRFSOC_CLKC_CLK_EN0 0x0000 +#define SIRFSOC_CLKC_CLK_EN1 0x0004 +#define SIRFSOC_CLKC_REF_CFG 0x0014 +#define SIRFSOC_CLKC_CPU_CFG 0x0018 +#define SIRFSOC_CLKC_MEM_CFG 0x001c +#define SIRFSOC_CLKC_SYS_CFG 0x0020 +#define SIRFSOC_CLKC_IO_CFG 0x0024 +#define SIRFSOC_CLKC_DSP_CFG 0x0028 +#define SIRFSOC_CLKC_GFX_CFG 0x002c +#define SIRFSOC_CLKC_MM_CFG 0x0030 +#define SIRFSOC_LKC_LCD_CFG 0x0034 +#define SIRFSOC_CLKC_MMC_CFG 0x0038 +#define SIRFSOC_CLKC_PLL1_CFG0 0x0040 +#define SIRFSOC_CLKC_PLL2_CFG0 0x0044 +#define SIRFSOC_CLKC_PLL3_CFG0 0x0048 +#define SIRFSOC_CLKC_PLL1_CFG1 0x004c +#define SIRFSOC_CLKC_PLL2_CFG1 0x0050 +#define SIRFSOC_CLKC_PLL3_CFG1 0x0054 +#define SIRFSOC_CLKC_PLL1_CFG2 0x0058 +#define SIRFSOC_CLKC_PLL2_CFG2 0x005c +#define SIRFSOC_CLKC_PLL3_CFG2 0x0060 + +#define KHZ 1000 +#define MHZ (KHZ * KHZ) + +struct clk_ops { + unsigned long (*get_rate)(struct clk *clk); + long (*round_rate)(struct clk *clk, unsigned long rate); + int (*set_rate)(struct clk *clk, unsigned long rate); + int (*enable)(struct clk *clk); + int (*disable)(struct clk *clk); + struct clk *(*get_parent)(struct clk *clk); + int (*set_parent)(struct clk *clk, struct clk *parent); +}; + +struct clk { + struct clk *parent; /* parent clk */ + unsigned long rate; /* clock rate in Hz */ + signed char usage; /* clock enable count */ + signed char enable_bit; /* enable bit: 0 ~ 63 */ + unsigned short regofs; /* register offset */ + struct clk_ops *ops; /* clock operation */ +}; + +static DEFINE_SPINLOCK(clocks_lock); + +static inline unsigned long clkc_readl(unsigned reg) +{ + return readl(SIRFSOC_CLOCK_VA_BASE + reg); +} + +static inline void clkc_writel(u32 val, unsigned reg) +{ + writel(val, SIRFSOC_CLOCK_VA_BASE + reg); +} + +/* + * osc_rtc - real time oscillator - 32.768KHz + * osc_sys - high speed oscillator - 26MHz + */ + +static struct clk clk_rtc = { + .rate = 32768, +}; + +static struct clk clk_osc = { + .rate = 26 * MHZ, +}; + +/* + * std pll + */ +static unsigned long std_pll_get_rate(struct clk *clk) +{ + unsigned long fin = clk_get_rate(clk->parent); + u32 regcfg2 = clk->regofs + SIRFSOC_CLKC_PLL1_CFG2 - SIRFSOC_CLKC_PLL1_CFG0; + + if (clkc_readl(regcfg2) & BIT(2)) { + /* pll bypass mode */ + clk->rate = fin; + } else { + /* fout = fin * nf / nr / od */ + u32 cfg0 = clkc_readl(clk->regofs); + u32 nf = (cfg0 & (BIT(13) - 1)) + 1; + u32 nr = ((cfg0 >> 13) & (BIT(6) - 1)) + 1; + u32 od = ((cfg0 >> 19) & (BIT(4) - 1)) + 1; + WARN_ON(fin % MHZ); + clk->rate = fin / MHZ * nf / nr / od * MHZ; + } + + return clk->rate; +} + +static int std_pll_set_rate(struct clk *clk, unsigned long rate) +{ + unsigned long fin, nf, nr, od, reg; + + /* + * fout = fin * nf / (nr * od); + * set od = 1, nr = fin/MHz, so fout = nf * MHz + */ + + nf = rate / MHZ; + if (unlikely((rate % MHZ) || nf > BIT(13) || nf < 1)) + return -EINVAL; + + fin = clk_get_rate(clk->parent); + BUG_ON(fin < MHZ); + + nr = fin / MHZ; + BUG_ON((fin % MHZ) || nr > BIT(6)); + + od = 1; + + reg = (nf - 1) | ((nr - 1) << 13) | ((od - 1) << 19); + clkc_writel(reg, clk->regofs); + + reg = clk->regofs + SIRFSOC_CLKC_PLL1_CFG1 - SIRFSOC_CLKC_PLL1_CFG0; + clkc_writel((nf >> 1) - 1, reg); + + reg = clk->regofs + SIRFSOC_CLKC_PLL1_CFG2 - SIRFSOC_CLKC_PLL1_CFG0; + while (!(clkc_readl(reg) & BIT(6))) + cpu_relax(); + + clk->rate = 0; /* set to zero will force recalculation */ + return 0; +} + +static struct clk_ops std_pll_ops = { + .get_rate = std_pll_get_rate, + .set_rate = std_pll_set_rate, +}; + +static struct clk clk_pll1 = { + .parent = &clk_osc, + .regofs = SIRFSOC_CLKC_PLL1_CFG0, + .ops = &std_pll_ops, +}; + +static struct clk clk_pll2 = { + .parent = &clk_osc, + .regofs = SIRFSOC_CLKC_PLL2_CFG0, + .ops = &std_pll_ops, +}; + +static struct clk clk_pll3 = { + .parent = &clk_osc, + .regofs = SIRFSOC_CLKC_PLL3_CFG0, + .ops = &std_pll_ops, +}; + +/* + * clock domains - cpu, mem, sys/io + */ + +static struct clk clk_mem; + +static struct clk *dmn_get_parent(struct clk *clk) +{ + struct clk *clks[] = { + &clk_osc, &clk_rtc, &clk_pll1, &clk_pll2, &clk_pll3 + }; + u32 cfg = clkc_readl(clk->regofs); + WARN_ON((cfg & (BIT(3) - 1)) > 4); + return clks[cfg & (BIT(3) - 1)]; +} + +static int dmn_set_parent(struct clk *clk, struct clk *parent) +{ + const struct clk *clks[] = { + &clk_osc, &clk_rtc, &clk_pll1, &clk_pll2, &clk_pll3 + }; + u32 cfg = clkc_readl(clk->regofs); + int i; + for (i = 0; i < ARRAY_SIZE(clks); i++) { + if (clks[i] == parent) { + cfg &= ~(BIT(3) - 1); + clkc_writel(cfg | i, clk->regofs); + /* BIT(3) - switching status: 1 - busy, 0 - done */ + while (clkc_readl(clk->regofs) & BIT(3)) + cpu_relax(); + return 0; + } + } + return -EINVAL; +} + +static unsigned long dmn_get_rate(struct clk *clk) +{ + unsigned long fin = clk_get_rate(clk->parent); + u32 cfg = clkc_readl(clk->regofs); + if (cfg & BIT(24)) { + /* fcd bypass mode */ + clk->rate = fin; + } else { + /* + * wait count: bit[19:16], hold count: bit[23:20] + */ + u32 wait = (cfg >> 16) & (BIT(4) - 1); + u32 hold = (cfg >> 20) & (BIT(4) - 1); + + clk->rate = fin / (wait + hold + 2); + } + + return clk->rate; +} + +static int dmn_set_rate(struct clk *clk, unsigned long rate) +{ + unsigned long fin; + unsigned ratio, wait, hold, reg; + unsigned bits = (clk == &clk_mem) ? 3 : 4; + + fin = clk_get_rate(clk->parent); + ratio = fin / rate; + + if (unlikely(ratio < 2 || ratio > BIT(bits + 1))) + return -EINVAL; + + WARN_ON(fin % rate); + + wait = (ratio >> 1) - 1; + hold = ratio - wait - 2; + + reg = clkc_readl(clk->regofs); + reg &= ~(((BIT(bits) - 1) << 16) | ((BIT(bits) - 1) << 20)); + reg |= (wait << 16) | (hold << 20) | BIT(25); + clkc_writel(reg, clk->regofs); + + /* waiting FCD been effective */ + while (clkc_readl(clk->regofs) & BIT(25)) + cpu_relax(); + + clk->rate = 0; /* set to zero will force recalculation */ + + return 0; +} + +/* + * cpu clock has no FCD register in Prima2, can only change pll + */ +static int cpu_set_rate(struct clk *clk, unsigned long rate) +{ + int ret1, ret2; + struct clk *cur_parent, *tmp_parent; + + cur_parent = dmn_get_parent(clk); + BUG_ON(cur_parent == NULL || cur_parent->usage > 1); + + /* switch to tmp pll before setting parent clock's rate */ + tmp_parent = cur_parent == &clk_pll1 ? &clk_pll2 : &clk_pll1; + ret1 = dmn_set_parent(clk, tmp_parent); + BUG_ON(ret1); + + ret2 = clk_set_rate(cur_parent, rate); + + ret1 = dmn_set_parent(clk, cur_parent); + + clk->rate = 0; /* set to zero will force recalculation */ + + return ret2 ? ret2 : ret1; +} + +static struct clk_ops cpu_ops = { + .get_parent = dmn_get_parent, + .set_parent = dmn_set_parent, + .set_rate = cpu_set_rate, +}; + +static struct clk clk_cpu = { + .parent = &clk_pll1, + .regofs = SIRFSOC_CLKC_CPU_CFG, + .ops = &cpu_ops, +}; + + +static struct clk_ops msi_ops = { + .set_rate = dmn_set_rate, + .get_rate = dmn_get_rate, + .set_parent = dmn_set_parent, + .get_parent = dmn_get_parent, +}; + +static struct clk clk_mem = { + .parent = &clk_pll2, + .regofs = SIRFSOC_CLKC_MEM_CFG, + .ops = &msi_ops, +}; + +static struct clk clk_sys = { + .parent = &clk_pll3, + .regofs = SIRFSOC_CLKC_SYS_CFG, + .ops = &msi_ops, +}; + +static struct clk clk_io = { + .parent = &clk_pll3, + .regofs = SIRFSOC_CLKC_IO_CFG, + .ops = &msi_ops, +}; + +/* + * on-chip clock sets + */ +static struct clk_lookup onchip_clks[] = { + { + .con_id = "rtc", + .clk = &clk_rtc, + }, { + .con_id = "osc", + .clk = &clk_osc, + }, { + .con_id = "pll1", + .clk = &clk_pll1, + }, { + .con_id = "pll2", + .clk = &clk_pll2, + }, { + .con_id = "pll3", + .clk = &clk_pll3, + }, { + .con_id = "cpu", + .clk = &clk_cpu, + }, { + .con_id = "mem", + .clk = &clk_mem, + }, { + .con_id = "sys", + .clk = &clk_sys, + }, { + .con_id = "io", + .clk = &clk_io, + }, +}; + +int clk_enable(struct clk *clk) +{ + unsigned long flags; + + if (unlikely(IS_ERR_OR_NULL(clk))) + return -EINVAL; + + if (clk->parent) + clk_enable(clk->parent); + + spin_lock_irqsave(&clocks_lock, flags); + if (!clk->usage++ && clk->ops && clk->ops->enable) + clk->ops->enable(clk); + spin_unlock_irqrestore(&clocks_lock, flags); + return 0; +} +EXPORT_SYMBOL(clk_enable); + +void clk_disable(struct clk *clk) +{ + unsigned long flags; + + if (unlikely(IS_ERR_OR_NULL(clk))) + return; + + WARN_ON(!clk->usage); + + spin_lock_irqsave(&clocks_lock, flags); + if (--clk->usage == 0 && clk->ops && clk->ops->disable) + clk->ops->disable(clk); + spin_unlock_irqrestore(&clocks_lock, flags); + + if (clk->parent) + clk_disable(clk->parent); +} +EXPORT_SYMBOL(clk_disable); + +unsigned long clk_get_rate(struct clk *clk) +{ + if (unlikely(IS_ERR_OR_NULL(clk))) + return 0; + + if (clk->rate) + return clk->rate; + + if (clk->ops && clk->ops->get_rate) + return clk->ops->get_rate(clk); + + return clk_get_rate(clk->parent); +} +EXPORT_SYMBOL(clk_get_rate); + +long clk_round_rate(struct clk *clk, unsigned long rate) +{ + if (unlikely(IS_ERR_OR_NULL(clk))) + return 0; + + if (clk->ops && clk->ops->round_rate) + return clk->ops->round_rate(clk, rate); + + return 0; +} +EXPORT_SYMBOL(clk_round_rate); + +int clk_set_rate(struct clk *clk, unsigned long rate) +{ + if (unlikely(IS_ERR_OR_NULL(clk))) + return -EINVAL; + + if (!clk->ops || !clk->ops->set_rate) + return -EINVAL; + + return clk->ops->set_rate(clk, rate); +} +EXPORT_SYMBOL(clk_set_rate); + +int clk_set_parent(struct clk *clk, struct clk *parent) +{ + int ret; + unsigned long flags; + + if (unlikely(IS_ERR_OR_NULL(clk))) + return -EINVAL; + + if (!clk->ops || !clk->ops->set_parent) + return -EINVAL; + + spin_lock_irqsave(&clocks_lock, flags); + ret = clk->ops->set_parent(clk, parent); + if (!ret) { + parent->usage += clk->usage; + clk->parent->usage -= clk->usage; + BUG_ON(clk->parent->usage < 0); + clk->parent = parent; + } + spin_unlock_irqrestore(&clocks_lock, flags); + return ret; +} +EXPORT_SYMBOL(clk_set_parent); + +struct clk *clk_get_parent(struct clk *clk) +{ + unsigned long flags; + + if (unlikely(IS_ERR_OR_NULL(clk))) + return NULL; + + if (!clk->ops || !clk->ops->get_parent) + return clk->parent; + + spin_lock_irqsave(&clocks_lock, flags); + clk->parent = clk->ops->get_parent(clk); + spin_unlock_irqrestore(&clocks_lock, flags); + return clk->parent; +} +EXPORT_SYMBOL(clk_get_parent); + +void __init sirfsoc_init_clk(void) +{ + clkdev_add_table(onchip_clks, ARRAY_SIZE(onchip_clks)); +} diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c new file mode 100644 index 0000000..fd35ff0 --- /dev/null +++ b/arch/arm/mach-prima2/common.c @@ -0,0 +1,81 @@ +/* + * This file contains common code that is intended to be used across + * boards so that it's not replicated. + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <linux/init.h> +#include <linux/kernel.h> +#include <asm/mach/map.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/hardware/cache-l2x0.h> +#include <mach/hardware.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include "common.h" + +static struct of_device_id sirfsoc_of_bus_ids[] __initdata = { + { .compatible = "simple-bus", }, + {}, +}; + +void __init sirfsoc_mach_init(void) +{ + of_platform_bus_probe(NULL, sirfsoc_of_bus_ids, NULL); +} + + +#define IOTABLE_ENTRY(region) {\ + .virtual = SIRFSOC_##region##_VA_BASE, \ + .pfn = __phys_to_pfn(SIRFSOC_##region##_PA_BASE),\ + .length = SIRFSOC_##region##_SIZE, \ + .type = MT_DEVICE, \ +} + +static struct map_desc sirfsoc_iodesc[] __initdata = { + IOTABLE_ENTRY(INTR), + IOTABLE_ENTRY(UART1), + IOTABLE_ENTRY(TIMER), + IOTABLE_ENTRY(CLOCK), +#ifdef CONFIG_CACHE_L2X0 + IOTABLE_ENTRY(L2CC), +#endif +}; + +void __init sirfsoc_map_io(void) +{ + iotable_init(sirfsoc_iodesc, ARRAY_SIZE(sirfsoc_iodesc)); +} + +#define L2X0_ADDR_FILTERING_START 0xC00 +#define L2X0_ADDR_FILTERING_END 0xC04 + +static int __init sirfsoc_init(void) +{ +#ifdef CONFIG_CACHE_L2X0 + if (!(readl_relaxed(SIRFSOC_L2CC_VA_BASE + L2X0_CTRL) & 1)) { + /* + * set the physical memory windows L2 cache will cover + */ + writel_relaxed(PHYS_OFFSET + 1024 * 1024 * 1024, + SIRFSOC_L2CC_VA_BASE + L2X0_ADDR_FILTERING_END); + writel_relaxed(PHYS_OFFSET | 0x1, + SIRFSOC_L2CC_VA_BASE + L2X0_ADDR_FILTERING_START); + + writel_relaxed(0, + SIRFSOC_L2CC_VA_BASE + L2X0_TAG_LATENCY_CTRL); + writel_relaxed(0, + SIRFSOC_L2CC_VA_BASE + L2X0_DATA_LATENCY_CTRL); + } + l2x0_init((void __iomem *)SIRFSOC_L2CC_VA_BASE, 0x00040000, + 0x00000000); +#endif + + return 0; +} +arch_initcall(sirfsoc_init); + diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h new file mode 100644 index 0000000..5386cc5 --- /dev/null +++ b/arch/arm/mach-prima2/common.h @@ -0,0 +1,23 @@ +/* + * This file contains common function prototypes to avoid externs in the c files. + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_PRIMA2_COMMON_H__ +#define __MACH_PRIMA2_COMMON_H__ + +#include <linux/init.h> +#include <asm/mach/time.h> + +extern struct sys_timer sirfsoc_timer; + +extern void __init sirfsoc_init_io(void); +extern void __init sirfsoc_map_io(void); +extern void __init sirfsoc_mach_init(void); +extern void sirfsoc_init_irq(void); +extern void __init sirfsoc_init_clk(void); + +#endif diff --git a/arch/arm/mach-prima2/include/mach/clkdev.h b/arch/arm/mach-prima2/include/mach/clkdev.h new file mode 100644 index 0000000..6693251 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/clkdev.h @@ -0,0 +1,15 @@ +/* + * arch/arm/mach-prima2/include/mach/clkdev.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_CLKDEV_H +#define __MACH_CLKDEV_H + +#define __clk_get(clk) ({ 1; }) +#define __clk_put(clk) do { } while (0) + +#endif diff --git a/arch/arm/mach-prima2/include/mach/debug-macro.S b/arch/arm/mach-prima2/include/mach/debug-macro.S new file mode 100644 index 0000000..bf75106 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/debug-macro.S @@ -0,0 +1,29 @@ +/* + * arch/arm/mach-prima2/include/mach/debug-macro.S + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <mach/hardware.h> +#include <mach/uart.h> + + .macro addruart, rp, rv + ldr \rp, =SIRFSOC_UART1_PA_BASE @ physical + ldr \rv, =SIRFSOC_UART1_VA_BASE @ virtual + .endm + + .macro senduart,rd,rx + str \rd, [\rx, #SIRFSOC_UART_TXFIFO_DATA] + .endm + + .macro busyuart,rd,rx + .endm + + .macro waituart,rd,rx +1001: ldr \rd, [\rx, #SIRFSOC_UART_TXFIFO_STATUS] + tst \rd, #SIRFSOC_UART1_TXFIFO_EMPTY + beq 1001b + .endm + diff --git a/arch/arm/mach-prima2/include/mach/entry-macro.S b/arch/arm/mach-prima2/include/mach/entry-macro.S new file mode 100644 index 0000000..af5611b --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/entry-macro.S @@ -0,0 +1,28 @@ +/* + * arch/arm/mach-prima2/include/mach/entry-macro.S + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <mach/hardware.h> + +#define SIRFSOC_INT_ID 0x38 + + .macro get_irqnr_and_base, irqnr, irqstat, base, tmp + ldr \base, =SIRFSOC_INTR_VA_BASE + ldr \irqnr, [\base, #SIRFSOC_INT_ID] @ Get the highest priority irq + cmp \irqnr, #0x40 @ the irq num can't be larger than 0x3f + movges \irqnr, #0 + .endm + + .macro disable_fiq + .endm + + .macro get_irqnr_preamble, base, tmp + .endm + + .macro arch_ret_to_user, tmp1, tmp2 + .endm + diff --git a/arch/arm/mach-prima2/include/mach/hardware.h b/arch/arm/mach-prima2/include/mach/hardware.h new file mode 100644 index 0000000..105b969 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/hardware.h @@ -0,0 +1,15 @@ +/* + * arch/arm/mach-prima2/include/mach/hardware.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_HARDWARE_H__ +#define __MACH_HARDWARE_H__ + +#include <asm/sizes.h> +#include <mach/map.h> + +#endif diff --git a/arch/arm/mach-prima2/include/mach/io.h b/arch/arm/mach-prima2/include/mach/io.h new file mode 100644 index 0000000..1ac0a5c --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/io.h @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-prima2/include/mach/io.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_PRIMA2_IO_H +#define __MACH_PRIMA2_IO_H + +#define IO_SPACE_LIMIT 0xffffffff + +#define __mem_pci(x) (x) +#define __io(a) ((void __iomem *)(a)) + +#endif diff --git a/arch/arm/mach-prima2/include/mach/irqs.h b/arch/arm/mach-prima2/include/mach/irqs.h new file mode 100644 index 0000000..bb354f9 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/irqs.h @@ -0,0 +1,17 @@ +/* + * arch/arm/mach-prima2/include/mach/irqs.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __ASM_ARCH_IRQS_H +#define __ASM_ARCH_IRQS_H + +#define SIRFSOC_INTENAL_IRQ_START 0 +#define SIRFSOC_INTENAL_IRQ_END 59 + +#define NR_IRQS 220 + +#endif diff --git a/arch/arm/mach-prima2/include/mach/isa-dma.h b/arch/arm/mach-prima2/include/mach/isa-dma.h new file mode 100644 index 0000000..f07e264 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/isa-dma.h @@ -0,0 +1,14 @@ +/* + * arch/arm/mach-prima2/include/mach/io.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_PRIMA2_ISADMA_H +#define __MACH_PRIMA2_ISADMA_H + +#define MAX_DMA_CHANNELS 32 + +#endif diff --git a/arch/arm/mach-prima2/include/mach/map.h b/arch/arm/mach-prima2/include/mach/map.h new file mode 100644 index 0000000..9a3ad94 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/map.h @@ -0,0 +1,49 @@ +/* + * memory & I/O static mapping definitions for CSR SiRFprimaII + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_PRIMA2_MAP_H__ +#define __MACH_PRIMA2_MAP_H__ + +#include <mach/vmalloc.h> + +#define SIRFSOC_VA(x) (VMALLOC_END + ((x) & 0x00FFF000)) + +/* INTR */ +#define SIRFSOC_INTR_PA_BASE 0x80020000 +#define SIRFSOC_INTR_VA_BASE SIRFSOC_VA(0x002000) +#define SIRFSOC_INTR_SIZE SZ_4K + +/* L2 CACHE */ +#define SIRFSOC_L2CC_PA_BASE 0x80040000 +#define SIRFSOC_L2CC_VA_BASE SIRFSOC_VA(0x004000) +#define SIRFSOC_L2CC_SIZE SZ_4K + +/* CLOCK */ +#define SIRFSOC_CLOCK_PA_BASE 0x88000000 +#define SIRFSOC_CLOCK_VA_BASE SIRFSOC_VA(0x005000) +#define SIRFSOC_CLOCK_SIZE SZ_4K + +/* RESET CONTROLLER */ +#define SIRFSOC_RSTC_PA_BASE 0x88010000 +#define SIRFSOC_RSTC_VA_BASE SIRFSOC_VA(0x006000) +#define SIRFSOC_RSTC_SIZE SZ_4K + +/* OS TIMER */ +#define SIRFSOC_TIMER_PA_BASE 0xb0020000 +#define SIRFSOC_TIMER_VA_BASE SIRFSOC_VA(0x00c000) +#define SIRFSOC_TIMER_SIZE SZ_4K + +/* UART-1: used as serial debug port */ +#define SIRFSOC_UART1_PA_BASE 0xb0060000 +#define SIRFSOC_UART1_VA_BASE SIRFSOC_VA(0x060000) +#define SIRFSOC_UART1_SIZE SZ_4K + +/* RAM BASE*/ +#define SIRFSOC_SDRAM_PA 0x00000000 + +#endif diff --git a/arch/arm/mach-prima2/include/mach/memory.h b/arch/arm/mach-prima2/include/mach/memory.h new file mode 100644 index 0000000..368cd5a --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/memory.h @@ -0,0 +1,21 @@ +/* + * arch/arm/mach-prima2/include/mach/memory.h + * + * Copyright (c) 2010 – 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __ASM_ARCH_MEMORY_H +#define __ASM_ARCH_MEMORY_H + +#define PLAT_PHYS_OFFSET UL(0x00000000) + +/* + * Restrict DMA-able region to workaround silicon limitation. + * The limitation restricts buffers available for DMA to SD/MMC + * hardware to be below 256MB + */ +#define ARM_DMA_ZONE_SIZE (SZ_256M) + +#endif diff --git a/arch/arm/mach-prima2/include/mach/system.h b/arch/arm/mach-prima2/include/mach/system.h new file mode 100644 index 0000000..a84e91f --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/system.h @@ -0,0 +1,27 @@ +/* + * arch/arm/mach-prima2/include/mach/system.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_SYSTEM_H__ +#define __MACH_SYSTEM_H__ + +#include <linux/bitops.h> +#include <mach/hardware.h> + +#define SIRFSOC_SYS_RST_BIT BIT(31) + +static inline void arch_idle(void) +{ + cpu_do_idle(); +} + +static inline void arch_reset(char mode, const char *cmd) +{ + writel(SIRFSOC_SYS_RST_BIT, SIRFSOC_RSTC_VA_BASE); +} + +#endif diff --git a/arch/arm/mach-prima2/include/mach/timex.h b/arch/arm/mach-prima2/include/mach/timex.h new file mode 100644 index 0000000..d89223f --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/timex.h @@ -0,0 +1,14 @@ +/* + * arch/arm/mach-prima2/include/mach/timex.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_TIMEX_H__ +#define __MACH_TIMEX_H__ + +#define CLOCK_TICK_RATE (100 * HZ) + +#endif diff --git a/arch/arm/mach-prima2/include/mach/uart.h b/arch/arm/mach-prima2/include/mach/uart.h new file mode 100644 index 0000000..53cf17a --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/uart.h @@ -0,0 +1,18 @@ +/* + * arch/arm/mach-prima2/include/mach/uart.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_PRIMA2_SIRFSOC_UART_H +#define __MACH_PRIMA2_SIRFSOC_UART_H + +#define SIRFSOC_UART_TXFIFO_STATUS 0x0114 +#define SIRFSOC_UART_TXFIFO_DATA 0x0118 + +#define SIRFSOC_UART1_TXFIFO_FULL (1 << 5) +#define SIRFSOC_UART1_TXFIFO_EMPTY (1 << 6) + +#endif diff --git a/arch/arm/mach-prima2/include/mach/uncompress.h b/arch/arm/mach-prima2/include/mach/uncompress.h new file mode 100644 index 0000000..e08d7b8 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/uncompress.h @@ -0,0 +1,42 @@ +/* + * arch/arm/mach-prima2/include/mach/uncompress.h + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __ASM_ARCH_UNCOMPRESS_H +#define __ASM_ARCH_UNCOMPRESS_H + +#include <linux/bitops.h> +#include <linux/io.h> +#include <asm/processor.h> +#include <mach/hardware.h> +#include <mach/uart.h> + +void arch_decomp_setup(void) +{ +} + +#define arch_decomp_wdog() + +static __inline__ void putc(char c) +{ + /* + * during kernel decompression, all mappings are flat: + * virt_addr == phys_addr + */ + while (__raw_readl(SIRFSOC_UART1_PA_BASE + SIRFSOC_UART_TXFIFO_STATUS) + & SIRFSOC_UART1_TXFIFO_FULL) + cpu_relax(); + + __raw_writel(c, SIRFSOC_UART1_PA_BASE + SIRFSOC_UART_TXFIFO_DATA); +} + +static inline void flush(void) +{ +} + +#endif + diff --git a/arch/arm/mach-prima2/include/mach/vmalloc.h b/arch/arm/mach-prima2/include/mach/vmalloc.h new file mode 100644 index 0000000..116d0a5 --- /dev/null +++ b/arch/arm/mach-prima2/include/mach/vmalloc.h @@ -0,0 +1,14 @@ +/* + * arch/arm/ach-prima2/include/mach/vmalloc.h + * + * Copyright (c) 2010 – 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#ifndef __MACH_VMALLOC_H +#define __MACH_VMALLOC_H + +#define VMALLOC_END 0xFEC00000 + +#endif diff --git a/arch/arm/mach-prima2/irq.c b/arch/arm/mach-prima2/irq.c new file mode 100644 index 0000000..af65481 --- /dev/null +++ b/arch/arm/mach-prima2/irq.c @@ -0,0 +1,81 @@ +/* + * interrupt controller support for CSR SiRFprimaII + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <mach/hardware.h> +#include <asm/mach/irq.h> + +#define SIRFSOC_INT_PENDING0 0x0000 +#define SIRFSOC_INT_PENDING1 0x0004 +#define SIRFSOC_INT_IRQ_PENDING0 0x0008 +#define SIRFSOC_INT_IRQ_PENDING1 0x000C +#define SIRFSOC_INT_FIQ_PENDING0 0x0010 +#define SIRFSOC_INT_FIQ_PENDING1 0x0014 +#define SIRFSOC_INT_RISC_MASK0 0x0018 +#define SIRFSOC_INT_RISC_MASK1 0x001C +#define SIRFSOC_INT_RISC_LEVEL0 0x0020 +#define SIRFSOC_INT_RISC_LEVEL1 0x0024 + +static void sirfsoc_irq_ack(struct irq_data *d) +{ +} + +static void sirfsoc_irq_mask(struct irq_data *d) +{ + unsigned long mask; + + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) & + ~(1 << ( d->irq % 32)); + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); +} + +static void sirfsoc_irq_unmask(struct irq_data *d) +{ + unsigned long mask; + + mask = __raw_readl(SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4) | + (1 << ( d->irq % 32)); + __raw_writel(mask, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0 + (d->irq / 32) * 4); +} + +int sirfsoc_irq_settype(struct irq_data *d, unsigned int type) +{ + /* + * Interrupt handler doesnt support setting trigger type + */ + if (type == IRQ_TYPE_NONE) + return 0; + + return -EINVAL; +} + +static struct irq_chip sirfsoc_irq_chip = { + .name = "SiRF SoC", + .irq_ack = sirfsoc_irq_ack, + .irq_mask = sirfsoc_irq_mask, + .irq_unmask = sirfsoc_irq_unmask, + .irq_set_type = sirfsoc_irq_settype, +}; + +void sirfsoc_init_irq(void) +{ + int irq; + + for (irq = SIRFSOC_INTENAL_IRQ_START; irq <= SIRFSOC_INTENAL_IRQ_END; irq++) { + irq_set_chip(irq, &sirfsoc_irq_chip); + irq_set_handler(irq, handle_level_irq); + set_irq_flags(irq, IRQF_VALID); + } + __raw_writel(0, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_LEVEL0); + __raw_writel(0, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_LEVEL1); + + __raw_writel(0, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK0); + __raw_writel(0, SIRFSOC_INTR_VA_BASE + SIRFSOC_INT_RISC_MASK1); +} diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c new file mode 100644 index 0000000..f73928f --- /dev/null +++ b/arch/arm/mach-prima2/timer.c @@ -0,0 +1,181 @@ +/* + * System timer for CSR SiRFprimaII + * + * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. + * + * Licensed under GPLv2 or later. + */ + +#include <linux/kernel.h> +#include <linux/interrupt.h> +#include <linux/clockchips.h> +#include <linux/clocksource.h> +#include <linux/bitops.h> +#include <linux/irq.h> +#include <linux/clk.h> +#include <linux/err.h> +#include <linux/slab.h> +#include <mach/map.h> +#include <asm/mach/time.h> + +#define SIRFSOC_TIMER_COUNTER_LO 0x0000 +#define SIRFSOC_TIMER_COUNTER_HI 0x0004 +#define SIRFSOC_TIMER_MATCH_0 0x0008 +#define SIRFSOC_TIMER_MATCH_1 0x000C +#define SIRFSOC_TIMER_MATCH_2 0x0010 +#define SIRFSOC_TIMER_MATCH_3 0x0014 +#define SIRFSOC_TIMER_MATCH_4 0x0018 +#define SIRFSOC_TIMER_MATCH_5 0x001C +#define SIRFSOC_TIMER_STATUS 0x0020 +#define SIRFSOC_TIMER_INT_EN 0x0024 +#define SIRFSOC_TIMER_WATCHDOG_EN 0x0028 +#define SIRFSOC_TIMER_DIV 0x002C +#define SIRFSOC_TIMER_LATCH 0x0030 +#define SIRFSOC_TIMER_LATCHED_LO 0x0034 +#define SIRFSOC_TIMER_LATCHED_HI 0x0038 + +#define SIRFSOC_TIMER_WDT_INDEX 5 + +#define SIRFSOC_TIMER_LATCH_BIT BIT(0) + +/* timer0 interrupt handler */ +static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id) +{ + struct clock_event_device *ce = dev_id; + + WARN_ON(!(__raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS) & BIT(0))); + + /* clear timer0 interrupt */ + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); + + ce->event_handler(ce); + + return IRQ_HANDLED; +} + +/* read 64-bit timer counter */ +static cycle_t sirfsoc_timer_read(struct clocksource *cs) +{ + u64 cycles; + + /* latch the 64-bit timer counter */ + __raw_writel(SIRFSOC_TIMER_LATCH_BIT, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCH); + cycles = __raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCHED_HI); + cycles = (cycles << 32) | __raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCHED_LO); + + return cycles; +} + +static int sirfsoc_timer_set_next_event(unsigned long delta, + struct clock_event_device *ce) +{ + unsigned long now, next; + + __raw_writel(SIRFSOC_TIMER_LATCH_BIT, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCH); + now = __raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCHED_LO); + do { + next = now + delta; + __raw_writel(next, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_MATCH_0); + __raw_writel(SIRFSOC_TIMER_LATCH_BIT, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCH); + now = __raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_LATCHED_LO); + } while ((next - now) > delta); + + return 0; +} + +static void sirfsoc_timer_set_mode(enum clock_event_mode mode, + struct clock_event_device *ce) +{ + u32 val = __raw_readl(SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_INT_EN); + switch (mode) { + case CLOCK_EVT_MODE_PERIODIC: + WARN_ON(1); + break; + case CLOCK_EVT_MODE_ONESHOT: + __raw_writel(val | BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_INT_EN); + break; + case CLOCK_EVT_MODE_SHUTDOWN: + __raw_writel(val & ~BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_INT_EN); + break; + case CLOCK_EVT_MODE_UNUSED: + case CLOCK_EVT_MODE_RESUME: + break; + } +} + +static struct clock_event_device sirfsoc_clockevent = { + .name = "sirfsoc_clockevent", + .rating = 200, + .features = CLOCK_EVT_FEAT_ONESHOT, + .set_mode = sirfsoc_timer_set_mode, + .set_next_event = sirfsoc_timer_set_next_event, +}; + +static struct clocksource sirfsoc_clocksource = { + .name = "sirfsoc_clocksource", + .rating = 200, + .mask = CLOCKSOURCE_MASK(64), + .flags = CLOCK_SOURCE_IS_CONTINUOUS, + .read = sirfsoc_timer_read, +}; + +static struct irqaction sirfsoc_timer_irq = { + .name = "sirfsoc_timer0", + .flags = IRQF_TIMER, + .irq = 0, + .handler = sirfsoc_timer_interrupt, + .dev_id = &sirfsoc_clockevent, +}; + +/* Overwrite weak default sched_clock with more precise one */ +unsigned long long notrace sched_clock(void) +{ + BUG_ON(NSEC_PER_SEC % CLOCK_TICK_RATE); + return sirfsoc_timer_read(NULL) * (NSEC_PER_SEC / CLOCK_TICK_RATE); +} + +static void __init sirfsoc_clockevent_init(void) +{ + clockevents_calc_mult_shift(&sirfsoc_clockevent, CLOCK_TICK_RATE, 60); + + sirfsoc_clockevent.max_delta_ns = + clockevent_delta2ns(-2, &sirfsoc_clockevent); + sirfsoc_clockevent.min_delta_ns = + clockevent_delta2ns(2, &sirfsoc_clockevent); + + sirfsoc_clockevent.cpumask = cpumask_of(0); + clockevents_register_device(&sirfsoc_clockevent); +} + +/* initialize the kernel jiffy timer source */ +static void __init sirfsoc_timer_init(void) +{ + unsigned long rate; + /* timer's input clock is io clock */ + struct clk *clk = clk_get(NULL, "io"); + + BUG_ON(IS_ERR_OR_NULL(clk)); + + rate = clk_get_rate(clk); + clk_put(clk); + + BUG_ON(rate < CLOCK_TICK_RATE); + BUG_ON(rate % CLOCK_TICK_RATE); + + __raw_writel(rate / CLOCK_TICK_RATE / 2 - 1, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_DIV); + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_LO); + __raw_writel(0, SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_COUNTER_HI); + __raw_writel(BIT(0), SIRFSOC_TIMER_VA_BASE + SIRFSOC_TIMER_STATUS); + + if (clocksource_register_hz(&sirfsoc_clocksource, CLOCK_TICK_RATE)) + BUG(); + + if (setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq)) + BUG(); + + sirfsoc_clockevent_init(); +} + +struct sys_timer sirfsoc_timer = { + .init = sirfsoc_timer_init, +}; diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 0074b8d..edf0681 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -821,7 +821,7 @@ config CACHE_L2X0 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ - ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE + ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || ARCH_PRIMA2 default y select OUTER_CACHE select OUTER_CACHE_SYNC