From: Greg Kroah-Hartman Date: Mon, 23 Dec 2024 12:28:44 +0000 (+0100) Subject: drop queue-5.10/of-address-preserve-the-flags-portion-on-1-1-dma-ranges-mapping.patch X-Git-Tag: v6.1.122~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5cbc8916df5765ecc31a30d7ba3e4e67fd5a41d;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/of-address-preserve-the-flags-portion-on-1-1-dma-ranges-mapping.patch --- diff --git a/queue-5.10/of-address-preserve-the-flags-portion-on-1-1-dma-ranges-mapping.patch b/queue-5.10/of-address-preserve-the-flags-portion-on-1-1-dma-ranges-mapping.patch deleted file mode 100644 index 420558979ed..00000000000 --- a/queue-5.10/of-address-preserve-the-flags-portion-on-1-1-dma-ranges-mapping.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7f05e20b989ac33c9c0f8c2028ec0a566493548f Mon Sep 17 00:00:00 2001 -From: Andrea della Porta -Date: Sun, 24 Nov 2024 11:05:37 +0100 -Subject: of: address: Preserve the flags portion on 1:1 dma-ranges mapping - -From: Andrea della Porta - -commit 7f05e20b989ac33c9c0f8c2028ec0a566493548f upstream. - -A missing or empty dma-ranges in a DT node implies a 1:1 mapping for dma -translations. In this specific case, the current behaviour is to zero out -the entire specifier so that the translation could be carried on as an -offset from zero. This includes address specifier that has flags (e.g. -PCI ranges). - -Once the flags portion has been zeroed, the translation chain is broken -since the mapping functions will check the upcoming address specifier -against mismatching flags, always failing the 1:1 mapping and its entire -purpose of always succeeding. - -Set to zero only the address portion while passing the flags through. - -Fixes: dbbdee94734b ("of/address: Merge all of the bus translation code") -Cc: stable@vger.kernel.org -Signed-off-by: Andrea della Porta -Tested-by: Herve Codina -Link: https://lore.kernel.org/r/e51ae57874e58a9b349c35e2e877425ebc075d7a.1732441813.git.andrea.porta@suse.com -Signed-off-by: Rob Herring (Arm) -Signed-off-by: Greg Kroah-Hartman ---- - drivers/of/address.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/of/address.c -+++ b/drivers/of/address.c -@@ -474,7 +474,8 @@ static int of_translate_one(struct devic - } - if (ranges == NULL || rlen == 0) { - offset = of_read_number(addr, na); -- memset(addr, 0, pna * 4); -+ /* set address to zero, pass flags through */ -+ memset(addr + pbus->flag_cells, 0, (pna - pbus->flag_cells) * 4); - pr_debug("empty ranges; 1:1 translation\n"); - goto finish; - } diff --git a/queue-5.10/of-fix-refcount-leakage-for-of-node-returned-by-__of_get_dma_parent.patch b/queue-5.10/of-fix-refcount-leakage-for-of-node-returned-by-__of_get_dma_parent.patch index b325841ae55..edef13cf2c8 100644 --- a/queue-5.10/of-fix-refcount-leakage-for-of-node-returned-by-__of_get_dma_parent.patch +++ b/queue-5.10/of-fix-refcount-leakage-for-of-node-returned-by-__of_get_dma_parent.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/of/address.c +++ b/drivers/of/address.c -@@ -642,7 +642,7 @@ static struct device_node *__of_get_dma_ +@@ -641,7 +641,7 @@ static struct device_node *__of_get_dma_ if (ret < 0) return of_get_parent(np); diff --git a/queue-5.10/series b/queue-5.10/series index 38239286a49..7f65d7d920d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -37,7 +37,6 @@ nfs-pnfs-fix-a-live-lock-between-recalled-layouts-and-layoutget.patch of-irq-fix-using-uninitialized-variable-addr_len-in-api-of_irq_parse_one.patch nilfs2-prevent-use-of-deleted-inode.patch udmabuf-also-check-for-f_seal_future_write.patch -of-address-preserve-the-flags-portion-on-1-1-dma-ranges-mapping.patch of-fix-error-path-in-of_parse_phandle_with_args_map.patch of-fix-refcount-leakage-for-of-node-returned-by-__of_get_dma_parent.patch ceph-validate-snapdirname-option-length-when-mounting.patch