Commit d38a71c5 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

irqchip/gic-v3-its: Change initialization ordering for LPIs 



We currently initialize the LPIs (and the ITS) fairly early, even
before the SMP support and the CPU interface. This is a bit odd
(as LPIs are not exactly crutial for the early boot process),
and is going to cause issues when reorganizing the probing code.

Let's move this initialization later.

Reviewed-by: default avatarJulien Thierry <julien.thierry@arm.com>
Tested-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Tested-by: default avatarBhupesh Sharma <bhsharma@redhat.com>
Tested-by: default avatarLei Zhang <zhang.lei@jp.fujitsu.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a23d3bb0

drivers/irqchip/irq-gic-v3.c

+12 −8
Original line number Diff line number Diff line
@@ -653,7 +653,9 @@ early_param("irqchip.gicv3_nolpi", gicv3_nolpi_cfg); 


static int gic_dist_supports_lpis(void)

{

	return !!(readl_relaxed(gic_data.dist_base + GICD_TYPER) & GICD_TYPER_LPIS) && !gicv3_nolpi;

	return (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) &&

		!!(readl_relaxed(gic_data.dist_base + GICD_TYPER) & GICD_TYPER_LPIS) &&

		!gicv3_nolpi);

}



static void gic_cpu_init(void)
@@ -673,10 +675,6 @@ static void gic_cpu_init(void) 


	gic_cpu_config(rbase, gic_redist_wait_for_rwp);



	/* Give LPIs a spin */

	if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis())

		its_cpu_init();



	/* initialise system registers */

	gic_cpu_sys_reg_init();

}
@@ -689,6 +687,10 @@ static void gic_cpu_init(void) 
static int gic_starting_cpu(unsigned int cpu)

{

	gic_cpu_init();



	if (gic_dist_supports_lpis())

		its_cpu_init();



	return 0;

}
@@ -1127,14 +1129,16 @@ static int __init gic_init_bases(void __iomem *dist_base, 


	gic_update_vlpi_properties();



	if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis())

		its_init(handle, &gic_data.rdists, gic_data.domain);



	gic_smp_init();

	gic_dist_init();

	gic_cpu_init();

	gic_cpu_pm_init();



	if (gic_dist_supports_lpis()) {

		its_init(handle, &gic_data.rdists, gic_data.domain);

		its_cpu_init();

	}



	return 0;



out_free:

CRA Git | Maintained and supported by SUSTech CRA and CCSE