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

Commit 18416e45 authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

irqchip/mips-gic: Report that effective affinity is a single target 



The MIPS GIC driver only targets a single CPU at a time, even if
the notional affinity is wider. Let's inform the core code
about this.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: http://lkml.kernel.org/r/20170818083925.10108-12-marc.zyngier@arm.com
parent 79a0d4d8

drivers/irqchip/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ config IRQ_MIPS_CPU 
	select GENERIC_IRQ_IPI if SYS_SUPPORTS_MULTITHREADING

	select IRQ_DOMAIN

	select IRQ_DOMAIN_HIERARCHY if GENERIC_IRQ_IPI

	select GENERIC_IRQ_EFFECTIVE_AFF_MASK



config CLPS711X_IRQCHIP

	bool

drivers/irqchip/irq-mips-gic.c

+7 −3
Original line number Diff line number Diff line
@@ -445,24 +445,27 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask, 
	unsigned int irq = GIC_HWIRQ_TO_SHARED(d->hwirq);

	cpumask_t	tmp = CPU_MASK_NONE;

	unsigned long	flags;

	int		i;

	int		i, cpu;



	cpumask_and(&tmp, cpumask, cpu_online_mask);

	if (cpumask_empty(&tmp))

		return -EINVAL;



	cpu = cpumask_first(&tmp);



	/* Assumption : cpumask refers to a single CPU */

	spin_lock_irqsave(&gic_lock, flags);



	/* Re-route this IRQ */

	gic_map_to_vpe(irq, mips_cm_vp_id(cpumask_first(&tmp)));

	gic_map_to_vpe(irq, mips_cm_vp_id(cpu));



	/* Update the pcpu_masks */

	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);

	set_bit(irq, pcpu_masks[cpu].pcpu_mask);



	cpumask_copy(irq_data_get_affinity_mask(d), cpumask);

	irq_data_update_effective_affinity(d, cpumask_of(cpu));

	spin_unlock_irqrestore(&gic_lock, flags);



	return IRQ_SET_MASK_OK_NOCOPY;
@@ -716,6 +719,7 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq, 
		if (err)

			return err;



		irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(virq)));

		return gic_shared_irq_domain_map(d, virq, hwirq, 0);

	}