Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

irqchip: mips-gic: Use cpumask_first_and() in gic_set_affinity()

Browse Source 
Currently in gic_set_affinity() we calculate a temporary cpumask holding
the intersection of the provided cpumask & the CPUs that are online,
then we call cpumask_first twice on it to find the first such CPU. Since
we don't need the temporary cpumask for anything else & we only care
about the first CPU that's both online & in the provided cpumask, we can
instead use cpumask_first_and to find that CPU & drop the temporary
mask.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/17110/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2017-08-18 14:04:35 -07:00 committed by Ralf Baechle
parent b2b2e584ce
commit 07df8bfef8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/irqchip/irq-mips-gic.c
View File

@ -250,23 +250,23 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
bool force) bool force)
{ {
unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq); unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq);
cpumask_t tmp = CPU_MASK_NONE; unsigned long flags;
unsigned long flags; unsigned int cpu;
cpumask_and(&tmp, cpumask, cpu_online_mask); cpu = cpumask_first_and(cpumask, cpu_online_mask);
if (cpumask_empty(&tmp)) if (cpu >= NR_CPUS)
return -EINVAL; return -EINVAL;
/* Assumption : cpumask refers to a single CPU */ /* Assumption : cpumask refers to a single CPU */
spin_lock_irqsave(&gic_lock, flags); spin_lock_irqsave(&gic_lock, flags);
/* Re-route this IRQ */ /* Re-route this IRQ */
write_gic_map_vp(irq, BIT(mips_cm_vp_id(cpumask_first(&tmp)))); write_gic_map_vp(irq, BIT(mips_cm_vp_id(cpu)));
/* Update the pcpu_masks */ /* Update the pcpu_masks */
gic_clear_pcpu_masks(irq); gic_clear_pcpu_masks(irq);
if (read_gic_mask(irq)) if (read_gic_mask(irq))
set_bit(irq, per_cpu_ptr(pcpu_masks, cpumask_first(&tmp))); set_bit(irq, per_cpu_ptr(pcpu_masks, cpu));
cpumask_copy(irq_data_get_affinity_mask(d), cpumask); cpumask_copy(irq_data_get_affinity_mask(d), cpumask);
spin_unlock_irqrestore(&gic_lock, flags); spin_unlock_irqrestore(&gic_lock, flags);