mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +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
207 lines
5.1 KiB
C
207 lines
5.1 KiB
C
/*
|
|
* Copyright 2010-2011 Calxeda, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <linux/clk.h>
|
|
#include <linux/clkdev.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/irqchip.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/amba/bus.h>
|
|
|
|
#include <asm/arch_timer.h>
|
|
#include <asm/cacheflush.h>
|
|
#include <asm/smp_plat.h>
|
|
#include <asm/smp_twd.h>
|
|
#include <asm/hardware/arm_timer.h>
|
|
#include <asm/hardware/timer-sp.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
|
|
#include "core.h"
|
|
#include "sysregs.h"
|
|
|
|
void __iomem *sregs_base;
|
|
void __iomem *scu_base_addr;
|
|
|
|
static void __init highbank_scu_map_io(void)
|
|
{
|
|
unsigned long base;
|
|
|
|
/* Get SCU base */
|
|
asm("mrc p15, 4, %0, c15, c0, 0" : "=r" (base));
|
|
|
|
scu_base_addr = ioremap(base, SZ_4K);
|
|
}
|
|
|
|
#define HB_JUMP_TABLE_PHYS(cpu) (0x40 + (0x10 * (cpu)))
|
|
#define HB_JUMP_TABLE_VIRT(cpu) phys_to_virt(HB_JUMP_TABLE_PHYS(cpu))
|
|
|
|
void highbank_set_cpu_jump(int cpu, void *jump_addr)
|
|
{
|
|
cpu = cpu_logical_map(cpu);
|
|
writel(virt_to_phys(jump_addr), HB_JUMP_TABLE_VIRT(cpu));
|
|
__cpuc_flush_dcache_area(HB_JUMP_TABLE_VIRT(cpu), 16);
|
|
outer_clean_range(HB_JUMP_TABLE_PHYS(cpu),
|
|
HB_JUMP_TABLE_PHYS(cpu) + 15);
|
|
}
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
static void highbank_l2x0_disable(void)
|
|
{
|
|
/* Disable PL310 L2 Cache controller */
|
|
highbank_smc1(0x102, 0x0);
|
|
}
|
|
#endif
|
|
|
|
static void __init highbank_init_irq(void)
|
|
{
|
|
irqchip_init();
|
|
|
|
if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
|
|
highbank_scu_map_io();
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
/* Enable PL310 L2 Cache controller */
|
|
highbank_smc1(0x102, 0x1);
|
|
l2x0_of_init(0, ~0UL);
|
|
outer_cache.disable = highbank_l2x0_disable;
|
|
#endif
|
|
}
|
|
|
|
static struct clk_lookup lookup = {
|
|
.dev_id = "sp804",
|
|
.con_id = NULL,
|
|
};
|
|
|
|
static void __init highbank_timer_init(void)
|
|
{
|
|
int irq;
|
|
struct device_node *np;
|
|
void __iomem *timer_base;
|
|
|
|
/* Map system registers */
|
|
np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs");
|
|
sregs_base = of_iomap(np, 0);
|
|
WARN_ON(!sregs_base);
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "arm,sp804");
|
|
timer_base = of_iomap(np, 0);
|
|
WARN_ON(!timer_base);
|
|
irq = irq_of_parse_and_map(np, 0);
|
|
|
|
highbank_clocks_init();
|
|
lookup.clk = of_clk_get(np, 0);
|
|
clkdev_add(&lookup);
|
|
|
|
sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1");
|
|
sp804_clockevents_init(timer_base, irq, "timer0");
|
|
|
|
twd_local_timer_of_register();
|
|
|
|
arch_timer_of_register();
|
|
arch_timer_sched_clock_init();
|
|
}
|
|
|
|
static void highbank_power_off(void)
|
|
{
|
|
highbank_set_pwr_shutdown();
|
|
|
|
while (1)
|
|
cpu_do_idle();
|
|
}
|
|
|
|
static int highbank_platform_notifier(struct notifier_block *nb,
|
|
unsigned long event, void *__dev)
|
|
{
|
|
struct resource *res;
|
|
int reg = -1;
|
|
struct device *dev = __dev;
|
|
|
|
if (event != BUS_NOTIFY_ADD_DEVICE)
|
|
return NOTIFY_DONE;
|
|
|
|
if (of_device_is_compatible(dev->of_node, "calxeda,hb-ahci"))
|
|
reg = 0xc;
|
|
else if (of_device_is_compatible(dev->of_node, "calxeda,hb-sdhci"))
|
|
reg = 0x18;
|
|
else if (of_device_is_compatible(dev->of_node, "arm,pl330"))
|
|
reg = 0x20;
|
|
else if (of_device_is_compatible(dev->of_node, "calxeda,hb-xgmac")) {
|
|
res = platform_get_resource(to_platform_device(dev),
|
|
IORESOURCE_MEM, 0);
|
|
if (res) {
|
|
if (res->start == 0xfff50000)
|
|
reg = 0;
|
|
else if (res->start == 0xfff51000)
|
|
reg = 4;
|
|
}
|
|
}
|
|
|
|
if (reg < 0)
|
|
return NOTIFY_DONE;
|
|
|
|
if (of_property_read_bool(dev->of_node, "dma-coherent")) {
|
|
writel(0xff31, sregs_base + reg);
|
|
set_dma_ops(dev, &arm_coherent_dma_ops);
|
|
} else
|
|
writel(0, sregs_base + reg);
|
|
|
|
return NOTIFY_OK;
|
|
}
|
|
|
|
static struct notifier_block highbank_amba_nb = {
|
|
.notifier_call = highbank_platform_notifier,
|
|
};
|
|
|
|
static struct notifier_block highbank_platform_nb = {
|
|
.notifier_call = highbank_platform_notifier,
|
|
};
|
|
|
|
static void __init highbank_init(void)
|
|
{
|
|
pm_power_off = highbank_power_off;
|
|
highbank_pm_init();
|
|
|
|
bus_register_notifier(&platform_bus_type, &highbank_platform_nb);
|
|
bus_register_notifier(&amba_bustype, &highbank_amba_nb);
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char *highbank_match[] __initconst = {
|
|
"calxeda,highbank",
|
|
"calxeda,ecx-2000",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(HIGHBANK, "Highbank")
|
|
.smp = smp_ops(highbank_smp_ops),
|
|
.map_io = debug_ll_io_init,
|
|
.init_irq = highbank_init_irq,
|
|
.init_time = highbank_timer_init,
|
|
.init_machine = highbank_init,
|
|
.dt_compat = highbank_match,
|
|
.restart = highbank_restart,
|
|
MACHINE_END
|