android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

irqchip/gic-v3: Fix GICR_CTLR.RWP polling

Browse Source 
commit 0df6664531a12cdd8fc873f0cac0dcb40243d3e9 upstream.

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: 021f653791 ("irqchip: gic-v3: Initial support for GICv3")
Signed-off-by: Marc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Link: https://lore.kernel.org/r/20220315165034.794482-2-maz@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marc Zyngier 2022-03-15 16:50:32 +00:00 committed by Greg Kroah-Hartman
parent 451214b266
commit ff24114bb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/irqchip/irq-gic-v3.c
View File

@ -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! */ u32 count = 1000000; /* 1s! */
while (readl_relaxed(base + GICD_CTLR) & GICD_CTLR_RWP) { while (readl_relaxed(base + GICD_CTLR) & bit) {
count--; count--;
if (!count) { if (!count) {
pr_err_ratelimited("RWP timeout, gone fishing\n"); 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 */ /* Wait for completion of a distributor change */
static void gic_dist_wait_for_rwp(void) 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 */ /* Wait for completion of a redistributor change */
static void gic_redist_wait_for_rwp(void) 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 #ifdef CONFIG_ARM64