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>
83 lines
3.0 KiB
Diff
83 lines
3.0 KiB
Diff
From c683e378c0907e66cee939145edf936c254ff1e3 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 21 May 2025 09:16:39 +0200
|
|
Subject: [PATCH 3/3] net: airoha: Add the capability to allocate hfwd
|
|
descriptors in SRAM
|
|
|
|
In order to improve packet processing and packet forwarding
|
|
performances, EN7581 SoC supports consuming SRAM instead of DRAM for
|
|
hw forwarding descriptors queue.
|
|
For downlink hw accelerated traffic request to consume SRAM memory
|
|
for hw forwarding descriptors queue.
|
|
|
|
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-4-a6e9b085b4f0@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 11 +----------
|
|
drivers/net/ethernet/airoha/airoha_eth.h | 9 +++++++++
|
|
drivers/net/ethernet/airoha/airoha_ppe.c | 6 ++++++
|
|
3 files changed, 16 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -71,15 +71,6 @@ static void airoha_qdma_irq_disable(stru
|
|
airoha_qdma_set_irqmask(irq_bank, index, mask, 0);
|
|
}
|
|
|
|
-static bool airhoa_is_lan_gdm_port(struct airoha_gdm_port *port)
|
|
-{
|
|
- /* GDM1 port on EN7581 SoC is connected to the lan dsa switch.
|
|
- * GDM{2,3,4} can be used as wan port connected to an external
|
|
- * phy module.
|
|
- */
|
|
- return port->id == 1;
|
|
-}
|
|
-
|
|
static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr)
|
|
{
|
|
struct airoha_eth *eth = port->qdma->eth;
|
|
@@ -1145,7 +1136,7 @@ static int airoha_qdma_init_hfwd_queues(
|
|
LMGR_INIT_START | LMGR_SRAM_MODE_MASK |
|
|
HW_FWD_DESC_NUM_MASK,
|
|
FIELD_PREP(HW_FWD_DESC_NUM_MASK, HW_DSCP_NUM) |
|
|
- LMGR_INIT_START);
|
|
+ LMGR_INIT_START | LMGR_SRAM_MODE_MASK);
|
|
|
|
return read_poll_timeout(airoha_qdma_rr, status,
|
|
!(status & LMGR_INIT_START), USEC_PER_MSEC,
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
|
|
@@ -597,6 +597,15 @@ u32 airoha_rmw(void __iomem *base, u32 o
|
|
#define airoha_qdma_clear(qdma, offset, val) \
|
|
airoha_rmw((qdma)->regs, (offset), (val), 0)
|
|
|
|
+static inline bool airhoa_is_lan_gdm_port(struct airoha_gdm_port *port)
|
|
+{
|
|
+ /* GDM1 port on EN7581 SoC is connected to the lan dsa switch.
|
|
+ * GDM{2,3,4} can be used as wan port connected to an external
|
|
+ * phy module.
|
|
+ */
|
|
+ return port->id == 1;
|
|
+}
|
|
+
|
|
bool airoha_is_valid_gdm_port(struct airoha_eth *eth,
|
|
struct airoha_gdm_port *port);
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
@@ -251,6 +251,12 @@ static int airoha_ppe_foe_entry_prepare(
|
|
else
|
|
pse_port = 2; /* uplink relies on GDM2 loopback */
|
|
val |= FIELD_PREP(AIROHA_FOE_IB2_PSE_PORT, pse_port);
|
|
+
|
|
+ /* For downlink traffic consume SRAM memory for hw forwarding
|
|
+ * descriptors queue.
|
|
+ */
|
|
+ if (airhoa_is_lan_gdm_port(port))
|
|
+ val |= AIROHA_FOE_IB2_FAST_PATH;
|
|
}
|
|
|
|
if (is_multicast_ether_addr(data->eth.h_dest))
|