Skip to content

Commit

Permalink
irqchip/gic-v3: Move irq_domain_update_bus_token to after checking fo…
Browse files Browse the repository at this point in the history
…r 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
  • Loading branch information
luanshi authored and Marc Zyngier committed Mar 22, 2020
1 parent 9c2d4f5 commit eeaa4b2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/irqchip/irq-gic-v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 ");
Expand Down

0 comments on commit eeaa4b2

Please sign in to comment.