mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-01 05:08:40 +00:00
d62ecd6c07
Refresh patches 6.12 for airoha and econet Fixes:122135b964("airoha: an7581: add support for kernel 6.12") Fixes:73d0f92460("kernel: Add new platform EcoNet MIPS") Signed-off-by: Leo Barsky <leobrsky@proton.me> Link: https://github.com/openwrt/openwrt/pull/20073 Signed-off-by: Robert Marko <robimarko@gmail.com>
78 lines
2.4 KiB
Diff
78 lines
2.4 KiB
Diff
From 67fde5d58cd43d129a979e918ec9cd5d2e2fbcfb Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 28 Feb 2025 11:54:16 +0100
|
|
Subject: [PATCH 08/15] net: airoha: Move REG_GDM_FWD_CFG() initialization in
|
|
airoha_dev_init()
|
|
|
|
Move REG_GDM_FWD_CFG() register initialization in airoha_dev_init
|
|
routine. Moreover, always send traffic PPE module in order to be
|
|
processed by hw accelerator.
|
|
This is a preliminary patch to enable netfilter flowtable hw offloading
|
|
on EN7581 SoC.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 14 ++++----------
|
|
1 file changed, 4 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -107,25 +107,20 @@ static void airoha_set_gdm_port_fwd_cfg(
|
|
|
|
static int airoha_set_gdm_port(struct airoha_eth *eth, int port, bool enable)
|
|
{
|
|
- u32 val = enable ? FE_PSE_PORT_PPE1 : FE_PSE_PORT_DROP;
|
|
- u32 vip_port, cfg_addr;
|
|
+ u32 vip_port;
|
|
|
|
switch (port) {
|
|
case XSI_PCIE0_PORT:
|
|
vip_port = XSI_PCIE0_VIP_PORT_MASK;
|
|
- cfg_addr = REG_GDM_FWD_CFG(3);
|
|
break;
|
|
case XSI_PCIE1_PORT:
|
|
vip_port = XSI_PCIE1_VIP_PORT_MASK;
|
|
- cfg_addr = REG_GDM_FWD_CFG(3);
|
|
break;
|
|
case XSI_USB_PORT:
|
|
vip_port = XSI_USB_VIP_PORT_MASK;
|
|
- cfg_addr = REG_GDM_FWD_CFG(4);
|
|
break;
|
|
case XSI_ETH_PORT:
|
|
vip_port = XSI_ETH_VIP_PORT_MASK;
|
|
- cfg_addr = REG_GDM_FWD_CFG(4);
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
@@ -139,8 +134,6 @@ static int airoha_set_gdm_port(struct ai
|
|
airoha_fe_clear(eth, REG_FE_IFC_PORT_EN, vip_port);
|
|
}
|
|
|
|
- airoha_set_gdm_port_fwd_cfg(eth, cfg_addr, val);
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
@@ -177,8 +170,6 @@ static void airoha_fe_maccr_init(struct
|
|
airoha_fe_set(eth, REG_GDM_FWD_CFG(p),
|
|
GDM_TCP_CKSUM | GDM_UDP_CKSUM | GDM_IP4_CKSUM |
|
|
GDM_DROP_CRC_ERR);
|
|
- airoha_set_gdm_port_fwd_cfg(eth, REG_GDM_FWD_CFG(p),
|
|
- FE_PSE_PORT_CDM1);
|
|
airoha_fe_rmw(eth, REG_GDM_LEN_CFG(p),
|
|
GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK,
|
|
FIELD_PREP(GDM_SHORT_LEN_MASK, 60) |
|
|
@@ -1614,8 +1605,11 @@ static int airoha_dev_set_macaddr(struct
|
|
static int airoha_dev_init(struct net_device *dev)
|
|
{
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
+ struct airoha_eth *eth = port->qdma->eth;
|
|
|
|
airoha_set_macaddr(port, dev->dev_addr);
|
|
+ airoha_set_gdm_port_fwd_cfg(eth, REG_GDM_FWD_CFG(port->id),
|
|
+ FE_PSE_PORT_PPE1);
|
|
|
|
return 0;
|
|
}
|