Commit eeaa4b24 authored by luanshi's avatar luanshi Committed by Marc Zyngier
Browse files

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: default avatarLiguang Zhang <zhangliguang@linux.alibaba.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1583983255-44115-1-git-send-email-zhangliguang@linux.alibaba.com
parent 9c2d4f52
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1581,7 +1581,6 @@ static int __init gic_init_bases(void __iomem *dist_base,

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

	irq_domain_update_bus_token(gic_data.domain, DOMAIN_BUS_WIRED);

	gic_data.has_rss = !!(typer & GICD_TYPER_RSS);
	pr_info("Distributor has %sRange Selector support\n",
		gic_data.has_rss ? "" : "no ");