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>
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
From 09aa788f98da3e2f41ce158cc691d6d52e808bc9 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 21 May 2025 09:16:37 +0200
|
|
Subject: [PATCH 1/3] net: airoha: Do not store hfwd references in airoha_qdma
|
|
struct
|
|
|
|
Since hfwd descriptor and buffer queues are allocated via
|
|
dmam_alloc_coherent() we do not need to store their references
|
|
in airoha_qdma struct. This patch does not introduce any logical changes,
|
|
just code clean-up.
|
|
|
|
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-2-a6e9b085b4f0@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 8 ++------
|
|
drivers/net/ethernet/airoha/airoha_eth.h | 6 ------
|
|
2 files changed, 2 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1098,17 +1098,13 @@ static int airoha_qdma_init_hfwd_queues(
|
|
int size;
|
|
|
|
size = HW_DSCP_NUM * sizeof(struct airoha_qdma_fwd_desc);
|
|
- qdma->hfwd.desc = dmam_alloc_coherent(eth->dev, size, &dma_addr,
|
|
- GFP_KERNEL);
|
|
- if (!qdma->hfwd.desc)
|
|
+ if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL))
|
|
return -ENOMEM;
|
|
|
|
airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr);
|
|
|
|
size = AIROHA_MAX_PACKET_SIZE * HW_DSCP_NUM;
|
|
- qdma->hfwd.q = dmam_alloc_coherent(eth->dev, size, &dma_addr,
|
|
- GFP_KERNEL);
|
|
- if (!qdma->hfwd.q)
|
|
+ if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL))
|
|
return -ENOMEM;
|
|
|
|
airoha_qdma_wr(qdma, REG_FWD_BUF_BASE, dma_addr);
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
|
|
@@ -513,12 +513,6 @@ struct airoha_qdma {
|
|
|
|
struct airoha_queue q_tx[AIROHA_NUM_TX_RING];
|
|
struct airoha_queue q_rx[AIROHA_NUM_RX_RING];
|
|
-
|
|
- /* descriptor and packet buffers for qdma hw forward */
|
|
- struct {
|
|
- void *desc;
|
|
- void *q;
|
|
- } hfwd;
|
|
};
|
|
|
|
struct airoha_gdm_port {
|