8f21d26411
Refreshed automatically with `make target/linux/refresh V=s`. Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/21019 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
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
|
|
@@ -1708,6 +1708,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);
|
|
@@ -1731,6 +1732,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;
|
|
}
|
|
|
|
@@ -1745,6 +1754,9 @@ static int airoha_dev_stop(struct net_de
|
|
for (i = 0; i < dev->num_tx_queues; 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 |
|
|
@@ -1838,7 +1850,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);
|
|
@@ -1859,7 +1871,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;
|
|
@@ -1868,13 +1880,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));
|