diff options
30 files changed, 508 insertions, 163 deletions
diff --git a/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch b/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch index 7b97181403..3dbfb7ccba 100644 --- a/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch +++ b/target/linux/generic/backport-5.15/600-v5.18-page_pool-Add-allocation-stats.patch @@ -1,30 +1,36 @@ -commit 8610037e8106b48c79cfe0afb92b2b2466e51c3d -Author: Joe Damato <jdamato@fastly.com> -Date: Tue Mar 1 23:55:47 2022 -0800 +From 8610037e8106b48c79cfe0afb92b2b2466e51c3d Mon Sep 17 00:00:00 2001 +From: Joe Damato <jdamato@fastly.com> +Date: Tue, 1 Mar 2022 23:55:47 -0800 +Subject: [PATCH] page_pool: Add allocation stats - page_pool: Add allocation stats - - Add per-pool statistics counters for the allocation path of a page pool. - These stats are incremented in softirq context, so no locking or per-cpu - variables are needed. - - This code is disabled by default and a kernel config option is provided for - users who wish to enable them. - - The statistics added are: - - fast: successful fast path allocations - - slow: slow path order-0 allocations - - slow_high_order: slow path high order allocations - - empty: ptr ring is empty, so a slow path allocation was forced. - - refill: an allocation which triggered a refill of the cache - - waive: pages obtained from the ptr ring that cannot be added to - the cache due to a NUMA mismatch. - - Signed-off-by: Joe Damato <jdamato@fastly.com> - Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> - Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> - Signed-off-by: David S. Miller <davem@davemloft.net> +Add per-pool statistics counters for the allocation path of a page pool. +These stats are incremented in softirq context, so no locking or per-cpu +variables are needed. +This code is disabled by default and a kernel config option is provided for +users who wish to enable them. + +The statistics added are: + - fast: successful fast path allocations + - slow: slow path order-0 allocations + - slow_high_order: slow path high order allocations + - empty: ptr ring is empty, so a slow path allocation was forced. + - refill: an allocation which triggered a refill of the cache + - waive: pages obtained from the ptr ring that cannot be added to + the cache due to a NUMA mismatch. + +Signed-off-by: Joe Damato <jdamato@fastly.com> +Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> +Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + include/net/page_pool.h | 18 ++++++++++++++++++ + net/Kconfig | 13 +++++++++++++ + net/core/page_pool.c | 24 ++++++++++++++++++++---- + 3 files changed, 51 insertions(+), 4 deletions(-) + +diff --git a/include/net/page_pool.h b/include/net/page_pool.h +index 97c3c19872ff..1f27e8a48830 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -82,6 +82,19 @@ struct page_pool_params { diff --git a/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch b/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch index 8330ae811d..e60979f4a7 100644 --- a/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch +++ b/target/linux/generic/backport-5.15/601-v5.18-page_pool-Add-recycle-stats.patch @@ -1,21 +1,26 @@ -commit ad6fa1e1ab1b8164f1ba296b1b4dc556a483bcad -Author: Joe Damato <jdamato@fastly.com> -Date: Tue Mar 1 23:55:48 2022 -0800 +From ad6fa1e1ab1b8164f1ba296b1b4dc556a483bcad Mon Sep 17 00:00:00 2001 +From: Joe Damato <jdamato@fastly.com> +Date: Tue, 1 Mar 2022 23:55:48 -0800 +Subject: [PATCH 2/3] page_pool: Add recycle stats - page_pool: Add recycle stats - - Add per-cpu stats tracking page pool recycling events: - - cached: recycling placed page in the page pool cache - - cache_full: page pool cache was full - - ring: page placed into the ptr ring - - ring_full: page released from page pool because the ptr ring was full - - released_refcnt: page released (and not recycled) because refcnt > 1 - - Signed-off-by: Joe Damato <jdamato@fastly.com> - Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> - Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> - Signed-off-by: David S. Miller <davem@davemloft.net> +Add per-cpu stats tracking page pool recycling events: + - cached: recycling placed page in the page pool cache + - cache_full: page pool cache was full + - ring: page placed into the ptr ring + - ring_full: page released from page pool because the ptr ring was full + - released_refcnt: page released (and not recycled) because refcnt > 1 +Signed-off-by: Joe Damato <jdamato@fastly.com> +Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> +Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + include/net/page_pool.h | 16 ++++++++++++++++ + net/core/page_pool.c | 30 ++++++++++++++++++++++++++++-- + 2 files changed, 44 insertions(+), 2 deletions(-) + +diff --git a/include/net/page_pool.h b/include/net/page_pool.h +index 1f27e8a48830..298af95bbf96 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -93,6 +93,18 @@ struct page_pool_alloc_stats { diff --git a/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch b/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch index 8afbd5d120..e5fbfd14f0 100644 --- a/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch +++ b/target/linux/generic/backport-5.15/602-v5.18-page_pool-Add-function-to-batch-and-return-stats.patch @@ -1,17 +1,22 @@ -commit 6b95e3388b1ea0ca63500c5a6e39162dbf828433 -Author: Joe Damato <jdamato@fastly.com> -Date: Tue Mar 1 23:55:49 2022 -0800 +From 6b95e3388b1ea0ca63500c5a6e39162dbf828433 Mon Sep 17 00:00:00 2001 +From: Joe Damato <jdamato@fastly.com> +Date: Tue, 1 Mar 2022 23:55:49 -0800 +Subject: [PATCH 3/3] page_pool: Add function to batch and return stats - page_pool: Add function to batch and return stats - - Adds a function page_pool_get_stats which can be used by drivers to obtain - stats for a specified page_pool. - - Signed-off-by: Joe Damato <jdamato@fastly.com> - Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> - Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> - Signed-off-by: David S. Miller <davem@davemloft.net> +Adds a function page_pool_get_stats which can be used by drivers to obtain +stats for a specified page_pool. +Signed-off-by: Joe Damato <jdamato@fastly.com> +Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> +Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + include/net/page_pool.h | 17 +++++++++++++++++ + net/core/page_pool.c | 25 +++++++++++++++++++++++++ + 2 files changed, 42 insertions(+) + +diff --git a/include/net/page_pool.h b/include/net/page_pool.h +index 298af95bbf96..ea5fb70e5101 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -105,6 +105,23 @@ struct page_pool_recycle_stats { diff --git a/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch b/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch index 90f307772a..e12c387bbc 100644 --- a/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch +++ b/target/linux/generic/backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch @@ -1,17 +1,21 @@ -commit 590032a4d2133ecc10d3078a8db1d85a4842f12c -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Mon Apr 11 16:05:26 2022 +0200 +From 590032a4d2133ecc10d3078a8db1d85a4842f12c Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Mon, 11 Apr 2022 16:05:26 +0200 +Subject: [PATCH] page_pool: Add recycle stats to page_pool_put_page_bulk - page_pool: Add recycle stats to page_pool_put_page_bulk - - Add missing recycle stats to page_pool_put_page_bulk routine. - - Reviewed-by: Joe Damato <jdamato@fastly.com> - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> - Link: https://lore.kernel.org/r/3712178b51c007cfaed910ea80e68f00c916b1fa.1649685634.git.lorenzo@kernel.org - Signed-off-by: Paolo Abeni <pabeni@redhat.com> +Add missing recycle stats to page_pool_put_page_bulk routine. +Reviewed-by: Joe Damato <jdamato@fastly.com> +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> +Link: https://lore.kernel.org/r/3712178b51c007cfaed910ea80e68f00c916b1fa.1649685634.git.lorenzo@kernel.org +Signed-off-by: Paolo Abeni <pabeni@redhat.com> +--- + net/core/page_pool.c | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/net/core/page_pool.c b/net/core/page_pool.c +index 1943c0f0307d..4af55d28ffa3 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -36,6 +36,12 @@ diff --git a/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch b/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch index 0694c5cfcb..fa3f1c8fb8 100644 --- a/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch +++ b/target/linux/generic/backport-5.15/604-v5.19-net-page_pool-introduce-ethtool-stats.patch @@ -1,17 +1,22 @@ -commit f3c5264f452a5b0ac1de1f2f657efbabdea3c76a -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Tue Apr 12 18:31:58 2022 +0200 +From f3c5264f452a5b0ac1de1f2f657efbabdea3c76a Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Tue, 12 Apr 2022 18:31:58 +0200 +Subject: [PATCH] net: page_pool: introduce ethtool stats - net: page_pool: introduce ethtool stats - - Introduce page_pool APIs to report stats through ethtool and reduce - duplicated code in each driver. - - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Reviewed-by: Jakub Kicinski <kuba@kernel.org> - Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> - Signed-off-by: David S. Miller <davem@davemloft.net> +Introduce page_pool APIs to report stats through ethtool and reduce +duplicated code in each driver. +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Reviewed-by: Jakub Kicinski <kuba@kernel.org> +Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + include/net/page_pool.h | 21 ++++++++++++++ + net/core/page_pool.c | 63 ++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 83 insertions(+), 1 deletion(-) + +diff --git a/include/net/page_pool.h b/include/net/page_pool.h +index ea5fb70e5101..813c93499f20 100644 --- a/include/net/page_pool.h +++ b/include/net/page_pool.h @@ -115,6 +115,10 @@ struct page_pool_stats { diff --git a/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch b/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch index 9c5a14c41b..529b504ed8 100644 --- a/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch +++ b/target/linux/generic/backport-5.15/605-v5.18-xdp-introduce-flags-field-in-xdp_buff-xdp_frame.patch @@ -1,25 +1,29 @@ -commit 2e88d4ff03013937028f5397268b21e10cf68713 -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Fri Jan 21 11:09:45 2022 +0100 +From 2e88d4ff03013937028f5397268b21e10cf68713 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri, 21 Jan 2022 11:09:45 +0100 +Subject: [PATCH] xdp: introduce flags field in xdp_buff/xdp_frame - xdp: introduce flags field in xdp_buff/xdp_frame - - Introduce flags field in xdp_frame and xdp_buffer data structures - to define additional buffer features. At the moment the only - supported buffer feature is frags bit (XDP_FLAGS_HAS_FRAGS). - frags bit is used to specify if this is a linear buffer - (XDP_FLAGS_HAS_FRAGS not set) or a frags frame (XDP_FLAGS_HAS_FRAGS - set). In the latter case the driver is expected to initialize the - skb_shared_info structure at the end of the first buffer to link together - subsequent buffers belonging to the same frame. - - Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> - Acked-by: John Fastabend <john.fastabend@gmail.com> - Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Link: https://lore.kernel.org/r/e389f14f3a162c0a5bc6a2e1aa8dd01a90be117d.1642758637.git.lorenzo@kernel.org - Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Introduce flags field in xdp_frame and xdp_buffer data structures +to define additional buffer features. At the moment the only +supported buffer feature is frags bit (XDP_FLAGS_HAS_FRAGS). +frags bit is used to specify if this is a linear buffer +(XDP_FLAGS_HAS_FRAGS not set) or a frags frame (XDP_FLAGS_HAS_FRAGS +set). In the latter case the driver is expected to initialize the +skb_shared_info structure at the end of the first buffer to link together +subsequent buffers belonging to the same frame. +Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> +Acked-by: John Fastabend <john.fastabend@gmail.com> +Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Link: https://lore.kernel.org/r/e389f14f3a162c0a5bc6a2e1aa8dd01a90be117d.1642758637.git.lorenzo@kernel.org +Signed-off-by: Alexei Starovoitov <ast@kernel.org> +--- + include/net/xdp.h | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + +diff --git a/include/net/xdp.h b/include/net/xdp.h +index 8f0812e4996d..485e9495a690 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -66,6 +66,10 @@ struct xdp_txq_info { diff --git a/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch b/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch index 5a04948002..a852c4d5b0 100644 --- a/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch +++ b/target/linux/generic/backport-5.15/606-v5.18-xdp-add-frags-support-to-xdp_return_-buff-frame.patch @@ -1,19 +1,24 @@ -commit 7c48cb0176c6d6d3b55029f7ff4ffa05faee6446 -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Fri Jan 21 11:09:50 2022 +0100 +From 7c48cb0176c6d6d3b55029f7ff4ffa05faee6446 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri, 21 Jan 2022 11:09:50 +0100 +Subject: [PATCH] xdp: add frags support to xdp_return_{buff/frame} - xdp: add frags support to xdp_return_{buff/frame} - - Take into account if the received xdp_buff/xdp_frame is non-linear - recycling/returning the frame memory to the allocator or into - xdp_frame_bulk. - - Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> - Acked-by: John Fastabend <john.fastabend@gmail.com> - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Link: https://lore.kernel.org/r/a961069febc868508ce1bdf5e53a343eb4e57cb2.1642758637.git.lorenzo@kernel.org - Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Take into account if the received xdp_buff/xdp_frame is non-linear +recycling/returning the frame memory to the allocator or into +xdp_frame_bulk. +Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> +Acked-by: John Fastabend <john.fastabend@gmail.com> +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Link: https://lore.kernel.org/r/a961069febc868508ce1bdf5e53a343eb4e57cb2.1642758637.git.lorenzo@kernel.org +Signed-off-by: Alexei Starovoitov <ast@kernel.org> +--- + include/net/xdp.h | 18 ++++++++++++++-- + net/core/xdp.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 69 insertions(+), 3 deletions(-) + +diff --git a/include/net/xdp.h b/include/net/xdp.h +index 1f8641ec658e..8463dea8b4db 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -275,10 +275,24 @@ void __xdp_release_frame(void *data, str diff --git a/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch b/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch index 5ded882f90..ea020d4e9f 100644 --- a/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch +++ b/target/linux/generic/backport-5.15/607-v5.18-net-skbuff-add-size-metadata-to-skb_shared_info-for-.patch @@ -1,22 +1,26 @@ -commit d16697cb6261d4cc23422e6b1cb2759df8aa76d0 -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Fri Jan 21 11:09:44 2022 +0100 +From d16697cb6261d4cc23422e6b1cb2759df8aa76d0 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri, 21 Jan 2022 11:09:44 +0100 +Subject: [PATCH] net: skbuff: add size metadata to skb_shared_info for xdp - net: skbuff: add size metadata to skb_shared_info for xdp - - Introduce xdp_frags_size field in skb_shared_info data structure - to store xdp_buff/xdp_frame frame paged size (xdp_frags_size will - be used in xdp frags support). In order to not increase - skb_shared_info size we will use a hole due to skb_shared_info - alignment. - - Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> - Acked-by: John Fastabend <john.fastabend@gmail.com> - Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Link: https://lore.kernel.org/r/8a849819a3e0a143d540f78a3a5add76e17e980d.1642758637.git.lorenzo@kernel.org - Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Introduce xdp_frags_size field in skb_shared_info data structure +to store xdp_buff/xdp_frame frame paged size (xdp_frags_size will +be used in xdp frags support). In order to not increase +skb_shared_info size we will use a hole due to skb_shared_info +alignment. +Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> +Acked-by: John Fastabend <john.fastabend@gmail.com> +Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Link: https://lore.kernel.org/r/8a849819a3e0a143d540f78a3a5add76e17e980d.1642758637.git.lorenzo@kernel.org +Signed-off-by: Alexei Starovoitov <ast@kernel.org> +--- + include/linux/skbuff.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index bf11e1fbd69b..8131d0de7559 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -567,6 +567,7 @@ struct skb_shared_info { diff --git a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch index 9b16fc00b7..5ca38d2403 100644 --- a/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch +++ b/target/linux/generic/backport-5.15/608-v5.18-net-veth-Account-total-xdp_frame-len-running-ndo_xdp.patch @@ -1,22 +1,27 @@ -commit 5142239a22219921a7863cf00c9ab853c00689d8 -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Fri Mar 11 10:14:18 2022 +0100 +From 5142239a22219921a7863cf00c9ab853c00689d8 Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri, 11 Mar 2022 10:14:18 +0100 +Subject: [PATCH] net: veth: Account total xdp_frame len running ndo_xdp_xmit - net: veth: Account total xdp_frame len running ndo_xdp_xmit - - Even if this is a theoretical issue since it is not possible to perform - XDP_REDIRECT on a non-linear xdp_frame, veth driver does not account - paged area in ndo_xdp_xmit function pointer. - Introduce xdp_get_frame_len utility routine to get the xdp_frame full - length and account total frame size running XDP_REDIRECT of a - non-linear xdp frame into a veth device. - - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> - Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> - Acked-by: John Fastabend <john.fastabend@gmail.com> - Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.1646989407.git.lorenzo@kernel.org +Even if this is a theoretical issue since it is not possible to perform +XDP_REDIRECT on a non-linear xdp_frame, veth driver does not account +paged area in ndo_xdp_xmit function pointer. +Introduce xdp_get_frame_len utility routine to get the xdp_frame full +length and account total frame size running XDP_REDIRECT of a +non-linear xdp frame into a veth device. +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> +Acked-by: Toke Hoiland-Jorgensen <toke@redhat.com> +Acked-by: John Fastabend <john.fastabend@gmail.com> +Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.1646989407.git.lorenzo@kernel.org +--- + drivers/net/veth.c | 4 ++-- + include/net/xdp.h | 14 ++++++++++++++ + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/veth.c b/drivers/net/veth.c +index 58b20ea171dd..b77ce3fdcfe8 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -501,7 +501,7 @@ static int veth_xdp_xmit(struct net_devi diff --git a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch index 8080d621da..c8627e0f71 100644 --- a/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch +++ b/target/linux/generic/backport-5.15/609-v5.18-veth-Allow-jumbo-frames-in-xdp-mode.patch @@ -1,18 +1,25 @@ -commit 7cda76d858a4e71ac4a04066c093679a12e1312c -Author: Lorenzo Bianconi <lorenzo@kernel.org> -Date: Fri Mar 11 10:14:20 2022 +0100 +From 7cda76d858a4e71ac4a04066c093679a12e1312c Mon Sep 17 00:00:00 2001 +From: Lorenzo Bianconi <lorenzo@kernel.org> +Date: Fri, 11 Mar 2022 10:14:20 +0100 +Subject: [PATCH] veth: Allow jumbo frames in xdp mode +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit - veth: Allow jumbo frames in xdp mode - - Allow increasing the MTU over page boundaries on veth devices - if the attached xdp program declares to support xdp fragments. - - Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> - Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> - Acked-by: Toke Høiland-Jørgensen <toke@redhat.com> - Acked-by: John Fastabend <john.fastabend@gmail.com> - Link: https://lore.kernel.org/bpf/d5dc039c3d4123426e7023a488c449181a7bc57f.1646989407.git.lorenzo@kernel.org +Allow increasing the MTU over page boundaries on veth devices +if the attached xdp program declares to support xdp fragments. +Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> +Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> +Acked-by: Toke Høiland-Jørgensen <toke@redhat.com> +Acked-by: John Fastabend <john.fastabend@gmail.com> +Link: https://lore.kernel.org/bpf/d5dc039c3d4123426e7023a488c449181a7bc57f.1646989407.git.lorenzo@kernel.org +--- + drivers/net/veth.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/veth.c b/drivers/net/veth.c +index bfae15ec902b..1b5714926d81 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -1470,9 +1470,14 @@ static int veth_xdp_set(struct net_devic diff --git a/target/linux/generic/hack-5.10/205-kconfig-exit.patch b/target/linux/generic/hack-5.10/205-kconfig-exit.patch index c3fb7a1f99..591daf624a 100644 --- a/target/linux/generic/hack-5.10/205-kconfig-exit.patch +++ b/target/linux/generic/hack-5.10/205-kconfig-exit.patch @@ -1,3 +1,20 @@ +From: David Bauer <mail@david-bauer.net> +Subject: Kconfig: exit on unset symbol + +When a target configuration has unset Kconfig symbols, the build will +fail when OpenWrt is compiled with V=s and stdin is connected to a tty. + +In case OpenWrt is compiled without either of these preconditions, the +build will succeed with the symbols in question being unset. + +Modify the kernel configuration in a way it fails on unset symbols +regardless of the aforementioned preconditions. + +Submitted-by: David Bauer <mail@david-bauer.net> +--- + scripts/kconfig/conf.c | 2 + + 1 files changed, 2 insertions(+) + --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c @@ -215,6 +215,8 @@ static int conf_sym(struct menu *menu) diff --git a/target/linux/generic/hack-5.10/253-ksmbd-config.patch b/target/linux/generic/hack-5.10/253-ksmbd-config.patch index 4d07c1c00e..2992dbeda0 100644 --- a/target/linux/generic/hack-5.10/253-ksmbd-config.patch +++ b/target/linux/generic/hack-5.10/253-ksmbd-config.patch @@ -1,3 +1,15 @@ +From: Rosen Penev <rosenp@gmail.com> +Subject: Kconfig: add help text to kernel config + +These options will be used for ksmbd. Once kernel 5.15 +makes it in, this patch can go away. + +Submitted-by: Rosen Penev <rosenp@gmail.com> +--- + init/Kconfig | 2 +- + lib/Kconfig | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + --- a/init/Kconfig +++ b/init/Kconfig @@ -2384,7 +2384,7 @@ config PADATA @@ -19,4 +31,3 @@ + tristate "OID" help Enable fast lookup object identifier registry. - diff --git a/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch b/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch index 4ffd8cfa37..b61dd269a4 100644 --- a/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch +++ b/target/linux/generic/hack-5.10/261-lib-arc4-unhide.patch @@ -1,7 +1,20 @@ +From: Koen Vandeputte <koen.vandeputte@ncentric.com> +Subject: crypto: arc4 unhide + This makes it possible to select CONFIG_CRYPTO_LIB_ARC4 directly. We need this to be able to compile this into the kernel and make use of it from backports. +Submitted-by: Koen Vandeputte <koen.vandeputte@ncentric.com> +Submitted-by: David Bauer <mail@david-bauer.net> +Submitted-by: Christian Lamparter <chunkeey@gmail.com> +Submitted-by: Ansuel Smith <ansuelsmth@gmail.com> +Submitted-by: Robert Marko <robimarko@gmail.com> +Submitted-by: Hauke Mehrtens <hauke@hauke-m.de> +--- + lib/crypto/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -6,7 +6,7 @@ config CRYPTO_LIB_AES diff --git a/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch index 7816356227..00c8d255fc 100644 --- a/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.10/410-block-fit-partition-parser.patch @@ -1,3 +1,30 @@ +From: Daniel Golle <daniel@makrotopia.org> +Subject: [PATCH] kernel: fix FIT partition parser compatibility issues + +The uImage.FIT partition parser used to squeeze in FIT partitions in +the range where partition editor tools (fdisk and such) expect the +regular partition. This is confusing people and tools when adding +additional partitions on top of the partition used for OpenWrt's +uImage.FIT. +Instead of squeezing in the additional partitions, rather start with +all uImage.FIT partitions at offset 64. + +Submitted-by: Daniel Golle <daniel@makrotopia.org> +--- + block/blk.h | 2 ++ + block/partitions/Kconfig | 7 +++ + block/partitions/Makefile | 1 + + block/partitions/check.h | 3 ++ + block/partitions/core.c | 15 +++++++ + drivers/mtd/ubi/block.c | 7 +++ + block/partitions/efi.c | 8 +++++++ + block/partitions/efi.h | 3 ++ + drivers/mtd/mtdblock.c | 4 +++ + drivers/mtd/mtd_blkdevs.c | 14 +------ + block/partitions/msdos.c | 10 ++++++ + include/linux/msdos_partition.h | 1 + + 12 files changed, 52 insertions(+), 13 deletions(-) + --- a/block/blk.h +++ b/block/blk.h @@ -361,6 +361,8 @@ char *disk_name(struct gendisk *hd, int @@ -221,4 +248,3 @@ + FIT_PARTITION = 0x2e, /* U-Boot uImage.FIT */ SOLARIS_X86_PARTITION = 0x82, /* also Linux swap partitions */ NEW_SOLARIS_X86_PARTITION = 0xbf, - diff --git a/target/linux/generic/hack-5.10/430-mtk-bmt-support.patch b/target/linux/generic/hack-5.10/430-mtk-bmt-support.patch index 62ddd66bf2..b18df7584d 100644 --- a/target/linux/generic/hack-5.10/430-mtk-bmt-support.patch +++ b/target/linux/generic/hack-5.10/430-mtk-bmt-support.patch @@ -1,3 +1,14 @@ +From 11425c9de29c8b9c5e4d7eec163a6afbb7fbdce2 Mon Sep 17 00:00:00 2001 +From: Felix Fietkau <nbd@nbd.name> +Date: Thu, 9 Apr 2020 09:53:24 +0200 +Subject: mediatek: Implement bad-block management table support + +Submitted-by: Felix Fietkau <nbd@nbd.name> +--- + drivers/mtd/nand/Kconfig | 4 ++++ + drivers/mtd/nand/Makefile | 1 + + 2 files changed, 5 insertions(+) + --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -15,6 +15,10 @@ config MTD_NAND_ECC diff --git a/target/linux/generic/hack-5.10/600-bridge_offload.patch b/target/linux/generic/hack-5.10/600-bridge_offload.patch index b704c98dc8..82282627ea 100644 --- a/target/linux/generic/hack-5.10/600-bridge_offload.patch +++ b/target/linux/generic/hack-5.10/600-bridge_offload.patch @@ -1,3 +1,31 @@ +From: Felix Fietkau <nbd@nbd.name> +Subject: bridge: Add a fast path for the bridge code + +This caches flows between MAC addresses on separate ports, including their VLAN +in order to bypass the normal bridge forwarding code. +In my test on MT7622, this reduces LAN->WLAN bridging CPU usage by 6-10%, +potentially even more on weaker platforms + +Submitted-by: Felix Fietkau <nbd@nbd.name> +--- + include/linux/if_bridge.h | 1 + + net/bridge/Makefile | 2 +- + net/bridge/br.c | 8 +++ + net/bridge/br_device.c | 7 +++ + net/bridge/br_forward.c | 3 ++ + net/bridge/br_if.c | 7 ++- + net/bridge/br_input.c | 5 ++ + net/bridge/br_offload.c | 436 +++++++++++++++ + net/bridge/br_private.h | 22 ++++- + net/bridge/br_private_offload.h | 21 +++++ + net/bridge/br_stp.c | 3 + + net/bridge/br_sysfs_br.c | 35 ++++++ + net/bridge/br_sysfs_if.c | 2 + + net/bridge/br_vlan_tunnel.c | 3 ++ + 14 files changed, 552 insertions(+), 3 deletions(-) + create mode 100644 net/bridge/br_offload.c + create mode 100644 net/bridge/br_private_offload.h + --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -57,6 +57,7 @@ struct br_ip_list { diff --git a/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index e69113d3c1..4fc6e355cb 100644 --- a/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-5.10/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -1,3 +1,32 @@ +From: DENG Qingfang <dqfext@gmail.com> +Subject: DSA: roaming fix for Marvell mv88e6xxx + +Marvell mv88e6xxx switch series cannot perform MAC learning from +CPU-injected (FROM_CPU) DSA frames, which results in 2 issues. +- excessive flooding, due to the fact that DSA treats those addresses +as unknown +- the risk of stale routes, which can lead to temporary packet loss + +Backport those patch series from netdev mailing list, which solve these +issues by adding and clearing static entries to the switch's FDB. + +Add a hack patch to set default VID to 1 in port_fdb_{add,del}. Otherwise +the static entries will be added to the switch's private FDB if VLAN +filtering disabled, which will not work. + +The switch may generate an "ATU violation" warning when a client moves +from the CPU port to a switch port because the static ATU entry added by +DSA core still points to the CPU port. DSA core will then clear the static +entry so it is not fatal. Disable the warning so it will not confuse users. + +Link: https://lore.kernel.org/netdev/20210106095136.224739-1-olteanv@gmail.com/ +Link: https://lore.kernel.org/netdev/20210116012515.3152-1-tobias@waldekranz.com/ +Ref: https://gitlab.nic.cz/turris/turris-build/-/issues/165 +Submitted-by: DENG Qingfang <dqfext@gmail.com> +--- + drivers/net/dsa/mv88e6xxx/chip.c | 3 +++ + 3 files changed, 3 insertions(+) + --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2705,6 +2705,9 @@ static int mv88e6xxx_setup_port(struct m diff --git a/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch index 79e8f55e5b..1e9d5a288f 100644 --- a/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -36,7 +36,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net> + + if (ret) + return ret; -+ ++ + ocp_write_word(tp, MCU_TYPE_PLA, PLA_LEDSEL, led_data); + + return 0; diff --git a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch index 0c0739e7eb..37dfe86075 100644 --- a/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.10/780-usb-net-MeigLink_modem_support.patch @@ -1,3 +1,17 @@ +From: Daniel Golle <daniel@makrotopia.org> +Subject: wwan: Add MeigLink SLM750 modem support + +Add patch found in Teltonika RUT9_R_00.07.01.4 GPL SDK download[1] +adding USB IDs of the MeigLink SLM750 to the relevant kernel drivers. +Newer versions of Teltonika's 2G/3G/4G RUT9XX WWAN router series come +with this kind of modem. + +[1]: https://wiki.teltonika-networks.com/view/GPL +Submitted-by: Daniel Golle <daniel@makrotopia.org> +--- + drivers/net/usb/qmi_wwan.c | 8 ++++++ + 1 file changed, 8 insertions(+) + --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -1024,6 +1024,7 @@ static const struct usb_device_id produc diff --git a/target/linux/generic/hack-5.10/901-debloat_sock_diag.patch b/target/linux/generic/hack-5.10/901-debloat_sock_diag.patch index 247b50d536..5302c793de 100644 --- a/target/linux/generic/hack-5.10/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-5.10/901-debloat_sock_diag.patch @@ -33,7 +33,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> obj-y += dev.o dev_addr_lists.o dst.o netevent.o \ neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ - sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \ -+ dev_ioctl.o tso.o sock_reuseport.o \ ++ dev_ioctl.o tso.o sock_reuseport.o \ fib_notifier.o xdp.o flow_offload.o +obj-$(CONFIG_SOCK_DIAG) += sock_diag.o diff --git a/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch b/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch index 27d4d7f1e5..17d3f2ffd5 100644 --- a/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch +++ b/target/linux/generic/hack-5.10/920-device_tree_cmdline.patch @@ -1,3 +1,19 @@ +From a9968d9cb8cb10030491fa05e24b00bd42f6d3a9 Mon Sep 17 00:00:00 2001 +From: John Crispin <john@openwrt.org> +Date: Thu, 30 May 2013 16:00:42 +0000 +Subject: fdt: enable retrieving kernel args from bootloader + +This patch is a device tree enhancement that IMHO is worthy of mainline. +It allows the bootloader's commandline to be preserved even when the +device tree specifies one. + +Submitted-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> + +SVN-Revision: 36780 +--- + drivers/of/fdt.c | 3 +++ + 1 file changed, 3 insertions(+) + --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns diff --git a/target/linux/generic/pending-5.10/101-Use-stddefs.h-instead-of-compiler.h.patch b/target/linux/generic/pending-5.10/101-Use-stddefs.h-instead-of-compiler.h.patch index 824b9444ee..7057d65ce8 100644 --- a/target/linux/generic/pending-5.10/101-Use-stddefs.h-instead-of-compiler.h.patch +++ b/target/linux/generic/pending-5.10/101-Use-stddefs.h-instead-of-compiler.h.patch @@ -1,3 +1,11 @@ +From: Felix Fietkau <nbd@nbd.name> +Subject: uapi: Fix an issue with kernel headers that broke perf + +Submitted-by: Felix Fietkau <nbd@nbd.name> +--- + include/uapi/linux/swab.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/include/uapi/linux/swab.h +++ b/include/uapi/linux/swab.h @@ -3,7 +3,7 @@ diff --git a/target/linux/generic/pending-5.10/332-arc-add-OWRTDTB-section.patch b/target/linux/generic/pending-5.10/332-arc-add-OWRTDTB-section.patch index 30158cf399..4a76e216d5 100644 --- a/target/linux/generic/pending-5.10/332-arc-add-OWRTDTB-section.patch +++ b/target/linux/generic/pending-5.10/332-arc-add-OWRTDTB-section.patch @@ -74,7 +74,7 @@ Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> + * + * Note: "OWRTDTB:" won't be overwritten with .dtb, .dtb will follow it. + */ -+ .owrt : { ++ .owrt : { + *(.owrt) + . = ALIGN(PAGE_SIZE); + } diff --git a/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch b/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch index ce4743879d..b34c041df0 100644 --- a/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch +++ b/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch @@ -1,3 +1,25 @@ +From: Gabor Juhos <juhosg@openwrt.org> +Subject: mtd: Add new Kconfig option for firmware partition split + +Add a new kernel config option for generic firmware partition +split support and change the uImage split support to depend on +the new option. Aslo rename the MTD_UIMAGE_SPLIT_NAME option to +MTD_SPLIT_FIRMWARE_NAME to make it more generic. + +The patch is in preparation for multiple firmware format +support. + +Submitted-by: Gabor Juhos <juhosg@openwrt.org> + +SVN-Revision: 38002 +--- + drivers/mtd/Kconfig | 19 + + drivers/mtd/mtdpart.c | 144 +++++++++++++----- + include/linux/mtd/partitions.h | 7 + + drivers/mtd/Makefile | 2 + + include/linux/mtd/mtd.h | 25 + + 5 files changed, 171 insertions(+), 25 deletions(-) + --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -12,6 +12,25 @@ menuconfig MTD diff --git a/target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch b/target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch index 6f41546964..b18ba15671 100644 --- a/target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch +++ b/target/linux/generic/pending-5.10/483-mtd-spi-nor-add-gd25q512.patch @@ -1,3 +1,12 @@ +From: Roman Yeryomin <roman@advem.lv> +Subject: mtd/spi-nor/gigadevice: Add gd25q512 SPI NOR flash + +Submitted-by: Roman Yeryomin <roman@advem.lv> +Submitted-by: John Crispin <john@phrozen.org> +--- + drivers/mtd/spi-nor/gigadevice.c | 3 +++ + 1 files changed, 3 insertions(+) + --- a/drivers/mtd/spi-nor/gigadevice.c +++ b/drivers/mtd/spi-nor/gigadevice.c @@ -53,6 +53,9 @@ static const struct flash_info gigadevic diff --git a/target/linux/generic/pending-5.10/484-mtd-spi-nor-add-esmt-f25l16pa.patch b/target/linux/generic/pending-5.10/484-mtd-spi-nor-add-esmt-f25l16pa.patch index ce3857d511..bf2f1e6aa6 100644 --- a/target/linux/generic/pending-5.10/484-mtd-spi-nor-add-esmt-f25l16pa.patch +++ b/target/linux/generic/pending-5.10/484-mtd-spi-nor-add-esmt-f25l16pa.patch @@ -1,3 +1,16 @@ +From: Jihoon Han <rapid_renard@renard.ga> +Subject: mtd/spi-nor/esmt: Add support for ESMT F25L16PA(2S) SPI-NOR + +This fixes support for Dongwon T&I DW02-412H which uses F25L16PA(2S) flash. + +Submitted-by: Jihoon Han <rapid_renard@renard.ga> +Reviewed-by: Sungbo Eo <mans0n@gorani.run> +[refresh patches] +Submitted-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> +--- + drivers/mtd/spi-nor/esmt.c | 2 ++ + 1 files changed, 2 insertions(+) + --- a/drivers/mtd/spi-nor/esmt.c +++ b/drivers/mtd/spi-nor/esmt.c @@ -10,6 +10,8 @@ diff --git a/target/linux/generic/pending-5.10/485-mtd-spi-nor-add-xmc-xm25qh128c.patch b/target/linux/generic/pending-5.10/485-mtd-spi-nor-add-xmc-xm25qh128c.patch index 4b3f674170..ba654ce4ca 100644 --- a/target/linux/generic/pending-5.10/485-mtd-spi-nor-add-xmc-xm25qh128c.patch +++ b/target/linux/generic/pending-5.10/485-mtd-spi-nor-add-xmc-xm25qh128c.patch @@ -1,3 +1,14 @@ +From: Langhua Ye <y1248289414@outlook.com> +Subject: mtd/spi-nor/xmc: add support for XMC XM25QH128C + +The XMC XM25QH128C is a 16MB SPI NOR chip. The patch is verified on Ruijie RG-EW3200GX PRO. +Datasheet available at https://www.xmcwh.com/uploads/435/XM25QH128C.pdf + +Submitted-by: Langhua Ye <y1248289414@outlook.com> +--- + drivers/mtd/spi-nor/xmc.c | 2 ++ + 1 file changed, 2 insertions(+) + --- a/drivers/mtd/spi-nor/xmc.c +++ b/drivers/mtd/spi-nor/xmc.c @@ -14,6 +14,8 @@ static const struct flash_info xmc_parts diff --git a/target/linux/generic/pending-5.10/500-fs_cdrom_dependencies.patch b/target/linux/generic/pending-5.10/500-fs_cdrom_dependencies.patch index 0a5a3aae5d..620bf72b4d 100644 --- a/target/linux/generic/pending-5.10/500-fs_cdrom_dependencies.patch +++ b/target/linux/generic/pending-5.10/500-fs_cdrom_dependencies.patch @@ -1,3 +1,14 @@ +From: Felix Fietkau <nbd@nbd.name> +Subject: fs: Add CDROM dependencies + +Submitted-by: Felix Fietkau <nbd@nbd.name> +--- + fs/hfs/Kconfig | 1 + + fs/hfsplus/Kconfig | 1 + + fs/isofs/Kconfig | 1 + + fs/udf/Kconfig | 1 + + 4 files changed, 4 insertions(+) + --- a/fs/hfs/Kconfig +++ b/fs/hfs/Kconfig @@ -2,6 +2,7 @@ diff --git a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch index 03cd763d9d..501422551b 100644 --- a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch +++ b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch @@ -1,3 +1,19 @@ +From: David Bauer <mail@david-bauer.net> +Subject: of/net: Add MAC address to of tree + +The label-mac logic relies on the mac-address property of a netdev +devices of-node. However, the mac address can also be stored as a +different property or read from e.g. an mtd device. + +Create this node when reading a mac-address from OF if it does not +already exist and copy the mac-address used for the device to this +property. This way, the MAC address can be accessed using procfs. + +Submitted-by: David Bauer <mail@david-bauer.net> +--- + drivers/of/of_net.c | 22 ++++++++++++++ + 1 files changed, 22 insertions(+) + --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct diff --git a/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch b/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch index c32e15d0c6..2f604cfa98 100644 --- a/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch +++ b/target/linux/generic/pending-5.15/487-mtd-spinand-Add-support-for-Etron-EM73D044VCx.patch @@ -1,3 +1,43 @@ +From f32085fc0b87049491b07e198d924d738a1a2834 Mon Sep 17 00:00:00 2001 +From: Daniel Danzberger <daniel@dd-wrt.com> +Date: Wed, 3 Aug 2022 17:31:03 +0200 +Subject: [PATCH] mtd: spinand: Add support for Etron EM73D044VCx + +Airoha is a new ARM platform based on Cortex-A53 which has recently been +merged into linux-next. + +Due to BootROM limitations on this platform, the Cortex-A53 can't run in +Aarch64 mode and code must be compiled for 32-Bit ARM. + +This support is based mostly on those linux-next commits backported +for kernel 5.15. + +Patches: +1 - platform support = linux-next +2 - clock driver = linux-next +3 - gpio driver = linux-next +4 - linux,usable-memory-range dts support = linux-next +5 - mtd spinand driver +6 - spi driver +7 - pci driver (kconfig only, uses mediatek PCI) = linux-next + +Still missing: +- Ethernet driver +- Sysupgrade support + +A.t.m there exists one subtarget EN7523 with only one evaluation +board. + +The initramfs can be run with the following commands from u-boot: +- +u-boot> setenv bootfile \ + openwrt-airoha-airoha_en7523-evb-initramfs-kernel.bin +u-boot> tftpboot +u-boot> bootm 0x81800000 +- + +Submitted-by: Daniel Danzberger <daniel@dd-wrt.com> + --- a/drivers/mtd/nand/spi/Makefile +++ b/drivers/mtd/nand/spi/Makefile @@ -1,3 +1,3 @@ |