This is a note to let you know that I've just added the patch titled
irqchip/loongson-pch-pic: Fix registration of syscore_ops
to the 6.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
irqchip-loongson-pch-pic-fix-registration-of-syscore_ops.patch
and it can be found in the queue-6.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c84efbba46901b187994558ee0edb15f7076c9a7 Mon Sep 17 00:00:00 2001
From: Jianmin Lv <lvjianmin@xxxxxxxxxxx>
Date: Fri, 7 Apr 2023 16:34:52 +0800
Subject: irqchip/loongson-pch-pic: Fix registration of syscore_ops
From: Jianmin Lv <lvjianmin@xxxxxxxxxxx>
commit c84efbba46901b187994558ee0edb15f7076c9a7 upstream.
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@xxxxxxxxxxxxxxx
Signed-off-by: Jianmin Lv <lvjianmin@xxxxxxxxxxx>
Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230407083453.6305-5-lvjianmin@xxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/irqchip/irq-loongson-pch-pic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c
index 437f1af693d0..64fa67d4ee7a 100644
--- a/drivers/irqchip/irq-loongson-pch-pic.c
+++ b/drivers/irqchip/irq-loongson-pch-pic.c
@@ -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;
--
2.40.1
Patches currently in stable-queue which might be from lvjianmin@xxxxxxxxxxx are
queue-6.2/irqchip-loongson-eiointc-fix-incorrect-use-of-acpi_get_vec_parent.patch
queue-6.2/irqchip-loongson-eiointc-fix-returned-value-on-parsing-madt.patch
queue-6.2/irqchip-loongson-pch-pic-fix-registration-of-syscore_ops.patch
queue-6.2/irqchip-loongson-eiointc-fix-registration-of-syscore_ops.patch
queue-6.2/irqchip-loongson-pch-pic-fix-pch_pic_acpi_init-calling.patch
