diff options
Diffstat (limited to 'target/linux/sibyte/patches/003-fix_locking.patch')
| -rw-r--r-- | target/linux/sibyte/patches/003-fix_locking.patch | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/target/linux/sibyte/patches/003-fix_locking.patch b/target/linux/sibyte/patches/003-fix_locking.patch new file mode 100644 index 000000000..eaa70f6ad --- /dev/null +++ b/target/linux/sibyte/patches/003-fix_locking.patch @@ -0,0 +1,74 @@ +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 <tsbogend@xxxxxxxxxxxxxxxx> +--- + + arch/mips/sibyte/bcm1480/irq.c | 7 ++----- + arch/mips/sibyte/sb1250/irq.c | 7 ++----- + 2 files changed, 4 insertions(+), 10 deletions(-) + +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 + |