8f638f9366
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 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
78 lines
2.9 KiB
Diff
78 lines
2.9 KiB
Diff
From edf8afeecfbb0b8c1a2edb8c8892d2f759d35321 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 19 Jun 2025 09:07:24 +0200
|
|
Subject: [PATCH 1/2] net: airoha: Compute number of descriptors according to
|
|
reserved memory size
|
|
|
|
In order to not exceed the reserved memory size for hwfd buffers,
|
|
compute the number of hwfd buffers/descriptors according to the
|
|
reserved memory size and the size of each hwfd buffer (2KB).
|
|
|
|
Fixes: 3a1ce9e3d01b ("net: airoha: Add the capability to allocate hwfd buffers via reserved-memory")
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20250619-airoha-hw-num-desc-v4-1-49600a9b319a@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 21 ++++++++++++---------
|
|
1 file changed, 12 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1086,19 +1086,13 @@ static void airoha_qdma_cleanup_tx_queue
|
|
|
|
static int airoha_qdma_init_hfwd_queues(struct airoha_qdma *qdma)
|
|
{
|
|
+ int size, index, num_desc = HW_DSCP_NUM;
|
|
struct airoha_eth *eth = qdma->eth;
|
|
int id = qdma - ð->qdma[0];
|
|
dma_addr_t dma_addr;
|
|
const char *name;
|
|
- int size, index;
|
|
u32 status;
|
|
|
|
- size = HW_DSCP_NUM * sizeof(struct airoha_qdma_fwd_desc);
|
|
- if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL))
|
|
- return -ENOMEM;
|
|
-
|
|
- airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr);
|
|
-
|
|
name = devm_kasprintf(eth->dev, GFP_KERNEL, "qdma%d-buf", id);
|
|
if (!name)
|
|
return -ENOMEM;
|
|
@@ -1120,8 +1114,12 @@ static int airoha_qdma_init_hfwd_queues(
|
|
rmem = of_reserved_mem_lookup(np);
|
|
of_node_put(np);
|
|
dma_addr = rmem->base;
|
|
+ /* 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;
|
|
} else {
|
|
- size = AIROHA_MAX_PACKET_SIZE * HW_DSCP_NUM;
|
|
+ size = AIROHA_MAX_PACKET_SIZE * num_desc;
|
|
if (!dmam_alloc_coherent(eth->dev, size, &dma_addr,
|
|
GFP_KERNEL))
|
|
return -ENOMEM;
|
|
@@ -1129,6 +1127,11 @@ static int airoha_qdma_init_hfwd_queues(
|
|
|
|
airoha_qdma_wr(qdma, REG_FWD_BUF_BASE, dma_addr);
|
|
|
|
+ size = num_desc * sizeof(struct airoha_qdma_fwd_desc);
|
|
+ if (!dmam_alloc_coherent(eth->dev, size, &dma_addr, GFP_KERNEL))
|
|
+ return -ENOMEM;
|
|
+
|
|
+ airoha_qdma_wr(qdma, REG_FWD_DSCP_BASE, dma_addr);
|
|
airoha_qdma_rmw(qdma, REG_HW_FWD_DSCP_CFG,
|
|
HW_FWD_DSCP_PAYLOAD_SIZE_MASK,
|
|
FIELD_PREP(HW_FWD_DSCP_PAYLOAD_SIZE_MASK, 0));
|
|
@@ -1137,7 +1140,7 @@ static int airoha_qdma_init_hfwd_queues(
|
|
airoha_qdma_rmw(qdma, REG_LMGR_INIT_CFG,
|
|
LMGR_INIT_START | LMGR_SRAM_MODE_MASK |
|
|
HW_FWD_DESC_NUM_MASK,
|
|
- FIELD_PREP(HW_FWD_DESC_NUM_MASK, HW_DSCP_NUM) |
|
|
+ FIELD_PREP(HW_FWD_DESC_NUM_MASK, num_desc) |
|
|
LMGR_INIT_START | LMGR_SRAM_MODE_MASK);
|
|
|
|
return read_poll_timeout(airoha_qdma_rr, status,
|