FAILED: patch "[PATCH] irqchip/gic-v3: Fix GICR_CTLR.RWP polling" failed to apply to 4.14-stable tree

PATCH [email protected] 1 participant 1 message Apr 12, 2022

Subsystems (3)

Stable branch irqchip drivers Arm generic interrupt controller drivers

lore

Share & tools

lore

[email protected]

author maintainer

2022-04-12 05:37 UTC #0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 0df6664531a12cdd8fc873f0cac0dcb40243d3e9 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Tue, 15 Mar 2022 16:50:32 +0000
Subject: [PATCH] irqchip/gic-v3: Fix GICR_CTLR.RWP polling

It turns out that our polling of RWP is totally wrong when checking for it in the redistributors, as we test the *distributor* bit index, whereas it is a different bit number in the RDs... Oopsie boo.

This is embarassing. Not only because it is wrong, but also because it took *8 years* to notice the blunder...

Just fix the damn thing.

Fixes 021f653791ad ("irqchip: gic-v3: Initial support for GICv3")

Signed-off-by Marc Zyngier <[email protected]>

Cc [email protected]

Reviewed-by Andre Przywara <[email protected]>

Reviewed-by Lorenzo Pieralisi <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

drivers/irqchip/irq-gic-v3.c +4 -4

index 0efe1a9a9f3b..9b6316582515 100644
@@ -206,11 +206,11 @@ static inline void __iomem *gic_dist_base(struct irq_data *d)
 	}
 }
 
-static void gic_do_wait_for_rwp(void __iomem *base)
+static void gic_do_wait_for_rwp(void __iomem *base, u32 bit)
 {
 	u32 count = 1000000;	/* 1s! */
 
-	while (readl_relaxed(base + GICD_CTLR) & GICD_CTLR_RWP) {
+	while (readl_relaxed(base + GICD_CTLR) & bit) {
 		count--;
 		if (!count) {
 			pr_err_ratelimited("RWP timeout, gone fishing\n");

@@ -224,13 +224,13 @@ static void gic_do_wait_for_rwp(void __iomem *base)
 /* Wait for completion of a distributor change */
 static void gic_dist_wait_for_rwp(void)
 {
-	gic_do_wait_for_rwp(gic_data.dist_base);
+	gic_do_wait_for_rwp(gic_data.dist_base, GICD_CTLR_RWP);
 }
 
 /* Wait for completion of a redistributor change */
 static void gic_redist_wait_for_rwp(void)
 {
-	gic_do_wait_for_rwp(gic_data_rdist_rd_base());
+	gic_do_wait_for_rwp(gic_data_rdist_rd_base(), GICR_CTLR_RWP);
 }
 
 #ifdef CONFIG_ARM64