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

Commit 7bf29d3a authored by Jon Hunter's avatar Jon Hunter Committed by Marc Zyngier
Browse files

irqchip/gic: Only populate set_affinity for the root controller 



Setting the affinity of an IRQ, it only applicable for the root
interrupt controller and so only populate this operator for the root
controller.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 1a485f4d

drivers/irqchip/irq-gic.c

+5 −6
Original line number Diff line number Diff line
@@ -384,9 +384,6 @@ static struct irq_chip gic_chip = { 
	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoi_irq,

	.irq_set_type		= gic_set_type,

#ifdef CONFIG_SMP

	.irq_set_affinity	= gic_set_affinity,

#endif

	.irq_get_irqchip_state	= gic_irq_get_irqchip_state,

	.irq_set_irqchip_state	= gic_irq_set_irqchip_state,

	.flags			= IRQCHIP_SET_TYPE_MASKED |
@@ -400,9 +397,6 @@ static struct irq_chip gic_eoimode1_chip = { 
	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoimode1_eoi_irq,

	.irq_set_type		= gic_set_type,

#ifdef CONFIG_SMP

	.irq_set_affinity	= gic_set_affinity,

#endif

	.irq_get_irqchip_state	= gic_irq_get_irqchip_state,

	.irq_set_irqchip_state	= gic_irq_set_irqchip_state,

	.irq_set_vcpu_affinity	= gic_irq_set_vcpu_affinity,
@@ -1039,6 +1033,11 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start, 
		gic->chip.name = kasprintf(GFP_KERNEL, "GIC-%d", gic_nr);

	}



#ifdef CONFIG_SMP

	if (gic_nr == 0)

		gic->chip.irq_set_affinity = gic_set_affinity;

#endif



#ifdef CONFIG_GIC_NON_BANKED

	if (percpu_offset) { /* Frankein-GIC without banked registers... */

		unsigned int cpu;