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>
65 lines
2.5 KiB
Diff
65 lines
2.5 KiB
Diff
From 7b46bdaec00a675f6fac9d0b01a2105b5746ebe9 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 19 Jun 2025 09:07:25 +0200
|
|
Subject: [PATCH 2/2] net: airoha: Differentiate hwfd buffer size for QDMA0 and
|
|
QDMA1
|
|
|
|
EN7581 SoC allows configuring the size and the number of buffers in
|
|
hwfd payload queue for both QDMA0 and QDMA1.
|
|
In order to reduce the required DRAM used for hwfd buffers queues and
|
|
decrease the memory footprint, differentiate hwfd buffer size for QDMA0
|
|
and QDMA1 and reduce hwfd buffer size to 1KB for QDMA1 (WAN) while
|
|
maintaining 2KB for QDMA0 (LAN).
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/20250619-airoha-hw-num-desc-v4-2-49600a9b319a@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1089,14 +1089,15 @@ static int airoha_qdma_init_hfwd_queues(
|
|
int size, index, num_desc = HW_DSCP_NUM;
|
|
struct airoha_eth *eth = qdma->eth;
|
|
int id = qdma - ð->qdma[0];
|
|
+ u32 status, buf_size;
|
|
dma_addr_t dma_addr;
|
|
const char *name;
|
|
- u32 status;
|
|
|
|
name = devm_kasprintf(eth->dev, GFP_KERNEL, "qdma%d-buf", id);
|
|
if (!name)
|
|
return -ENOMEM;
|
|
|
|
+ buf_size = id ? AIROHA_MAX_PACKET_SIZE / 2 : AIROHA_MAX_PACKET_SIZE;
|
|
index = of_property_match_string(eth->dev->of_node,
|
|
"memory-region-names", name);
|
|
if (index >= 0) {
|
|
@@ -1117,9 +1118,9 @@ static int airoha_qdma_init_hfwd_queues(
|
|
/* Compute the number of hw descriptors according to the
|
|
* reserved memory size and the payload buffer size
|
|
*/
|
|
- num_desc = rmem->size / AIROHA_MAX_PACKET_SIZE;
|
|
+ num_desc = div_u64(rmem->size, buf_size);
|
|
} else {
|
|
- size = AIROHA_MAX_PACKET_SIZE * num_desc;
|
|
+ size = buf_size * num_desc;
|
|
if (!dmam_alloc_coherent(eth->dev, size, &dma_addr,
|
|
GFP_KERNEL))
|
|
return -ENOMEM;
|
|
@@ -1132,9 +1133,10 @@ static int airoha_qdma_init_hfwd_queues(
|
|
return -ENOMEM;
|
|
|
|
airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr);
|
|
+ /* QDMA0: 2KB. QDMA1: 1KB */
|
|
airoha_qdma_rmw(qdma, REG_HW_FWD_DSCP_CFG,
|
|
HW_FWD_DSCP_PAYLOAD_SIZE_MASK,
|
|
- FIELD_PREP(HW_FWD_DSCP_PAYLOAD_SIZE_MASK, 0));
|
|
+ FIELD_PREP(HW_FWD_DSCP_PAYLOAD_SIZE_MASK, !!id));
|
|
airoha_qdma_rmw(qdma, REG_FWD_DSCP_LOW_THR, FWD_DSCP_LOW_THR_MASK,
|
|
FIELD_PREP(FWD_DSCP_LOW_THR_MASK, 128));
|
|
airoha_qdma_rmw(qdma, REG_LMGR_INIT_CFG,
|