From c830c4918c4038d1fc47fac889c99ffc62968d48 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 12 Apr 2022 07:38:24 +0200 Subject: [PATCH] drop irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch from 4.9 and 4.14 --- ...hip-gic-v3-fix-gicr_ctlr.rwp-polling.patch | 61 ------------------- queue-4.14/series | 1 - ...hip-gic-v3-fix-gicr_ctlr.rwp-polling.patch | 61 ------------------- queue-4.9/series | 1 - 4 files changed, 124 deletions(-) delete mode 100644 queue-4.14/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch delete mode 100644 queue-4.9/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch diff --git a/queue-4.14/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch b/queue-4.14/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch deleted file mode 100644 index ba6b9b9955a..00000000000 --- a/queue-4.14/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0df6664531a12cdd8fc873f0cac0dcb40243d3e9 Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Tue, 15 Mar 2022 16:50:32 +0000 -Subject: irqchip/gic-v3: Fix GICR_CTLR.RWP polling - -From: Marc Zyngier - -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: 021f653791ad ("irqchip: gic-v3: Initial support for GICv3") -Signed-off-by: Marc Zyngier -Cc: stable@vger.kernel.org -Reviewed-by: Andre Przywara -Reviewed-by: Lorenzo Pieralisi -Link: https://lore.kernel.org/r/20220315165034.794482-2-maz@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/irqchip/irq-gic-v3.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/irqchip/irq-gic-v3.c -+++ b/drivers/irqchip/irq-gic-v3.c -@@ -92,11 +92,11 @@ static inline void __iomem *gic_dist_bas - return NULL; - } - --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"); -@@ -110,13 +110,13 @@ static void gic_do_wait_for_rwp(void __i - /* 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 diff --git a/queue-4.14/series b/queue-4.14/series index 21a1fbd4900..e29f436aba3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -253,7 +253,6 @@ x86-speculation-restore-speculation-related-msrs-during-s3-resume.patch btrfs-fix-qgroup-reserve-overflow-the-qgroup-limit.patch arm64-patch_text-fixup-last-cpu-should-be-master.patch perf-qcom_l2_pmu-fix-an-incorrect-null-check-on-list-iterator.patch -irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch mm-don-t-skip-swap-entry-even-if-zap_details-specified.patch diff --git a/queue-4.9/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch b/queue-4.9/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch deleted file mode 100644 index ba6b9b9955a..00000000000 --- a/queue-4.9/irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0df6664531a12cdd8fc873f0cac0dcb40243d3e9 Mon Sep 17 00:00:00 2001 -From: Marc Zyngier -Date: Tue, 15 Mar 2022 16:50:32 +0000 -Subject: irqchip/gic-v3: Fix GICR_CTLR.RWP polling - -From: Marc Zyngier - -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: 021f653791ad ("irqchip: gic-v3: Initial support for GICv3") -Signed-off-by: Marc Zyngier -Cc: stable@vger.kernel.org -Reviewed-by: Andre Przywara -Reviewed-by: Lorenzo Pieralisi -Link: https://lore.kernel.org/r/20220315165034.794482-2-maz@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - drivers/irqchip/irq-gic-v3.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- a/drivers/irqchip/irq-gic-v3.c -+++ b/drivers/irqchip/irq-gic-v3.c -@@ -92,11 +92,11 @@ static inline void __iomem *gic_dist_bas - return NULL; - } - --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"); -@@ -110,13 +110,13 @@ static void gic_do_wait_for_rwp(void __i - /* 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 diff --git a/queue-4.9/series b/queue-4.9/series index b0625a887be..5d75df211c1 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -194,7 +194,6 @@ mm-mempolicy-fix-mpol_new-leak-in-shared_policy_replace.patch x86-pm-save-the-msr-validity-status-at-context-setup.patch x86-speculation-restore-speculation-related-msrs-during-s3-resume.patch arm64-patch_text-fixup-last-cpu-should-be-master.patch -irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch mm-don-t-skip-swap-entry-even-if-zap_details-specified.patch -- 2.47.3