Skip to content

Commit eeaa4b2

Browse files
luanshi0212Marc Zyngier
authored andcommitted
irqchip/gic-v3: Move irq_domain_update_bus_token to after checking for NULL domain
irq_domain_update_bus_token should be called after checking for NULL domain. Signed-off-by: Liguang Zhang <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 9c2d4f5 commit eeaa4b2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/irqchip/irq-gic-v3.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,6 @@ static int __init gic_init_bases(void __iomem *dist_base,
15811581

15821582
gic_data.domain = irq_domain_create_tree(handle, &gic_irq_domain_ops,
15831583
&gic_data);
1584-
irq_domain_update_bus_token(gic_data.domain, DOMAIN_BUS_WIRED);
15851584
gic_data.rdists.rdist = alloc_percpu(typeof(*gic_data.rdists.rdist));
15861585
gic_data.rdists.has_rvpeid = true;
15871586
gic_data.rdists.has_vlpis = true;
@@ -1592,6 +1591,8 @@ static int __init gic_init_bases(void __iomem *dist_base,
15921591
goto out_free;
15931592
}
15941593

1594+
irq_domain_update_bus_token(gic_data.domain, DOMAIN_BUS_WIRED);
1595+
15951596
gic_data.has_rss = !!(typer & GICD_TYPER_RSS);
15961597
pr_info("Distributor has %sRange Selector support\n",
15971598
gic_data.has_rss ? "" : "no ");

0 commit comments

Comments
 (0)