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>
87 lines
3.0 KiB
Diff
87 lines
3.0 KiB
Diff
From 46097d011f77f5758fb47b7059b4f1f2e7403940 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 6 Mar 2026 16:09:47 +0100
|
|
Subject: [PATCH] net: airoha: Move GDM forward port configuration in
|
|
ndo_open/ndo_stop callbacks
|
|
|
|
This change allows to set GDM forward port configuration to
|
|
FE_PSE_PORT_DROP stopping the network device. Hw design requires to stop
|
|
packet forwarding putting the interface down. Moreover, PPE firmware
|
|
requires to use PPE1 for GDM3 or GDM4.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20260306-airoha-gdm-forward-ndo-open-stop-v1-1-7b7a20dd9ef0@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 20 +++++++++++++++-----
|
|
1 file changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1632,6 +1632,7 @@ static int airoha_dev_open(struct net_de
|
|
int err, len = ETH_HLEN + dev->mtu + ETH_FCS_LEN;
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
struct airoha_qdma *qdma = port->qdma;
|
|
+ u32 pse_port = FE_PSE_PORT_PPE1;
|
|
|
|
netif_tx_start_all_queues(dev);
|
|
err = airoha_set_vip_for_gdm_port(port, true);
|
|
@@ -1655,6 +1656,14 @@ static int airoha_dev_open(struct net_de
|
|
GLOBAL_CFG_RX_DMA_EN_MASK);
|
|
atomic_inc(&qdma->users);
|
|
|
|
+ if (port->id == AIROHA_GDM2_IDX &&
|
|
+ airoha_ppe_is_enabled(qdma->eth, 1)) {
|
|
+ /* For PPE2 always use secondary cpu port. */
|
|
+ pse_port = FE_PSE_PORT_PPE2;
|
|
+ }
|
|
+ airoha_set_gdm_port_fwd_cfg(qdma->eth, REG_GDM_FWD_CFG(port->id),
|
|
+ pse_port);
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
@@ -1672,6 +1681,9 @@ static int airoha_dev_stop(struct net_de
|
|
for (i = 0; i < ARRAY_SIZE(qdma->q_tx); i++)
|
|
netdev_tx_reset_subqueue(dev, i);
|
|
|
|
+ airoha_set_gdm_port_fwd_cfg(qdma->eth, REG_GDM_FWD_CFG(port->id),
|
|
+ FE_PSE_PORT_DROP);
|
|
+
|
|
if (atomic_dec_and_test(&qdma->users)) {
|
|
airoha_qdma_clear(qdma, REG_QDMA_GLOBAL_CFG,
|
|
GLOBAL_CFG_TX_DMA_EN_MASK |
|
|
@@ -1765,7 +1777,7 @@ static int airoha_dev_init(struct net_de
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
struct airoha_qdma *qdma = port->qdma;
|
|
struct airoha_eth *eth = qdma->eth;
|
|
- u32 pse_port, fe_cpu_port;
|
|
+ u32 fe_cpu_port;
|
|
u8 ppe_id;
|
|
|
|
airoha_set_macaddr(port, dev->dev_addr);
|
|
@@ -1786,7 +1798,7 @@ static int airoha_dev_init(struct net_de
|
|
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;
|
|
+ ppe_id = 1;
|
|
break;
|
|
}
|
|
fallthrough;
|
|
@@ -1795,13 +1807,11 @@ static int airoha_dev_init(struct net_de
|
|
|
|
/* 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;
|
|
+ ppe_id = 0;
|
|
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),
|
|
__field_prep(DFT_CPORT_MASK(port->id), fe_cpu_port));
|