Unverified Commit 50ded6f3 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3424 mbigen: vtimer: disable vtimer mbigen probe when vtimer_irqbypass disabled 

Merge Pull Request from: @sundongx 
 
mbigen: vtimer: disable vtimer mbigen probe when vtimer_irqbypass disabled
https://e.gitee.com/open_euler/issues/list?issue=I8ORX3 
 
Link:https://gitee.com/openeuler/kernel/pulls/3424

 

Reviewed-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 69a352ba 65b7da20

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;