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>
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) |
|
|
@@ -1635,8 +1626,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;
|
|
}
|