Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16ecb414 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Ingo Molnar:
 "A core irq affinity masks related fix and a MIPS irqchip driver fix"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/mips-gic: Don't overrun pcpu_masks array
  genirq: Dont allow affinity mask to be updated on IPIs
parents 6527efba 91951f98

drivers/irqchip/irq-mips-gic.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;