mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
9cf794cff1
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.91
Remove upstreamed patches:
- airoha/patches-6.12/017-v6.13-net-airoha-Implement-BQL-support.patch[1]
- airoha/patches-6.12/138-v7.1-net-airoha-Add-missing-RX_CPU_IDX-configuration-in-a.patch[2]
- airoha/patches-6.12/149-v7.1-net-airoha-Move-ndesc-initialization-at-end-of-airoh.patch[3]
- generic/backport-6.12/940-v7.1-net-dsa-realtek-rtl8365mb-fix-mode-mask-calculation.patch[5]
Manually rebased patches:
- airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch[1]
- ath79/patches-6.12/800-leds-add-reset-controller-based-driver.patch[4]
- bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch[6]
We also backported four patches to fix perf tool regression:
- generic/backport-6.12/216-01-revert-perf-cgroup-update-metric-leader-in-evlist__e.patch
- generic/backport-6.12/216-02-revert-perf-tool_pmu-fix-aggregation-on-duration_tim.patch
- generic/backport-6.12/216-03-revert-perf-python-add-parse_events-function.patch
- generic/backport-6.12/216-04-revert-perf-tool_pmu-factor-tool-events-into-their-o.patch
All other patches are automatically refreshed.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=ca24fcac1daaa5e8a667981d81986a3eb4b9fb04
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=f00037a99bc2332ef59dc85298b98b20af165904
[3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=d36be272adda7f313e39dd118086955d993bf6a7
[4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=07d3611389ba7d78b80ea360a42ce32ab2521fbc
[5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=3354d6c62fd4baa7b32cbd80cc5a8aa3f2bd0656
[6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.91&id=b84351dcc359667bc952131c1424b692ec83dce2
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/23444
(cherry picked from commit 8f638f9366)
Link: https://github.com/openwrt/openwrt/pull/23538
[Adapted to patches in 25.12]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
80 lines
2.6 KiB
Diff
80 lines
2.6 KiB
Diff
From 3a1ce9e3d01bbf3912c3e3f81cb554d558eb715b Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 21 May 2025 09:16:38 +0200
|
|
Subject: [PATCH 2/3] net: airoha: Add the capability to allocate hwfd buffers
|
|
via reserved-memory
|
|
|
|
In some configurations QDMA blocks require a contiguous block of
|
|
system memory for hwfd buffers queue. Introduce the capability to allocate
|
|
hw buffers forwarding queue via the reserved-memory DTS property instead of
|
|
running dmam_alloc_coherent().
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/20250521-airopha-desc-sram-v3-3-a6e9b085b4f0@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 33 +++++++++++++++++++++---
|
|
1 file changed, 30 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -5,6 +5,7 @@
|
|
*/
|
|
#include <linux/of.h>
|
|
#include <linux/of_net.h>
|
|
+#include <linux/of_reserved_mem.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/tcp.h>
|
|
#include <linux/u64_stats_sync.h>
|
|
@@ -1093,9 +1094,11 @@ static void airoha_qdma_cleanup_tx_queue
|
|
static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma)
|
|
{
|
|
struct airoha_eth *eth = qdma->eth;
|
|
+ int id = qdma - ð->qdma[0];
|
|
dma_addr_t dma_addr;
|
|
+ const char *name;
|
|
+ int size, index;
|
|
u32 status;
|
|
- int size;
|
|
|
|
size = HW_DSCP_NUM * sizeof(struct airoha_qdma_fwd_desc);
|
|
if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL))
|
|
@@ -1103,10 +1106,34 @@ static int airoha_qdma_init_hfwd_queues(
|
|
|
|
airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr);
|
|
|
|
- size = AIROHA_MAX_PACKET_SIZE * HW_DSCP_NUM;
|
|
- if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL))
|
|
+ name = devm_kasprintf(eth->dev, GFP_KERNEL, "qdma%d-buf", id);
|
|
+ if (!name)
|
|
return -ENOMEM;
|
|
|
|
+ index = of_property_match_string(eth->dev->of_node,
|
|
+ "memory-region-names", name);
|
|
+ if (index >= 0) {
|
|
+ struct reserved_mem *rmem;
|
|
+ struct device_node *np;
|
|
+
|
|
+ /* Consume reserved memory for hw forwarding buffers queue if
|
|
+ * available in the DTS
|
|
+ */
|
|
+ np = of_parse_phandle(eth->dev->of_node, "memory-region",
|
|
+ index);
|
|
+ if (!np)
|
|
+ return -ENODEV;
|
|
+
|
|
+ rmem = of_reserved_mem_lookup(np);
|
|
+ of_node_put(np);
|
|
+ dma_addr = rmem->base;
|
|
+ } else {
|
|
+ size = AIROHA_MAX_PACKET_SIZE * HW_DSCP_NUM;
|
|
+ if (!dmam_alloc_coherent(eth->dev, size, &dma_addr,
|
|
+ GFP_KERNEL))
|
|
+ return -ENOMEM;
|
|
+ }
|
|
+
|
|
airoha_qdma_wr(qdma, REG_FWD_BUF_BASE, dma_addr);
|
|
|
|
airoha_qdma_rmw(qdma, REG_HW_FWD_DSCP_CFG,
|