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>
92 lines
3.5 KiB
Diff
92 lines
3.5 KiB
Diff
From c71a7a861ef02aa2bebb18c2f3385aa3f19094e0 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 17 Oct 2025 11:06:19 +0200
|
|
Subject: [PATCH 09/12] net: airoha: Select default ppe cpu port in
|
|
airoha_dev_init()
|
|
|
|
Select the PPE default cpu port in airoha_dev_init routine.
|
|
This patch allows to distribute the load between the two available cpu
|
|
ports (FE_PSE_PORT_CDM1 and FE_PSE_PORT_CDM2) if the device is running a
|
|
single PPE module (e.g. 7583) selecting the cpu port based on the use
|
|
QDMA device. For multi-PPE device (e.g. 7581) assign FE_PSE_PORT_CDM1 to
|
|
PPE1 and FE_PSE_PORT_CDM2 to PPE2.
|
|
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20251017-an7583-eth-support-v3-10-f28319666667@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 38 ++++++++++--------------
|
|
1 file changed, 16 insertions(+), 22 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -531,25 +531,6 @@ static int airoha_fe_init(struct airoha_
|
|
/* disable IFC by default */
|
|
airoha_fe_clear(eth, REG_FE_CSR_IFC_CFG, FE_IFC_EN_MASK);
|
|
|
|
- airoha_fe_wr(eth, REG_PPE_DFT_CPORT0(0),
|
|
- FIELD_PREP(DFT_CPORT_MASK(7), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(6), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(5), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(4), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(3), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(2), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(1), FE_PSE_PORT_CDM1) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(0), FE_PSE_PORT_CDM1));
|
|
- airoha_fe_wr(eth, REG_PPE_DFT_CPORT0(1),
|
|
- FIELD_PREP(DFT_CPORT_MASK(7), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(6), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(5), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(4), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(3), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(2), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(1), FE_PSE_PORT_CDM2) |
|
|
- FIELD_PREP(DFT_CPORT_MASK(0), FE_PSE_PORT_CDM2));
|
|
-
|
|
/* enable 1:N vlan action, init vlan table */
|
|
airoha_fe_set(eth, REG_MC_VLAN_EN, MC_VLAN_EN_MASK);
|
|
|
|
@@ -1782,8 +1763,10 @@ static void airhoha_set_gdm2_loopback(st
|
|
static int airoha_dev_init(struct net_device *dev)
|
|
{
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
- struct airoha_eth *eth = port->qdma->eth;
|
|
- u32 pse_port;
|
|
+ struct airoha_qdma *qdma = port->qdma;
|
|
+ struct airoha_eth *eth = qdma->eth;
|
|
+ u32 pse_port, fe_cpu_port;
|
|
+ u8 ppe_id;
|
|
|
|
airoha_set_macaddr(port, dev->dev_addr);
|
|
|
|
@@ -1796,16 +1779,27 @@ static int airoha_dev_init(struct net_de
|
|
fallthrough;
|
|
case 2:
|
|
if (airoha_ppe_is_enabled(eth, 1)) {
|
|
+ /* For PPE2 always use secondary cpu port. */
|
|
+ fe_cpu_port = FE_PSE_PORT_CDM2;
|
|
pse_port = FE_PSE_PORT_PPE2;
|
|
break;
|
|
}
|
|
fallthrough;
|
|
- default:
|
|
+ default: {
|
|
+ u8 qdma_id = qdma - ð->qdma[0];
|
|
+
|
|
+ /* For PPE1 select cpu port according to the running QDMA. */
|
|
+ fe_cpu_port = qdma_id ? FE_PSE_PORT_CDM2 : FE_PSE_PORT_CDM1;
|
|
pse_port = FE_PSE_PORT_PPE1;
|
|
break;
|
|
}
|
|
+ }
|
|
|
|
airoha_set_gdm_port_fwd_cfg(eth, REG_GDM_FWD_CFG(port->id), pse_port);
|
|
+ ppe_id = pse_port == FE_PSE_PORT_PPE2 ? 1 : 0;
|
|
+ airoha_fe_rmw(eth, REG_PPE_DFT_CPORT0(ppe_id),
|
|
+ DFT_CPORT_MASK(port->id),
|
|
+ fe_cpu_port << __ffs(DFT_CPORT_MASK(port->id)));
|
|
|
|
return 0;
|
|
}
|