summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluanshi <zhangliguang@linux.alibaba.com>2020-03-12 11:20:55 +0800
committerMarc Zyngier <maz@kernel.org>2020-03-22 11:52:53 +0000
commiteeaa4b24e5032707ee4286b6a2bcc5fb85eba4a4 (patch)
tree0c4955c42ef2954f9e39f8a8ccd6d6bcbb526d03
parent9c2d4f525c002591f4e0c14a37663663aaba1656 (diff)
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@linux.alibaba.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/1583983255-44115-1-git-send-email-zhangliguang@linux.alibaba.com
-rw-r--r--drivers/irqchip/irq-gic-v3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index c1f7af9d9ae7..8e5dd9637338 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 ");