virt inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8URKX
--------------------------------
Hardware firmware may have different implement, disable vtimer mbigen probe when vtimer_irqbypass disabled.
Signed-off-by: Dongxu Sun sundongxu3@huawei.com --- drivers/irqchip/irq-mbigen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/irqchip/irq-mbigen.c b/drivers/irqchip/irq-mbigen.c index a5cc8b44082d..334f82f8ba4b 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -685,9 +685,6 @@ static int vtimer_mbigen_set_regs(struct platform_device *pdev) u32 val; struct vtimer_mbigen_device *chip;
- if (!vtimer_irqbypass) - return 0; - addr = mgn_chip->base + MBIGEN_CTLR; val = readl_relaxed(addr); mpidr_aff3 = (val & MBIGEN_AFF3_MASK) >> MBIGEN_AFF3_SHIFT; @@ -765,6 +762,9 @@ static int vtimer_mbigen_device_probe(struct platform_device *pdev) struct vtimer_mbigen_device *vtimer_mgn_chip; int err;
+ if (!vtimer_irqbypass) + return 0; + err = vtimer_mbigen_set_regs(pdev); if (err) return err;