mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
f8060f5446
This creates irqchip initialization infrastructure from Thomas Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips and adapted to use the new infrastructure. All DT enabled platforms using GIC and VIC are converted over to use the new irqchip_init. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJQ8ZobAAoJEMhvYp4jgsXiihIH/2VvxmSHZb0e3jN6AR0B42b7 9EwX0IE0B23t91hNTwdzzmTJQYA7pMmWkgHNfd3vIeqSepJAmrVv/gp4iM9CtPwE KNh+kDWOK2ZsOH4Vb0lYRJHN8WQOIQHuCUr9+MdYLNOgf/pPL6G/Y9kv9A1e7fTC W+tFRjC5N1ilZMGyowX12L1wnwDk6kHzed6YV6bskC17cZ9/pg8PhSVbM4A/3kAv NXYKqbXJb+eCsWGXg/knZXOL6V9gBwvVYoe4O9X3nQ0226AWB9caad8l8tchAjRB fmrYF1tbkpOWPnLxhvQy5b5MJichJgTMJHh7RgiEcc/3f63kOljjlx4QKiqHvT0= =q7gm -----END PGP SIGNATURE----- Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup From Rob Herring: Initial irqchip init infrastructure and GIC and VIC clean-ups This creates irqchip initialization infrastructure from Thomas Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips and adapted to use the new infrastructure. All DT enabled platforms using GIC and VIC are converted over to use the new irqchip_init. * tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux: irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h ARM: picoxcell: use common irqchip_init function ARM: spear: use common irqchip_init function irqchip: Move ARM VIC to drivers/irqchip ARM: samsung: remove unused tick.h ARM: remove unneeded vic.h includes ARM: remove mach .handle_irq for VIC users ARM: VIC: set handle_arch_irq in VIC initialization ARM: VIC: shrink down vic.h irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h ARM: use common irqchip_init for GIC init irqchip: Move ARM GIC to drivers/irqchip ARM: remove mach .handle_irq for GIC users ARM: GIC: set handle_arch_irq in GIC initialization ARM: GIC: remove direct use of gic_raise_softirq ARM: GIC: remove assembly ifdefs from gic.h ARM: mach-ux500: use SGI0 to wake up the other core arm: add set_handle_irq() to register the parent IRQ controller handler function irqchip: add basic infrastructure irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS Fixed up massive merge conflicts with the timer cleanup due to adjacent changes: Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/mach-bcm/board_bcm.c arch/arm/mach-cns3xxx/cns3420vb.c arch/arm/mach-ep93xx/adssphere.c arch/arm/mach-ep93xx/edb93xx.c arch/arm/mach-ep93xx/gesbc9312.c arch/arm/mach-ep93xx/micro9.c arch/arm/mach-ep93xx/simone.c arch/arm/mach-ep93xx/snappercl15.c arch/arm/mach-ep93xx/ts72xx.c arch/arm/mach-ep93xx/vision_ep9307.c arch/arm/mach-highbank/highbank.c arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-msm/board-dt-8960.c arch/arm/mach-netx/nxdb500.c arch/arm/mach-netx/nxdkn.c arch/arm/mach-netx/nxeb500hmi.c arch/arm/mach-nomadik/board-nhk8815.c arch/arm/mach-picoxcell/common.c arch/arm/mach-realview/realview_eb.c arch/arm/mach-realview/realview_pb1176.c arch/arm/mach-realview/realview_pb11mp.c arch/arm/mach-realview/realview_pba8.c arch/arm/mach-realview/realview_pbx.c arch/arm/mach-socfpga/socfpga.c arch/arm/mach-spear13xx/spear1310.c arch/arm/mach-spear13xx/spear1340.c arch/arm/mach-spear13xx/spear13xx.c arch/arm/mach-spear3xx/spear300.c arch/arm/mach-spear3xx/spear310.c arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear3xx/spear3xx.c arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/board-dt-tegra30.c arch/arm/mach-u300/core.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/cpu-db8500.c arch/arm/mach-versatile/versatile_ab.c arch/arm/mach-versatile/versatile_dt.c arch/arm/mach-versatile/versatile_pb.c arch/arm/mach-vexpress/v2m.c include/asm-generic/vmlinux.lds.h
279 lines
7.0 KiB
C
279 lines
7.0 KiB
C
/*
|
|
* Copyright 1999 - 2003 ARM Limited
|
|
* Copyright 2000 Deep Blue Solutions Ltd
|
|
* Copyright 2008 Cavium Networks
|
|
*
|
|
* This file is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License, Version 2, as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/clockchips.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <mach/cns3xxx.h>
|
|
#include "core.h"
|
|
|
|
static struct map_desc cns3xxx_io_desc[] __initdata = {
|
|
{
|
|
.virtual = CNS3XXX_TC11MP_TWD_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_TC11MP_TWD_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_TC11MP_GIC_CPU_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_TC11MP_GIC_DIST_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_TIMER1_2_3_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_TIMER1_2_3_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_GPIOA_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_GPIOA_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_GPIOB_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_GPIOB_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_MISC_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_MISC_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
}, {
|
|
.virtual = CNS3XXX_PM_BASE_VIRT,
|
|
.pfn = __phys_to_pfn(CNS3XXX_PM_BASE),
|
|
.length = SZ_4K,
|
|
.type = MT_DEVICE,
|
|
},
|
|
};
|
|
|
|
void __init cns3xxx_map_io(void)
|
|
{
|
|
iotable_init(cns3xxx_io_desc, ARRAY_SIZE(cns3xxx_io_desc));
|
|
}
|
|
|
|
/* used by entry-macro.S */
|
|
void __init cns3xxx_init_irq(void)
|
|
{
|
|
gic_init(0, 29, IOMEM(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),
|
|
IOMEM(CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT));
|
|
}
|
|
|
|
void cns3xxx_power_off(void)
|
|
{
|
|
u32 __iomem *pm_base = IOMEM(CNS3XXX_PM_BASE_VIRT);
|
|
u32 clkctrl;
|
|
|
|
printk(KERN_INFO "powering system down...\n");
|
|
|
|
clkctrl = readl(pm_base + PM_SYS_CLK_CTRL_OFFSET);
|
|
clkctrl &= 0xfffff1ff;
|
|
clkctrl |= (0x5 << 9); /* Hibernate */
|
|
writel(clkctrl, pm_base + PM_SYS_CLK_CTRL_OFFSET);
|
|
|
|
}
|
|
|
|
/*
|
|
* Timer
|
|
*/
|
|
static void __iomem *cns3xxx_tmr1;
|
|
|
|
static void cns3xxx_timer_set_mode(enum clock_event_mode mode,
|
|
struct clock_event_device *clk)
|
|
{
|
|
unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
int pclk = cns3xxx_cpu_clock() / 8;
|
|
int reload;
|
|
|
|
switch (mode) {
|
|
case CLOCK_EVT_MODE_PERIODIC:
|
|
reload = pclk * 20 / (3 * HZ) * 0x25000;
|
|
writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);
|
|
ctrl |= (1 << 0) | (1 << 2) | (1 << 9);
|
|
break;
|
|
case CLOCK_EVT_MODE_ONESHOT:
|
|
/* period set, and timer enabled in 'next_event' hook */
|
|
ctrl |= (1 << 2) | (1 << 9);
|
|
break;
|
|
case CLOCK_EVT_MODE_UNUSED:
|
|
case CLOCK_EVT_MODE_SHUTDOWN:
|
|
default:
|
|
ctrl = 0;
|
|
}
|
|
|
|
writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
}
|
|
|
|
static int cns3xxx_timer_set_next_event(unsigned long evt,
|
|
struct clock_event_device *unused)
|
|
{
|
|
unsigned long ctrl = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
|
|
writel(evt, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);
|
|
writel(ctrl | (1 << 0), cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct clock_event_device cns3xxx_tmr1_clockevent = {
|
|
.name = "cns3xxx timer1",
|
|
.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
|
|
.set_mode = cns3xxx_timer_set_mode,
|
|
.set_next_event = cns3xxx_timer_set_next_event,
|
|
.rating = 350,
|
|
.cpumask = cpu_all_mask,
|
|
};
|
|
|
|
static void __init cns3xxx_clockevents_init(unsigned int timer_irq)
|
|
{
|
|
cns3xxx_tmr1_clockevent.irq = timer_irq;
|
|
clockevents_config_and_register(&cns3xxx_tmr1_clockevent,
|
|
(cns3xxx_cpu_clock() >> 3) * 1000000,
|
|
0xf, 0xffffffff);
|
|
}
|
|
|
|
/*
|
|
* IRQ handler for the timer
|
|
*/
|
|
static irqreturn_t cns3xxx_timer_interrupt(int irq, void *dev_id)
|
|
{
|
|
struct clock_event_device *evt = &cns3xxx_tmr1_clockevent;
|
|
u32 __iomem *stat = cns3xxx_tmr1 + TIMER1_2_INTERRUPT_STATUS_OFFSET;
|
|
u32 val;
|
|
|
|
/* Clear the interrupt */
|
|
val = readl(stat);
|
|
writel(val & ~(1 << 2), stat);
|
|
|
|
evt->event_handler(evt);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
static struct irqaction cns3xxx_timer_irq = {
|
|
.name = "timer",
|
|
.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
|
|
.handler = cns3xxx_timer_interrupt,
|
|
};
|
|
|
|
/*
|
|
* Set up the clock source and clock events devices
|
|
*/
|
|
static void __init __cns3xxx_timer_init(unsigned int timer_irq)
|
|
{
|
|
u32 val;
|
|
u32 irq_mask;
|
|
|
|
/*
|
|
* Initialise to a known state (all timers off)
|
|
*/
|
|
|
|
/* disable timer1 and timer2 */
|
|
writel(0, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
/* stop free running timer3 */
|
|
writel(0, cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET);
|
|
|
|
/* timer1 */
|
|
writel(0x5C800, cns3xxx_tmr1 + TIMER1_COUNTER_OFFSET);
|
|
writel(0x5C800, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET);
|
|
|
|
writel(0, cns3xxx_tmr1 + TIMER1_MATCH_V1_OFFSET);
|
|
writel(0, cns3xxx_tmr1 + TIMER1_MATCH_V2_OFFSET);
|
|
|
|
/* mask irq, non-mask timer1 overflow */
|
|
irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
|
|
irq_mask &= ~(1 << 2);
|
|
irq_mask |= 0x03;
|
|
writel(irq_mask, cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
|
|
|
|
/* down counter */
|
|
val = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
val |= (1 << 9);
|
|
writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
|
|
/* timer2 */
|
|
writel(0, cns3xxx_tmr1 + TIMER2_MATCH_V1_OFFSET);
|
|
writel(0, cns3xxx_tmr1 + TIMER2_MATCH_V2_OFFSET);
|
|
|
|
/* mask irq */
|
|
irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
|
|
irq_mask |= ((1 << 3) | (1 << 4) | (1 << 5));
|
|
writel(irq_mask, cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET);
|
|
|
|
/* down counter */
|
|
val = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
val |= (1 << 10);
|
|
writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET);
|
|
|
|
/* Make irqs happen for the system timer */
|
|
setup_irq(timer_irq, &cns3xxx_timer_irq);
|
|
|
|
cns3xxx_clockevents_init(timer_irq);
|
|
}
|
|
|
|
void __init cns3xxx_timer_init(void)
|
|
{
|
|
cns3xxx_tmr1 = IOMEM(CNS3XXX_TIMER1_2_3_BASE_VIRT);
|
|
|
|
__cns3xxx_timer_init(IRQ_CNS3XXX_TIMER0);
|
|
}
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
|
|
void __init cns3xxx_l2x0_init(void)
|
|
{
|
|
void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K);
|
|
u32 val;
|
|
|
|
if (WARN_ON(!base))
|
|
return;
|
|
|
|
/*
|
|
* Tag RAM Control register
|
|
*
|
|
* bit[10:8] - 1 cycle of write accesses latency
|
|
* bit[6:4] - 1 cycle of read accesses latency
|
|
* bit[3:0] - 1 cycle of setup latency
|
|
*
|
|
* 1 cycle of latency for setup, read and write accesses
|
|
*/
|
|
val = readl(base + L2X0_TAG_LATENCY_CTRL);
|
|
val &= 0xfffff888;
|
|
writel(val, base + L2X0_TAG_LATENCY_CTRL);
|
|
|
|
/*
|
|
* Data RAM Control register
|
|
*
|
|
* bit[10:8] - 1 cycles of write accesses latency
|
|
* bit[6:4] - 1 cycles of read accesses latency
|
|
* bit[3:0] - 1 cycle of setup latency
|
|
*
|
|
* 1 cycle of latency for setup, read and write accesses
|
|
*/
|
|
val = readl(base + L2X0_DATA_LATENCY_CTRL);
|
|
val &= 0xfffff888;
|
|
writel(val, base + L2X0_DATA_LATENCY_CTRL);
|
|
|
|
/* 32 KiB, 8-way, parity disable */
|
|
l2x0_init(base, 0x00540000, 0xfe000fff);
|
|
}
|
|
|
|
#endif /* CONFIG_CACHE_L2X0 */
|