[PATCH v2] irqchip/sunxi-nmi: add missing flag

[PATCH v2] irqchip/sunxi-nmi: add missing flag

[Philippe Simons]

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 flag to prevent the sunxi NMI controller from going to sleep,
so that the power key can wake up those systems.

Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
---
 drivers/irqchip/irq-sunxi-nmi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index bb92fd85e..8dda0a85e 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -186,7 +186,9 @@ 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;
-- 
2.47.1

[tip: irq/urgent] irqchip/sunxi-nmi: Add missing SKIP_WAKE flag

[tip-bot2 for Philippe Simons]

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     3a748d483d80f066ca4b26abe45cdc0c367d13e9
Gitweb:        https://git.kernel.org/tip/3a748d483d80f066ca4b26abe45cdc0c367d13e9
Author:        Philippe Simons <simons.philippe@gmail.com>
AuthorDate:    Sun, 12 Jan 2025 13:34:02 +01:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 15 Jan 2025 09:42:45 +01:00

irqchip/sunxi-nmi: Add missing SKIP_WAKE flag

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

---
 drivers/irqchip/irq-sunxi-nmi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index bb92fd8..0b43121 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -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;

Re: [PATCH v2] irqchip/sunxi-nmi: add missing flag

[Jernej Škrabec]

Dne nedelja, 12. januar 2025 ob 13:34:02 Srednjeevropski standardni čas je Philippe Simons napisal(a):
> 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 flag to prevent the sunxi NMI controller from going to sleep,
> so that the power key can wake up those systems.
> 
> Signed-off-by: Philippe Simons <simons.philippe@gmail.com>
> ---

Please provide changelog here.

>  drivers/irqchip/irq-sunxi-nmi.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
> index bb92fd85e..8dda0a85e 100644
> --- a/drivers/irqchip/irq-sunxi-nmi.c
> +++ b/drivers/irqchip/irq-sunxi-nmi.c
> @@ -186,7 +186,9 @@ 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;

Alignment seems off. With that fixed:
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com

Best regards,
Jernej

>  	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;
>