From 65b7da20e7fc12e50d1de4d2465e61d9e225b1cc Mon Sep 17 00:00:00 2001 From: Dongxu Sun Date: Fri, 15 Dec 2023 15:37:08 +0800 Subject: [PATCH] mbigen: vtimer: disable vtimer mbigen probe when vtimer_irqbypass disabled virt inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8ORX3 -------------------------------- Hardware firmware may have different implement, disable vtimer mbigen probe when vtimer_irqbypass disabled. Signed-off-by: Dongxu Sun --- 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 91059135b007..16090b620496 100644 --- a/drivers/irqchip/irq-mbigen.c +++ b/drivers/irqchip/irq-mbigen.c @@ -687,9 +687,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; @@ -767,6 +764,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; -- Gitee