From 74f58abd79aa2f089b3cd3bb634499ced86112cf Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 12 May 2009 20:32:08 +0000 Subject: [PATCH] needed, so sb1 will boot in smp svn path=/dists/trunk/linux-2.6/; revision=13611 --- debian/patches/bugfix/mips/sb-irq.patch | 78 +++++++++++++++++++++++++ debian/patches/series/base | 1 + 2 files changed, 79 insertions(+) create mode 100644 debian/patches/bugfix/mips/sb-irq.patch diff --git a/debian/patches/bugfix/mips/sb-irq.patch b/debian/patches/bugfix/mips/sb-irq.patch new file mode 100644 index 000000000..ed2374214 --- /dev/null +++ b/debian/patches/bugfix/mips/sb-irq.patch @@ -0,0 +1,78 @@ +From: Thomas Bogendoerfer +Date: Mon, 4 May 2009 21:51:54 +0000 (+0200) +Subject: MIPS: Sibyte: Fix locking in set_irq_affinity +X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=a28e039e0c0044edd2666e96bada8ad472605529 + +MIPS: Sibyte: Fix locking in set_irq_affinity + +Locking of irq_desc is now done in irq_set_affinity; don't lock it again +in chip specific set_affinity function. + +Signed-off-by: Thomas Bogendoerfer +Signed-off-by: Ralf Baechle +--- + +diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c +index 352352b..c147c4b 100644 +--- a/arch/mips/sibyte/bcm1480/irq.c ++++ b/arch/mips/sibyte/bcm1480/irq.c +@@ -113,7 +113,6 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask) + { + int i = 0, old_cpu, cpu, int_on, k; + u64 cur_ints; +- struct irq_desc *desc = irq_desc + irq; + unsigned long flags; + unsigned int irq_dirty; + +@@ -127,8 +126,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask) + cpu = cpu_logical_map(i); + + /* Protect against other affinity changers and IMR manipulation */ +- spin_lock_irqsave(&desc->lock, flags); +- spin_lock(&bcm1480_imr_lock); ++ spin_lock_irqsave(&bcm1480_imr_lock, flags); + + /* Swizzle each CPU's IMR (but leave the IP selection alone) */ + old_cpu = bcm1480_irq_owner[irq]; +@@ -153,8 +151,7 @@ static void bcm1480_set_affinity(unsigned int irq, const struct cpumask *mask) + ____raw_writeq(cur_ints, IOADDR(A_BCM1480_IMR_MAPPER(cpu) + R_BCM1480_IMR_INTERRUPT_MASK_H + (k*BCM1480_IMR_HL_SPACING))); + } + } +- spin_unlock(&bcm1480_imr_lock); +- spin_unlock_irqrestore(&desc->lock, flags); ++ spin_unlock_irqrestore(&bcm1480_imr_lock, flags); + } + #endif + +diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c +index c08ff58..38cb998 100644 +--- a/arch/mips/sibyte/sb1250/irq.c ++++ b/arch/mips/sibyte/sb1250/irq.c +@@ -107,7 +107,6 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) + { + int i = 0, old_cpu, cpu, int_on; + u64 cur_ints; +- struct irq_desc *desc = irq_desc + irq; + unsigned long flags; + + i = cpumask_first(mask); +@@ -121,8 +120,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) + cpu = cpu_logical_map(i); + + /* Protect against other affinity changers and IMR manipulation */ +- spin_lock_irqsave(&desc->lock, flags); +- spin_lock(&sb1250_imr_lock); ++ spin_lock_irqsave(&sb1250_imr_lock, flags); + + /* Swizzle each CPU's IMR (but leave the IP selection alone) */ + old_cpu = sb1250_irq_owner[irq]; +@@ -144,8 +142,7 @@ static void sb1250_set_affinity(unsigned int irq, const struct cpumask *mask) + ____raw_writeq(cur_ints, IOADDR(A_IMR_MAPPER(cpu) + + R_IMR_INTERRUPT_MASK)); + } +- spin_unlock(&sb1250_imr_lock); +- spin_unlock_irqrestore(&desc->lock, flags); ++ spin_unlock_irqrestore(&sb1250_imr_lock, flags); + } + #endif + diff --git a/debian/patches/series/base b/debian/patches/series/base index 30264422e..0d46d81db 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -31,3 +31,4 @@ + bugfix/all/mvsdio-platform.patch + bugfix/all/mmc-sd-udelay-switch.patch + features/arm/kirkwood-cpu-idle.patch ++ bugfix/mips/sb-irq.patch