[tip: irq/core] irqchip/bcm2835: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND

From: tip-bot2 for Stefan Wahren
Date: Wed Jul 10 2024 - 13:00:19 EST


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

Commit-ID: 57c1c3f894f0bd4e81c89e3ea0e8c10405de8490
Gitweb: https://git.kernel.org/tip/57c1c3f894f0bd4e81c89e3ea0e8c10405de8490
Author: Stefan Wahren <wahrenst@xxxxxxx>
AuthorDate: Sun, 30 Jun 2024 17:36:46 +02:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Wed, 10 Jul 2024 18:52:23 +02:00

irqchip/bcm2835: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND

The BCM2835 ARMCTRL interrupt controller doesn't provide any facility to
configure the wakeup sources. That's the reason why the driver lacks the
irq_set_wake() callback for the interrupt chip.

But this prevent to properly enter power management states like "suspend to
idle".

Enable the flags IRQCHIP_SKIP_SET_WAKE and IRQCHIP_MASK_ON_SUSPEND so the
interrupt suspend logic can handle the chip correctly.

Signed-off-by: Stefan Wahren <wahrenst@xxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Florian Fainelli <florian.fainelli@xxxxxxxxxxxx>
---
drivers/irqchip/irq-bcm2835.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
index e94e288..6c20604 100644
--- a/drivers/irqchip/irq-bcm2835.c
+++ b/drivers/irqchip/irq-bcm2835.c
@@ -102,7 +102,9 @@ static void armctrl_unmask_irq(struct irq_data *d)
static struct irq_chip armctrl_chip = {
.name = "ARMCTRL-level",
.irq_mask = armctrl_mask_irq,
- .irq_unmask = armctrl_unmask_irq
+ .irq_unmask = armctrl_unmask_irq,
+ .flags = IRQCHIP_MASK_ON_SUSPEND |
+ IRQCHIP_SKIP_SET_WAKE,
};

static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr,