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

irqchip/gic: Remove static irq_chip definition for eoimode1 



There are only 3 differences (not including the name) in the definitions
of the gic_chip and gic_eoimode1_chip structures. Instead of statically
defining the gic_eoimode1_chip structure, remove it and populate the
eoimode1 functions dynamically for the appropriate GIC irqchips.

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

drivers/irqchip/irq-gic.c

+6 −16
Original line number Diff line number Diff line
@@ -399,20 +399,6 @@ static struct irq_chip gic_chip = { 
				  IRQCHIP_MASK_ON_SUSPEND,

};



static struct irq_chip gic_eoimode1_chip = {

	.name			= "GICv2",

	.irq_mask		= gic_eoimode1_mask_irq,

	.irq_unmask		= gic_unmask_irq,

	.irq_eoi		= gic_eoimode1_eoi_irq,

	.irq_set_type		= gic_set_type,

	.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,

	.flags			= IRQCHIP_SET_TYPE_MASKED |

				  IRQCHIP_SKIP_SET_WAKE |

				  IRQCHIP_MASK_ON_SUSPEND,

};



void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)

{

	BUG_ON(gic_nr >= CONFIG_ARM_GIC_MAX_NR);
@@ -1034,10 +1020,14 @@ static void __init __gic_init_bases(unsigned int gic_nr, int irq_start, 
	gic = &gic_data[gic_nr];



	/* Initialize irq_chip */

	gic->chip = gic_chip;



	if (static_key_true(&supports_deactivate) && gic_nr == 0) {

		gic->chip = gic_eoimode1_chip;

		gic->chip.irq_mask = gic_eoimode1_mask_irq;

		gic->chip.irq_eoi = gic_eoimode1_eoi_irq;

		gic->chip.irq_set_vcpu_affinity = gic_irq_set_vcpu_affinity;

		gic->chip.name = "GICv2";

	} else {

		gic->chip = gic_chip;

		gic->chip.name = kasprintf(GFP_KERNEL, "GIC-%d", gic_nr);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE