From: Greg Kroah-Hartman Date: Tue, 3 Jun 2025 07:59:04 +0000 (+0200) Subject: drop broken riscv patch X-Git-Tag: v5.4.294~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=352049f2a8bea9eee489357e001e2f49d2cced4d;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken riscv patch --- diff --git a/queue-5.10/clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch b/queue-5.10/clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch deleted file mode 100644 index bb8555f72c..0000000000 --- a/queue-5.10/clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a71c2fa48f8601049041b0cb74aeeaa184be7fa4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 19 Feb 2025 19:41:35 +0800 -Subject: clocksource/drivers/timer-riscv: Stop stimecmp when cpu hotplug - -From: Nick Hu - -[ Upstream commit 70c93b026ed07078e933583591aa9ca6701cd9da ] - -Stop the timer when the cpu is going to be offline otherwise the -timer interrupt may be pending while performing power-down. - -Suggested-by: Anup Patel -Link: https://lore.kernel.org/lkml/20240829033904.477200-3-nick.hu@sifive.com/T/#u -Signed-off-by: Nick Hu -Reviewed-by: Anup Patel -Acked-by: Daniel Lezcano -Link: https://lore.kernel.org/r/20250219114135.27764-3-nick.hu@sifive.com -Signed-off-by: Alexandre Ghiti -Signed-off-by: Sasha Levin ---- - drivers/clocksource/timer-riscv.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c -index c51c5ed15aa75..427c92dd048c4 100644 ---- a/drivers/clocksource/timer-riscv.c -+++ b/drivers/clocksource/timer-riscv.c -@@ -75,7 +75,13 @@ static int riscv_timer_starting_cpu(unsigned int cpu) - - static int riscv_timer_dying_cpu(unsigned int cpu) - { -+ /* -+ * Stop the timer when the cpu is going to be offline otherwise -+ * the timer interrupt may be pending while performing power-down. -+ */ -+ riscv_clock_event_stop(); - disable_percpu_irq(riscv_clock_event_irq); -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-5.10/series b/queue-5.10/series index ebfea2ae40..a3d56eab87 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -135,7 +135,6 @@ i2c-qup-vote-for-interconnect-bandwidth-to-dram.patch i2c-pxa-fix-call-balance-of-i2c-clk-handling-routine.patch btrfs-avoid-linker-error-in-btrfs_find_create_tree_b.patch btrfs-send-return-enametoolong-when-attempting-a-pat.patch -clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch um-store-full-csgsfs-and-ss-register-from-mcontext.patch um-update-min_low_pfn-to-match-changes-in-uml_reserv.patch ext4-reorder-capability-check-last.patch diff --git a/queue-5.15/clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch b/queue-5.15/clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch deleted file mode 100644 index 3260c7f9b2..0000000000 --- a/queue-5.15/clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d469d244ff224a69d98fe50b33ea259a662f6d9f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 19 Feb 2025 19:41:35 +0800 -Subject: clocksource/drivers/timer-riscv: Stop stimecmp when cpu hotplug - -From: Nick Hu - -[ Upstream commit 70c93b026ed07078e933583591aa9ca6701cd9da ] - -Stop the timer when the cpu is going to be offline otherwise the -timer interrupt may be pending while performing power-down. - -Suggested-by: Anup Patel -Link: https://lore.kernel.org/lkml/20240829033904.477200-3-nick.hu@sifive.com/T/#u -Signed-off-by: Nick Hu -Reviewed-by: Anup Patel -Acked-by: Daniel Lezcano -Link: https://lore.kernel.org/r/20250219114135.27764-3-nick.hu@sifive.com -Signed-off-by: Alexandre Ghiti -Signed-off-by: Sasha Levin ---- - drivers/clocksource/timer-riscv.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c -index c51c5ed15aa75..427c92dd048c4 100644 ---- a/drivers/clocksource/timer-riscv.c -+++ b/drivers/clocksource/timer-riscv.c -@@ -75,7 +75,13 @@ static int riscv_timer_starting_cpu(unsigned int cpu) - - static int riscv_timer_dying_cpu(unsigned int cpu) - { -+ /* -+ * Stop the timer when the cpu is going to be offline otherwise -+ * the timer interrupt may be pending while performing power-down. -+ */ -+ riscv_clock_event_stop(); - disable_percpu_irq(riscv_clock_event_irq); -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index cf7fd500f6..d319f91adf 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -33,7 +33,6 @@ btrfs-get-zone-unusable-bytes-while-holding-lock-at-.patch btrfs-send-return-enametoolong-when-attempting-a-pat.patch i3c-master-svc-fix-missing-stop-for-master-request.patch dlm-make-tcp-still-work-in-multi-link-env.patch -clocksource-drivers-timer-riscv-stop-stimecmp-when-c.patch um-store-full-csgsfs-and-ss-register-from-mcontext.patch um-update-min_low_pfn-to-match-changes-in-uml_reserv.patch ext4-reorder-capability-check-last.patch