irqchip/loongson-pch-pic: Fix registration of syscore_ops
authorJianmin Lv <lvjianmin@loongson.cn>
Fri, 7 Apr 2023 08:34:52 +0000 (16:34 +0800)
committerMarc Zyngier <maz@kernel.org>
Sat, 8 Apr 2023 10:29:18 +0000 (11:29 +0100)
When support suspend/resume for loongson-pch-pic, the syscore_ops
is registered twice in dual-bridges machines where there are two
pch-pic IRQ domains. Repeated registration of an same syscore_ops
broke syscore_ops_list, so the patch will corret it.

Fixes: 1ed008a2c331 ("irqchip/loongson-pch-pic: Add suspend/resume support")
Cc: stable@vger.kernel.org
Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230407083453.6305-5-lvjianmin@loongson.cn
drivers/irqchip/irq-loongson-pch-pic.c

index 437f1af..64fa67d 100644 (file)
@@ -311,7 +311,8 @@ static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base,
        pch_pic_handle[nr_pics] = domain_handle;
        pch_pic_priv[nr_pics++] = priv;
 
-       register_syscore_ops(&pch_pic_syscore_ops);
+       if (nr_pics == 1)
+               register_syscore_ops(&pch_pic_syscore_ops);
 
        return 0;