mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 12:40:16 +04:00
Shiji Yang
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>
132 lines
4.6 KiB
Diff
132 lines
4.6 KiB
Diff
From 8737d7194d6d5947c3d7d8813895b44a25b84477 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 13 Mar 2026 17:28:36 +0100
|
|
Subject: [PATCH] net: airoha: select QDMA block according LAN/WAN
|
|
configuration
|
|
|
|
Before this patch even GDM ports were assigned to QDMA0 while odd GDM
|
|
ports were using QDMA1, so, based on the DTS configuration, both QDMA0
|
|
and QDMA1 can theoretically receive traffic destinated to the host cpu
|
|
from LAN or WAN GDM ports.
|
|
Airoha folks reported the hw design assumes the LAN traffic destinated
|
|
to the host cpu is be forwarded to QDMA0 while traffic received on WAN
|
|
GDM port is managed by QDMA1. For this reason, select QDMA block according
|
|
to the GDM port LAN or WAN configuration:
|
|
- QDMA0 is used for GDM LAN devices
|
|
- QDMA1 is used for GDM WAN device
|
|
|
|
Assuming a device with three GDM ports, a typical configuration could be:
|
|
- MT7530 DSA switch -> GDM1 (eth0) -> QDMA0 (LAN traffic)
|
|
- External PHY -> GDM2 (eth1) -> QDMA1 (WAN traffic)
|
|
- External PHY -> GDM3 (eth2) -> QDMA0 (LAN traffic)
|
|
|
|
We can then bridge eth0 DSA port (lanX) with eth2 since they all tx/rx
|
|
LAN traffic.
|
|
|
|
Please note this patch introduces a change not visible to the user since
|
|
airoha_eth driver currently supports just the internal phy available via
|
|
the MT7530 DSA switch and there are no WAN interfaces officially supported
|
|
since PCS/external phy is not merged mainline yet (it will be posted with
|
|
following patches).
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20260313-airoha-qdma-lan-wan-mode-v2-1-7d577db6e40c@kernel.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 18 ++++++++----------
|
|
drivers/net/ethernet/airoha/airoha_eth.h | 1 +
|
|
2 files changed, 9 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -1775,11 +1775,13 @@ static int airhoha_set_gdm2_loopback(str
|
|
static int airoha_dev_init(struct net_device *dev)
|
|
{
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
- struct airoha_qdma *qdma = port->qdma;
|
|
- struct airoha_eth *eth = qdma->eth;
|
|
+ struct airoha_eth *eth = port->eth;
|
|
u32 fe_cpu_port;
|
|
u8 ppe_id;
|
|
|
|
+ /* QDMA0 is used for lan ports while QDMA1 is used for WAN ports */
|
|
+ port->qdma = ð->qdma[!airoha_is_lan_gdm_port(port)];
|
|
+ port->dev->irq = port->qdma->irq_banks[0].irq;
|
|
airoha_set_macaddr(port, dev->dev_addr);
|
|
|
|
switch (port->id) {
|
|
@@ -1803,7 +1805,7 @@ static int airoha_dev_init(struct net_de
|
|
}
|
|
fallthrough;
|
|
default: {
|
|
- u8 qdma_id = qdma - ð->qdma[0];
|
|
+ u8 qdma_id = port->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;
|
|
@@ -2887,11 +2889,10 @@ bool airoha_is_valid_gdm_port(struct air
|
|
}
|
|
|
|
static int airoha_alloc_gdm_port(struct airoha_eth *eth,
|
|
- struct device_node *np, int index)
|
|
+ struct device_node *np)
|
|
{
|
|
const __be32 *id_ptr = of_get_property(np, "reg", NULL);
|
|
struct airoha_gdm_port *port;
|
|
- struct airoha_qdma *qdma;
|
|
struct net_device *dev;
|
|
int err, p;
|
|
u32 id;
|
|
@@ -2922,7 +2923,6 @@ static int airoha_alloc_gdm_port(struct
|
|
return -ENOMEM;
|
|
}
|
|
|
|
- qdma = ð->qdma[index % AIROHA_MAX_NUM_QDMA];
|
|
dev->netdev_ops = &airoha_netdev_ops;
|
|
dev->ethtool_ops = &airoha_ethtool_ops;
|
|
dev->max_mtu = AIROHA_MAX_MTU;
|
|
@@ -2934,7 +2934,6 @@ static int airoha_alloc_gdm_port(struct
|
|
dev->features |= dev->hw_features;
|
|
dev->vlan_features = dev->hw_features;
|
|
dev->dev.of_node = np;
|
|
- dev->irq = qdma->irq_banks[0].irq;
|
|
SET_NETDEV_DEV(dev, eth->dev);
|
|
|
|
/* reserve hw queues for HTB offloading */
|
|
@@ -2955,7 +2954,7 @@ static int airoha_alloc_gdm_port(struct
|
|
port = netdev_priv(dev);
|
|
u64_stats_init(&port->stats.syncp);
|
|
spin_lock_init(&port->stats.lock);
|
|
- port->qdma = qdma;
|
|
+ port->eth = eth;
|
|
port->dev = dev;
|
|
port->id = id;
|
|
eth->ports[p] = port;
|
|
@@ -3055,7 +3054,6 @@ static int airoha_probe(struct platform_
|
|
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
|
|
airoha_qdma_start_napi(ð->qdma[i]);
|
|
|
|
- i = 0;
|
|
for_each_child_of_node(pdev->dev.of_node, np) {
|
|
if (!of_device_is_compatible(np, "airoha,eth-mac"))
|
|
continue;
|
|
@@ -3063,7 +3061,7 @@ static int airoha_probe(struct platform_
|
|
if (!of_device_is_available(np))
|
|
continue;
|
|
|
|
- err = airoha_alloc_gdm_port(eth, np, i++);
|
|
+ err = airoha_alloc_gdm_port(eth, np);
|
|
if (err) {
|
|
of_node_put(np);
|
|
goto error_napi_stop;
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
|
|
@@ -533,6 +533,7 @@ struct airoha_qdma {
|
|
|
|
struct airoha_gdm_port {
|
|
struct airoha_qdma *qdma;
|
|
+ struct airoha_eth *eth;
|
|
struct net_device *dev;
|
|
int id;
|
|
|