irq fixes

GIT PULL Ingo Molnar 1 participant 1 message Apr 23, 2016

Subsystems (3)

irqchip drivers IRQ MIPS core drivers

lore

Share & tools

lore

Ingo Molnar

author

2016-04-23 11:15 UTC #0 lore raw

Linus,

Please pull the latest irq-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus

# HEAD: 91951f980e521d8f7e92283735b99fb9f4b05d93 irqchip/mips-gic: Don't overrun pcpu_masks array

A core irq affinity masks related fix and a MIPS irqchip driver fix.

Thanks,

Ingo

------------------>
Matt Redfearn (1):
genirq: Dont allow affinity mask to be updated on IPIs

Paul Burton (1):
irqchip/mips-gic: Don't overrun pcpu_masks array

 drivers/irqchip/irq-mips-gic.c | 4 ++--
 kernel/irq/ipi.c               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

drivers/irqchip/irq-mips-gic.c +2 -2

index 94a30da0cfac..4dffccf532a2 100644
@@ -467,7 +467,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
 	gic_map_to_vpe(irq, mips_cm_vp_id(cpumask_first(&tmp)));
 
 	/* Update the pcpu_masks */
-	for (i = 0; i < gic_vpes; i++)
+	for (i = 0; i < min(gic_vpes, NR_CPUS); i++)
 		clear_bit(irq, pcpu_masks[i].pcpu_mask);
 	set_bit(irq, pcpu_masks[cpumask_first(&tmp)].pcpu_mask);

@@ -707,7 +707,7 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq,
 	spin_lock_irqsave(&gic_lock, flags);
 	gic_map_to_pin(intr, gic_cpu_pin);
 	gic_map_to_vpe(intr, vpe);
-	for (i = 0; i < gic_vpes; i++)
+	for (i = 0; i < min(gic_vpes, NR_CPUS); i++)
 		clear_bit(intr, pcpu_masks[i].pcpu_mask);
 	set_bit(intr, pcpu_masks[vpe].pcpu_mask);
 	spin_unlock_irqrestore(&gic_lock, flags);

kernel/irq/ipi.c +1 -0

index c37f34b00a11..14777af8e097 100644
@@ -94,6 +94,7 @@ unsigned int irq_reserve_ipi(struct irq_domain *domain,
 		data = irq_get_irq_data(virq + i);
 		cpumask_copy(data->common->affinity, dest);
 		data->common->ipi_offset = offset;
+		irq_set_status_flags(virq + i, IRQ_NO_BALANCING);
 	}
 	return virq;