brcm63xx: reorder some patches according to their upstream state

The irq rewrite was accepted upstream.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 42739

1 files changed, 93 insertions, 0 deletions

diff --git a/target/linux/brcm63xx/patches-3.14/025-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch b/target/linux/brcm63xx/patches-3.14/025-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch
new file mode 100644
index 0000000000..6e8489078e
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.14/025-MIPS-BCM63XX-wire-up-the-second-cpu-s-irq-line.patch
@@ -0,0 +1,93 @@
+From 6e74b82aca08a5ecc4d2f0780254468659427e82 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Fri, 26 Apr 2013 12:03:15 +0200
+Subject: [PATCH 08/10] MIPS: BCM63XX: wire up the second cpu's irq line
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ arch/mips/bcm63xx/irq.c | 44 +++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 37 insertions(+), 7 deletions(-)
+
+--- a/arch/mips/bcm63xx/irq.c
++++ b/arch/mips/bcm63xx/irq.c
+@@ -102,11 +102,17 @@ static void __internal_irq_mask_##width(
+ 	unsigned reg = (irq / 32) ^ (width/32 - 1);			\
+ 	unsigned bit = irq & 0x1f;					\
+ 	unsigned long flags;						\
++	int cpu;							\
+ 									\
+ 	spin_lock_irqsave(&ipic_lock, flags);				\
+-	val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));		\
+-	val &= ~(1 << bit);						\
+-	bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));		\
++	for_each_present_cpu(cpu) {					\
++		if (!irq_mask_addr[cpu])				\
++			break;						\
++									\
++		val = bcm_readl(irq_mask_addr[cpu] + reg * sizeof(u32));\
++		val &= ~(1 << bit);					\
++		bcm_writel(val, irq_mask_addr[cpu] + reg * sizeof(u32));\
++	}								\
+ 	spin_unlock_irqrestore(&ipic_lock, flags);			\
+ }									\
+ 									\
+@@ -116,11 +122,20 @@ static void __internal_irq_unmask_##widt
+ 	unsigned reg = (irq / 32) ^ (width/32 - 1);			\
+ 	unsigned bit = irq & 0x1f;					\
+ 	unsigned long flags;						\
++	int cpu;							\
+ 									\
+ 	spin_lock_irqsave(&ipic_lock, flags);				\
+-	val = bcm_readl(irq_mask_addr[0] + reg * sizeof(u32));		\
+-	val |= (1 << bit);						\
+-	bcm_writel(val, irq_mask_addr[0] + reg * sizeof(u32));		\
++	for_each_present_cpu(cpu) {					\
++		if (!irq_mask_addr[cpu])				\
++			break;						\
++									\
++		val = bcm_readl(irq_mask_addr[cpu] + reg * sizeof(u32));\
++		if (cpu_online(cpu))					\
++			val |= (1 << bit);				\
++		else							\
++			val &= ~(1 << bit);				\
++		bcm_writel(val, irq_mask_addr[cpu] + reg * sizeof(u32));\
++	}								\
+ 	spin_unlock_irqrestore(&ipic_lock, flags);			\
+ }
+ 
+@@ -145,7 +160,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)
+@@ -358,6 +376,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",
+@@ -494,4 +520,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
+ }