bcm63xx: update patches

Update patches with their upstream versions.

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

SVN-Revision: 37098

1 files changed, 37 insertions, 33 deletions

diff --git a/target/linux/brcm63xx/patches-3.9/320-MIPS-BCM63XX-wire-up-the-second-CPU-s-irq-line.patch b/target/linux/brcm63xx/patches-3.9/320-MIPS-BCM63XX-wire-up-the-second-CPU-s-irq-line.patch
index 2acbf30b0d..2d92c24635 100644
--- a/target/linux/brcm63xx/patches-3.9/320-MIPS-BCM63XX-wire-up-the-second-CPU-s-irq-line.patch
+++ b/target/linux/brcm63xx/patches-3.9/320-MIPS-BCM63XX-wire-up-the-second-CPU-s-irq-line.patch
@@ -1,77 +1,80 @@
-From 1baec3216529f795905b6376f9c8e4f14b114ba2 Mon Sep 17 00:00:00 2001
+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 11/13] MIPS: BCM63XX: wire up the second CPU's irq line
+Subject: [PATCH 12/14] MIPS: BCM63XX: wire up the second cpu's irq line
 
-It's hardwired to IRQ3, so we don't need to actually check the CPU id.
-
-Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 ---
- arch/mips/bcm63xx/irq.c |   40 ++++++++++++++++++++++++++++++++--------
- 1 file changed, 32 insertions(+), 8 deletions(-)
+ 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
-@@ -329,11 +329,15 @@ static void __internal_irq_mask_##width(
+@@ -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_online_cpu(cpu) {					\
++	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);			\
  }									\
  									\
- static void __internal_irq_unmask_##width(unsigned int irq)		\
-@@ -341,11 +345,15 @@ static void __internal_irq_unmask_##widt
+@@ -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;							\
-+									\
-+	for_each_online_cpu(cpu) {					\
-+		u32 irq_mask_addr = get_irq_mask_addr(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); 					\
++		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);			\
  }
  
- BUILD_IPIC_INTERNAL(32);
-@@ -369,6 +377,10 @@ asmlinkage void plat_irq_dispatch(void)
+@@ -409,7 +426,10 @@ asmlinkage void plat_irq_dispatch(void)
  			do_IRQ(1);
  		if (cause & CAUSEF_IP2)
  			dispatch_internal(0);
-+#ifdef CONFIG_SMP
-+		if (cause & CAUSEF_IP3)
-+			dispatch_internal(1);
-+#else
- 		if (!is_ext_irq_cascaded) {
+-		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);
-@@ -379,6 +391,7 @@ asmlinkage void plat_irq_dispatch(void)
- 			if (cause & CAUSEF_IP6)
- 				do_IRQ(IRQ_EXT_3);
- 		}
-+#endif
- 	} while (1);
- }
- 
-@@ -598,6 +611,14 @@ static struct irqaction cpu_ip2_cascade_
+ 			if (cause & CAUSEF_IP4)
+@@ -622,6 +642,14 @@ static struct irqaction cpu_ip2_cascade_
  	.flags		= IRQF_NO_THREAD,
  };
  
@@ -86,11 +89,12 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  static struct irqaction cpu_ext_cascade_action = {
  	.handler	= no_action,
  	.name		= "cascade_extirq",
-@@ -624,4 +645,7 @@ void __init arch_init_irq(void)
+@@ -648,4 +676,8 @@ void __init arch_init_irq(void)
  	}
  
  	setup_irq(MIPS_CPU_IRQ_BASE + 2, &cpu_ip2_cascade_action);
 +#ifdef CONFIG_SMP
-+	setup_irq(MIPS_CPU_IRQ_BASE + 3, &cpu_ip3_cascade_action);
++	if (is_ext_irq_cascaded)
++		setup_irq(MIPS_CPU_IRQ_BASE + 3, &cpu_ip3_cascade_action);
 +#endif
  }