From 338db6ec41cad7b3f3846ef91e58ae563993bbd6 Mon Sep 17 00:00:00 2001

From: Marc Zyngier <maz@kernel.org>

Date: Wed, 22 Sep 2021 14:19:41 +0100

Subject: [PATCH] irqchip/armada-370-xp: Fix ack/eoi breakage

Git-commit: 2a7313dc81e88adc7bb09d0f056985fa8afc2b89

Patch-mainline: v5.15-rc3

References: stable-5.14.9

commit 2a7313dc81e88adc7bb09d0f056985fa8afc2b89 upstream.

When converting the driver to using handle_percpu_devid_irq,

we forgot to repaint the irq_eoi() callback into irq_ack(),

as handle_percpu_devid_fasteoi_ipi() was actually using EOI

really early in the handling. Yes this was a stupid idea.

Fix this by using the HW ack method as irq_ack().

Fixes: e52e73b7e9f7 ("irqchip/armada-370-xp: Make IPIs use handle_percpu_devid_irq()")

Reported-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>

Tested-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>

Signed-off-by: Marc Zyngier <maz@kernel.org>

Cc: Valentin Schneider <valentin.schneider@arm.com>

Cc: stable@vger.kernel.org

Link: https://lore.kernel.org/r/87tuiexq5f.fsf@pengutronix.de

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/irqchip/irq-armada-370-xp.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c

index 7557ab551295..53e0fb0562c1 100644

--- a/drivers/irqchip/irq-armada-370-xp.c

+++ b/drivers/irqchip/irq-armada-370-xp.c

@@ -359,16 +359,16 @@ static void armada_370_xp_ipi_send_mask(struct irq_data *d,

 		ARMADA_370_XP_SW_TRIG_INT_OFFS);

 }

-static void armada_370_xp_ipi_eoi(struct irq_data *d)

+static void armada_370_xp_ipi_ack(struct irq_data *d)

 {

 	writel(~BIT(d->hwirq), per_cpu_int_base + ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS);

 }

 static struct irq_chip ipi_irqchip = {

 	.name		= "IPI",

+	.irq_ack	= armada_370_xp_ipi_ack,

 	.irq_mask	= armada_370_xp_ipi_mask,

 	.irq_unmask	= armada_370_xp_ipi_unmask,

-	.irq_eoi	= armada_370_xp_ipi_eoi,

 	.ipi_send_mask	= armada_370_xp_ipi_send_mask,

 };

-- 

2.26.2