The following commit has been merged into the irq/core branch of tip:
Commit-ID: eeaa4b24e5032707ee4286b6a2bcc5fb85eba4a4
Gitweb: https://git.kernel.org/tip/eeaa4b24e5032707ee4286b6a2bcc5fb85eba4a4
Author: luanshi <zhangliguang@xxxxxxxxxxxxxxxxx>
AuthorDate: Thu, 12 Mar 2020 11:20:55 +08:00
Committer: Marc Zyngier <maz@xxxxxxxxxx>
CommitterDate: Sun, 22 Mar 2020 11:52:53
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 <zhangliguang@xxxxxxxxxxxxxxxxx>
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/1583983255-44115-1-git-send-email-zhangliguang@xxxxxxxxxxxxxxxxx
---
drivers/irqchip/irq-gic-v3.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index c1f7af9..8e5dd96 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -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 ");
|