From: Greg Kroah-Hartman Date: Tue, 6 Jan 2026 15:15:16 +0000 (+0100) Subject: drop broken patch on 5.10 and 5.15 X-Git-Tag: v6.12.64~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b147615baadaa4dff82b1f8e2f5924cb8edae4;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken patch on 5.10 and 5.15 --- diff --git a/queue-5.10/firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch b/queue-5.10/firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch deleted file mode 100644 index a5da8babbe..0000000000 --- a/queue-5.10/firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 85f96cbbbc67b59652b2c1ec394b8ddc0ddf1b0b Mon Sep 17 00:00:00 2001 -From: Mahesh Rao -Date: Mon, 27 Oct 2025 22:54:40 +0800 -Subject: firmware: stratix10-svc: Add mutex in stratix10 memory management - -From: Mahesh Rao - -commit 85f96cbbbc67b59652b2c1ec394b8ddc0ddf1b0b upstream. - -Add mutex lock to stratix10_svc_allocate_memory and -stratix10_svc_free_memory for thread safety. This prevents race -conditions and ensures proper synchronization during memory operations. -This is required for parallel communication with the Stratix10 service -channel. - -Fixes: 7ca5ce896524f ("firmware: add Intel Stratix10 service layer driver") -Cc: stable@vger.kernel.org -Signed-off-by: Mahesh Rao -Reviewed-by: Matthew Gerlach -Signed-off-by: Dinh Nguyen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/firmware/stratix10-svc.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/firmware/stratix10-svc.c -+++ b/drivers/firmware/stratix10-svc.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0 - /* - * Copyright (C) 2017-2018, Intel Corporation -+ * Copyright (C) 2025, Altera Corporation - */ - - #include -@@ -168,6 +169,12 @@ static LIST_HEAD(svc_ctrl); - static LIST_HEAD(svc_data_mem); - - /** -+ * svc_mem_lock protects access to the svc_data_mem list for -+ * concurrent multi-client operations -+ */ -+static DEFINE_MUTEX(svc_mem_lock); -+ -+/** - * svc_pa_to_va() - translate physical address to virtual address - * @addr: to be translated physical address - * -@@ -179,6 +186,7 @@ static void *svc_pa_to_va(unsigned long - struct stratix10_svc_data_mem *pmem; - - pr_debug("claim back P-addr=0x%016x\n", (unsigned int)addr); -+ guard(mutex)(&svc_mem_lock); - list_for_each_entry(pmem, &svc_data_mem, node) - if (pmem->paddr == addr) - return pmem->vaddr; -@@ -844,6 +852,7 @@ int stratix10_svc_send(struct stratix10_ - p_data->flag = ct->flags; - } - } else { -+ guard(mutex)(&svc_mem_lock); - list_for_each_entry(p_mem, &svc_data_mem, node) - if (p_mem->vaddr == p_msg->payload) { - p_data->paddr = p_mem->paddr; -@@ -915,6 +924,7 @@ void *stratix10_svc_allocate_memory(stru - if (!pmem) - return ERR_PTR(-ENOMEM); - -+ guard(mutex)(&svc_mem_lock); - va = gen_pool_alloc(genpool, s); - if (!va) - return ERR_PTR(-ENOMEM); -@@ -943,6 +953,7 @@ EXPORT_SYMBOL_GPL(stratix10_svc_allocate - void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr) - { - struct stratix10_svc_data_mem *pmem; -+ guard(mutex)(&svc_mem_lock); - - list_for_each_entry(pmem, &svc_data_mem, node) - if (pmem->vaddr == kaddr) { diff --git a/queue-5.10/series b/queue-5.10/series index f2e7a83739..578122bde1 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -315,7 +315,6 @@ media-rc-st_rc-fix-reset-control-resource-leak.patch parisc-entry.s-fix-space-adjustment-on-interruption-for-64-bit-userspace.patch parisc-entry-set-w-bit-for-compat-tasks-in-syscall_restore_rfi.patch media-adv7842-avoid-possible-out-of-bounds-array-accesses-in-adv7842_cp_log_status.patch -firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch dm-ebs-mark-full-buffer-dirty-even-on-partial-write.patch fbdev-gbefb-fix-to-use-physical-address-instead-of-dma-address.patch fbdev-pxafb-fix-multiple-clamped-values-in-pxafb_adjust_timing.patch diff --git a/queue-5.15/firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch b/queue-5.15/firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch deleted file mode 100644 index a5da8babbe..0000000000 --- a/queue-5.15/firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 85f96cbbbc67b59652b2c1ec394b8ddc0ddf1b0b Mon Sep 17 00:00:00 2001 -From: Mahesh Rao -Date: Mon, 27 Oct 2025 22:54:40 +0800 -Subject: firmware: stratix10-svc: Add mutex in stratix10 memory management - -From: Mahesh Rao - -commit 85f96cbbbc67b59652b2c1ec394b8ddc0ddf1b0b upstream. - -Add mutex lock to stratix10_svc_allocate_memory and -stratix10_svc_free_memory for thread safety. This prevents race -conditions and ensures proper synchronization during memory operations. -This is required for parallel communication with the Stratix10 service -channel. - -Fixes: 7ca5ce896524f ("firmware: add Intel Stratix10 service layer driver") -Cc: stable@vger.kernel.org -Signed-off-by: Mahesh Rao -Reviewed-by: Matthew Gerlach -Signed-off-by: Dinh Nguyen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/firmware/stratix10-svc.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - ---- a/drivers/firmware/stratix10-svc.c -+++ b/drivers/firmware/stratix10-svc.c -@@ -1,6 +1,7 @@ - // SPDX-License-Identifier: GPL-2.0 - /* - * Copyright (C) 2017-2018, Intel Corporation -+ * Copyright (C) 2025, Altera Corporation - */ - - #include -@@ -168,6 +169,12 @@ static LIST_HEAD(svc_ctrl); - static LIST_HEAD(svc_data_mem); - - /** -+ * svc_mem_lock protects access to the svc_data_mem list for -+ * concurrent multi-client operations -+ */ -+static DEFINE_MUTEX(svc_mem_lock); -+ -+/** - * svc_pa_to_va() - translate physical address to virtual address - * @addr: to be translated physical address - * -@@ -179,6 +186,7 @@ static void *svc_pa_to_va(unsigned long - struct stratix10_svc_data_mem *pmem; - - pr_debug("claim back P-addr=0x%016x\n", (unsigned int)addr); -+ guard(mutex)(&svc_mem_lock); - list_for_each_entry(pmem, &svc_data_mem, node) - if (pmem->paddr == addr) - return pmem->vaddr; -@@ -844,6 +852,7 @@ int stratix10_svc_send(struct stratix10_ - p_data->flag = ct->flags; - } - } else { -+ guard(mutex)(&svc_mem_lock); - list_for_each_entry(p_mem, &svc_data_mem, node) - if (p_mem->vaddr == p_msg->payload) { - p_data->paddr = p_mem->paddr; -@@ -915,6 +924,7 @@ void *stratix10_svc_allocate_memory(stru - if (!pmem) - return ERR_PTR(-ENOMEM); - -+ guard(mutex)(&svc_mem_lock); - va = gen_pool_alloc(genpool, s); - if (!va) - return ERR_PTR(-ENOMEM); -@@ -943,6 +953,7 @@ EXPORT_SYMBOL_GPL(stratix10_svc_allocate - void stratix10_svc_free_memory(struct stratix10_svc_chan *chan, void *kaddr) - { - struct stratix10_svc_data_mem *pmem; -+ guard(mutex)(&svc_mem_lock); - - list_for_each_entry(pmem, &svc_data_mem, node) - if (pmem->vaddr == kaddr) { diff --git a/queue-5.15/series b/queue-5.15/series index 77a738d849..ed0f4a128f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -388,7 +388,6 @@ media-rc-st_rc-fix-reset-control-resource-leak.patch parisc-entry.s-fix-space-adjustment-on-interruption-for-64-bit-userspace.patch parisc-entry-set-w-bit-for-compat-tasks-in-syscall_restore_rfi.patch media-adv7842-avoid-possible-out-of-bounds-array-accesses-in-adv7842_cp_log_status.patch -firmware-stratix10-svc-add-mutex-in-stratix10-memory-management.patch dm-ebs-mark-full-buffer-dirty-even-on-partial-write.patch fbdev-gbefb-fix-to-use-physical-address-instead-of-dma-address.patch fbdev-pxafb-fix-multiple-clamped-values-in-pxafb_adjust_timing.patch