Commit 65b7da20 authored by Dongxu Sun's avatar Dongxu Sun
Browse files

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: default avatarDongxu Sun <sundongxu3@huawei.com>
parent 42d7d2ee

drivers/irqchip/irq-mbigen.c

+3 −3
Original line number Diff line number Diff line
@@ -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;