From: Greg Kroah-Hartman Date: Mon, 6 Jan 2025 13:35:34 +0000 (+0100) Subject: drop some patches X-Git-Tag: v5.4.289~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b1bc1aa73bbfc65485c201a8881e00f74347761;p=thirdparty%2Fkernel%2Fstable-queue.git drop some patches --- diff --git a/queue-6.12/series b/queue-6.12/series index b39887ecc9c..776cc4dda06 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -121,7 +121,6 @@ kcov-mark-in_softirq_really-as-__always_inline.patch maple_tree-reload-mas-before-the-second-call-for-mas_empty_area.patch clk-clk-imx8mp-audiomix-fix-function-signature.patch scripts-sorttable-fix-orc_sort_cmp-to-maintain-symmetry-and-transitivity.patch -vmstat-disable-vmstat_work-on-vmstat_cpu_down_prep.patch sched_ext-fix-invalid-irq-restore-in-scx_ops_bypass.patch rdma-uverbs-prevent-integer-overflow-issue.patch pinctrl-mcp23s08-fix-sleeping-in-atomic-context-due-to-regmap-locking.patch diff --git a/queue-6.12/vmstat-disable-vmstat_work-on-vmstat_cpu_down_prep.patch b/queue-6.12/vmstat-disable-vmstat_work-on-vmstat_cpu_down_prep.patch deleted file mode 100644 index 72ba3147eaa..00000000000 --- a/queue-6.12/vmstat-disable-vmstat_work-on-vmstat_cpu_down_prep.patch +++ /dev/null @@ -1,66 +0,0 @@ -From adcfb264c3ed51fbbf5068ddf10d309a63683868 Mon Sep 17 00:00:00 2001 -From: Koichiro Den -Date: Sat, 21 Dec 2024 12:33:20 +0900 -Subject: vmstat: disable vmstat_work on vmstat_cpu_down_prep() - -From: Koichiro Den - -commit adcfb264c3ed51fbbf5068ddf10d309a63683868 upstream. - -Even after mm/vmstat:online teardown, shepherd may still queue work for -the dying cpu until the cpu is removed from online mask. While it's quite -rare, this means that after unbind_workers() unbinds a per-cpu kworker, it -potentially runs vmstat_update for the dying CPU on an irrelevant cpu -before entering atomic AP states. When CONFIG_DEBUG_PREEMPT=y, it results -in the following error with the backtrace. - - BUG: using smp_processor_id() in preemptible [00000000] code: \ - kworker/7:3/1702 - caller is refresh_cpu_vm_stats+0x235/0x5f0 - CPU: 0 UID: 0 PID: 1702 Comm: kworker/7:3 Tainted: G - Tainted: [N]=TEST - Workqueue: mm_percpu_wq vmstat_update - Call Trace: - - dump_stack_lvl+0x8d/0xb0 - check_preemption_disabled+0xce/0xe0 - refresh_cpu_vm_stats+0x235/0x5f0 - vmstat_update+0x17/0xa0 - process_one_work+0x869/0x1aa0 - worker_thread+0x5e5/0x1100 - kthread+0x29e/0x380 - ret_from_fork+0x2d/0x70 - ret_from_fork_asm+0x1a/0x30 - - -So, for mm/vmstat:online, disable vmstat_work reliably on teardown and -symmetrically enable it on startup. - -Link: https://lkml.kernel.org/r/20241221033321.4154409-1-koichiro.den@canonical.com -Signed-off-by: Koichiro Den -Cc: Sebastian Andrzej Siewior -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - mm/vmstat.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/mm/vmstat.c -+++ b/mm/vmstat.c -@@ -2139,13 +2139,14 @@ static int vmstat_cpu_online(unsigned in - if (!node_state(cpu_to_node(cpu), N_CPU)) { - node_set_state(cpu_to_node(cpu), N_CPU); - } -+ enable_delayed_work(&per_cpu(vmstat_work, cpu)); - - return 0; - } - - static int vmstat_cpu_down_prep(unsigned int cpu) - { -- cancel_delayed_work_sync(&per_cpu(vmstat_work, cpu)); -+ disable_delayed_work_sync(&per_cpu(vmstat_work, cpu)); - return 0; - } - diff --git a/queue-6.6/revert-watchdog-s3c2410_wdt-use-exynos_get_pmu_regma.patch b/queue-6.6/revert-watchdog-s3c2410_wdt-use-exynos_get_pmu_regma.patch deleted file mode 100644 index 26840636026..00000000000 --- a/queue-6.6/revert-watchdog-s3c2410_wdt-use-exynos_get_pmu_regma.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 67cff7dc957b3b9d13ad423d755d0788bac5f62e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 29 Oct 2024 19:11:31 +0000 -Subject: Revert "watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() - for PMU regs" - -From: Peter Griffin - -[ Upstream commit ccfb765944bb66813398958983cb8141e2624a6b ] - -This reverts commit 746f0770f916e6c48e422d6a34e67eae16707f0e. - -Now that we can register a SoC specific regmap with syscon using -of_syscon_register_regmap() api we can switch back to using -syscon_regmap_lookup_by_phandle() in the client drivers. - -Signed-off-by: Peter Griffin -Reviewed-by: Sam Protsenko -Reviewed-by: Guenter Roeck -Link: https://lore.kernel.org/r/20241029191131.2329414-1-peter.griffin@linaro.org -Signed-off-by: Guenter Roeck -Signed-off-by: Wim Van Sebroeck -Signed-off-by: Sasha Levin ---- - drivers/watchdog/Kconfig | 1 + - drivers/watchdog/s3c2410_wdt.c | 8 ++++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 4ecf701abe5f..751458959411 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -512,6 +512,7 @@ config S3C2410_WATCHDOG - tristate "S3C6410/S5Pv210/Exynos Watchdog" - depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST - select WATCHDOG_CORE -+ select MFD_SYSCON if ARCH_EXYNOS - help - Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos - SoCs. This will reboot the system when the timer expires with -diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c -index 0c9c649583d4..0b4bd883ff28 100644 ---- a/drivers/watchdog/s3c2410_wdt.c -+++ b/drivers/watchdog/s3c2410_wdt.c -@@ -23,9 +23,9 @@ - #include - #include - #include -+#include - #include - #include --#include - - #define S3C2410_WTCON 0x00 - #define S3C2410_WTDAT 0x04 -@@ -640,11 +640,11 @@ static int s3c2410wdt_probe(struct platform_device *pdev) - return ret; - - if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { -- wdt->pmureg = exynos_get_pmu_regmap_by_phandle(dev->of_node, -- "samsung,syscon-phandle"); -+ wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, -+ "samsung,syscon-phandle"); - if (IS_ERR(wdt->pmureg)) - return dev_err_probe(dev, PTR_ERR(wdt->pmureg), -- "PMU regmap lookup failed.\n"); -+ "syscon regmap lookup failed.\n"); - } - - wdt_irq = platform_get_irq(pdev, 0); --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index cfacdd8db61..0a85449c405 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -84,8 +84,6 @@ of-address-preserve-the-flags-portion-on-1-1-dma-ran.patch watchdog-rzg2l_wdt-remove-reset-de-assert-from-probe.patch watchdog-rzg2l_wdt-rely-on-the-reset-driver-for-doin.patch watchdog-rzg2l_wdt-power-on-the-watchdog-domain-in-t.patch -watchdog-s3c2410_wdt-use-exynos_get_pmu_regmap_by_ph.patch -revert-watchdog-s3c2410_wdt-use-exynos_get_pmu_regma.patch udf_rename-only-access-the-child-content-on-cross-di.patch udf-verify-inode-link-counts-before-performing-renam.patch alsa-ump-use-guard-for-locking.patch diff --git a/queue-6.6/watchdog-s3c2410_wdt-use-exynos_get_pmu_regmap_by_ph.patch b/queue-6.6/watchdog-s3c2410_wdt-use-exynos_get_pmu_regmap_by_ph.patch deleted file mode 100644 index 50f31e560f7..00000000000 --- a/queue-6.6/watchdog-s3c2410_wdt-use-exynos_get_pmu_regmap_by_ph.patch +++ /dev/null @@ -1,73 +0,0 @@ -From d9b6d9fd215637faecdb7f5ef92865a6a76ca509 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 20 Feb 2024 22:06:13 +0000 -Subject: watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU - regs - -From: Peter Griffin - -[ Upstream commit 746f0770f916e6c48e422d6a34e67eae16707f0e ] - -Obtain the PMU regmap using the new API added to exynos-pmu driver rather -than syscon_regmap_lookup_by_phandle(). As this driver no longer depends -on mfd syscon remove that header and Kconfig dependency. - -Tested-by: Alexey Klimov -Tested-by: Sam Protsenko -Acked-by: Guenter Roeck -Reviewed-by: Sam Protsenko -Signed-off-by: Peter Griffin -Link: https://lore.kernel.org/r/20240220220613.797068-3-peter.griffin@linaro.org -Signed-off-by: Krzysztof Kozlowski -Stable-dep-of: ccfb765944bb ("Revert "watchdog: s3c2410_wdt: use exynos_get_pmu_regmap_by_phandle() for PMU regs"") -Signed-off-by: Sasha Levin ---- - drivers/watchdog/Kconfig | 1 - - drivers/watchdog/s3c2410_wdt.c | 8 ++++---- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig -index 751458959411..4ecf701abe5f 100644 ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -512,7 +512,6 @@ config S3C2410_WATCHDOG - tristate "S3C6410/S5Pv210/Exynos Watchdog" - depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST - select WATCHDOG_CORE -- select MFD_SYSCON if ARCH_EXYNOS - help - Watchdog timer block in the Samsung S3C64xx, S5Pv210 and Exynos - SoCs. This will reboot the system when the timer expires with -diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c -index 0b4bd883ff28..0c9c649583d4 100644 ---- a/drivers/watchdog/s3c2410_wdt.c -+++ b/drivers/watchdog/s3c2410_wdt.c -@@ -23,9 +23,9 @@ - #include - #include - #include --#include - #include - #include -+#include - - #define S3C2410_WTCON 0x00 - #define S3C2410_WTDAT 0x04 -@@ -640,11 +640,11 @@ static int s3c2410wdt_probe(struct platform_device *pdev) - return ret; - - if (wdt->drv_data->quirks & QUIRKS_HAVE_PMUREG) { -- wdt->pmureg = syscon_regmap_lookup_by_phandle(dev->of_node, -- "samsung,syscon-phandle"); -+ wdt->pmureg = exynos_get_pmu_regmap_by_phandle(dev->of_node, -+ "samsung,syscon-phandle"); - if (IS_ERR(wdt->pmureg)) - return dev_err_probe(dev, PTR_ERR(wdt->pmureg), -- "syscon regmap lookup failed.\n"); -+ "PMU regmap lookup failed.\n"); - } - - wdt_irq = platform_get_irq(pdev, 0); --- -2.39.5 -