mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
66f8f30f47
Update patches with their upstream versions. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37098
101 lines
3.0 KiB
Diff
101 lines
3.0 KiB
Diff
From 70c33fe0df8d14e40f3ca92ce56a668d66184858 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
|
Date: Fri, 26 Apr 2013 12:03:15 +0200
|
|
Subject: [PATCH 12/14] MIPS: BCM63XX: wire up the second cpu's irq line
|
|
|
|
---
|
|
arch/mips/bcm63xx/irq.c | 50 ++++++++++++++++++++++++++++++++++++++---------
|
|
1 file changed, 41 insertions(+), 9 deletions(-)
|
|
|
|
--- a/arch/mips/bcm63xx/irq.c
|
|
+++ b/arch/mips/bcm63xx/irq.c
|
|
@@ -363,13 +363,20 @@ static void __internal_irq_mask_##width(
|
|
u32 val; \
|
|
unsigned reg = (irq / 32) ^ (width/32 - 1); \
|
|
unsigned bit = irq & 0x1f; \
|
|
- u32 irq_mask_addr = get_irq_mask_addr(0); \
|
|
unsigned long flags; \
|
|
+ int cpu; \
|
|
\
|
|
spin_lock_irqsave(&ipic_lock, flags); \
|
|
- val = bcm_readl(irq_mask_addr + reg * sizeof(u32)); \
|
|
- val &= ~(1 << bit); \
|
|
- bcm_writel(val, irq_mask_addr + reg * sizeof(u32)); \
|
|
+ for_each_present_cpu(cpu) { \
|
|
+ u32 irq_mask_addr = get_irq_mask_addr(cpu); \
|
|
+ \
|
|
+ if (!irq_mask_addr) \
|
|
+ break; \
|
|
+ \
|
|
+ val = bcm_readl(irq_mask_addr + reg * sizeof(u32)); \
|
|
+ val &= ~(1 << bit); \
|
|
+ bcm_writel(val, irq_mask_addr + reg * sizeof(u32)); \
|
|
+ } \
|
|
spin_unlock_irqrestore(&ipic_lock, flags); \
|
|
} \
|
|
\
|
|
@@ -378,13 +385,23 @@ static void __internal_irq_unmask_##widt
|
|
u32 val; \
|
|
unsigned reg = (irq / 32) ^ (width/32 - 1); \
|
|
unsigned bit = irq & 0x1f; \
|
|
- u32 irq_mask_addr = get_irq_mask_addr(0); \
|
|
unsigned long flags; \
|
|
+ int cpu; \
|
|
\
|
|
spin_lock_irqsave(&ipic_lock, flags); \
|
|
- val = bcm_readl(irq_mask_addr + reg * sizeof(u32)); \
|
|
- val |= (1 << bit); \
|
|
- bcm_writel(val, irq_mask_addr + reg * sizeof(u32)); \
|
|
+ for_each_present_cpu(cpu) { \
|
|
+ u32 irq_mask_addr = get_irq_mask_addr(cpu); \
|
|
+ \
|
|
+ if (!irq_mask_addr) \
|
|
+ break; \
|
|
+ \
|
|
+ val = bcm_readl(irq_mask_addr + reg * sizeof(u32)); \
|
|
+ if (cpu_online(cpu)) \
|
|
+ val |= (1 << bit); \
|
|
+ else \
|
|
+ val &= ~(1 << bit); \
|
|
+ bcm_writel(val, irq_mask_addr + reg * sizeof(u32)); \
|
|
+ } \
|
|
spin_unlock_irqrestore(&ipic_lock, flags); \
|
|
}
|
|
|
|
@@ -409,7 +426,10 @@ asmlinkage void plat_irq_dispatch(void)
|
|
do_IRQ(1);
|
|
if (cause & CAUSEF_IP2)
|
|
dispatch_internal(0);
|
|
- if (!is_ext_irq_cascaded) {
|
|
+ if (is_ext_irq_cascaded) {
|
|
+ if (cause & CAUSEF_IP3)
|
|
+ dispatch_internal(1);
|
|
+ } else {
|
|
if (cause & CAUSEF_IP3)
|
|
do_IRQ(IRQ_EXT_0);
|
|
if (cause & CAUSEF_IP4)
|
|
@@ -622,6 +642,14 @@ static struct irqaction cpu_ip2_cascade_
|
|
.flags = IRQF_NO_THREAD,
|
|
};
|
|
|
|
+#ifdef CONFIG_SMP
|
|
+static struct irqaction cpu_ip3_cascade_action = {
|
|
+ .handler = no_action,
|
|
+ .name = "cascade_ip3",
|
|
+ .flags = IRQF_NO_THREAD,
|
|
+};
|
|
+#endif
|
|
+
|
|
static struct irqaction cpu_ext_cascade_action = {
|
|
.handler = no_action,
|
|
.name = "cascade_extirq",
|
|
@@ -648,4 +676,8 @@ void __init arch_init_irq(void)
|
|
}
|
|
|
|
setup_irq(MIPS_CPU_IRQ_BASE + 2, &cpu_ip2_cascade_action);
|
|
+#ifdef CONFIG_SMP
|
|
+ if (is_ext_irq_cascaded)
|
|
+ setup_irq(MIPS_CPU_IRQ_BASE + 3, &cpu_ip3_cascade_action);
|
|
+#endif
|
|
}
|