Commit 4d04ecae authored Jan 12, 2025 by Philippe Simons Committed by Wen Zhiwei Mar 21, 2025

irqchip/sunxi-nmi: Add missing SKIP_WAKE flag

stable inclusion
from stable-v6.6.75
commit 2148a41dc8ff324278b078343826ddaa88382d50
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSPQB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2148a41dc8ff324278b078343826ddaa88382d50



--------------------------------

[ Upstream commit 3a748d483d80f066ca4b26abe45cdc0c367d13e9 ]

Some boards with Allwinner SoCs connect the PMIC's IRQ pin to the SoC's NMI
pin instead of a normal GPIO. Since the power key is connected to the PMIC,
and people expect to wake up a suspended system via this key, the NMI IRQ
controller must stay alive when the system goes into suspend.

Add the SKIP_WAKE flag to prevent the sunxi NMI controller from going to
sleep, so that the power key can wake up those systems.

[ tglx: Fixed up coding style ]

Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250112123402.388520-1-simons.philippe@gmail.com


Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent 80bd272e

drivers/irqchip/irq-sunxi-nmi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -186,7 +186,8 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
		gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit;
		gc->chip_types[0].chip.irq_eoi = irq_gc_ack_set_bit;
		gc->chip_types[0].chip.irq_set_type = sunxi_sc_nmi_set_type;
		gc->chip_types[0].chip.flags = IRQCHIP_EOI_THREADED \| IRQCHIP_EOI_IF_HANDLED;
		gc->chip_types[0].chip.flags = IRQCHIP_EOI_THREADED \| IRQCHIP_EOI_IF_HANDLED \|
		IRQCHIP_SKIP_SET_WAKE;
		gc->chip_types[0].regs.ack = reg_offs->pend;
		gc->chip_types[0].regs.mask = reg_offs->enable;
		gc->chip_types[0].regs.type = reg_offs->ctrl;