mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-01 00:28:52 +00:00
39ae0f972d
This is an automatically generated commit. When doing `git bisect`, consider `git bisect --skip`. Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/19038 Signed-off-by: Robert Marko <robimarko@gmail.com>
96 lines
3.3 KiB
Diff
96 lines
3.3 KiB
Diff
From 524a43c3a0c17fa0a1223eea36751dcba55e5530 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 23 Aug 2025 09:56:02 +0200
|
|
Subject: [PATCH 1/3] net: airoha: Rely on airoha_eth struct in
|
|
airoha_ppe_flow_offload_cmd signature
|
|
|
|
Rely on airoha_eth struct in airoha_ppe_flow_offload_cmd routine
|
|
signature and in all the called subroutines.
|
|
This is a preliminary patch to introduce flowtable offload for traffic
|
|
received by the wlan NIC and forwarded to the ethernet one.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20250823-airoha-en7581-wlan-rx-offload-v3-1-f78600ec3ed8@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_ppe.c | 20 ++++++++------------
|
|
1 file changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
@@ -935,11 +935,10 @@ static int airoha_ppe_entry_idle_time(st
|
|
return airoha_ppe_get_entry_idle_time(ppe, e->data.ib1);
|
|
}
|
|
|
|
-static int airoha_ppe_flow_offload_replace(struct airoha_gdm_port *port,
|
|
+static int airoha_ppe_flow_offload_replace(struct airoha_eth *eth,
|
|
struct flow_cls_offload *f)
|
|
{
|
|
struct flow_rule *rule = flow_cls_offload_flow_rule(f);
|
|
- struct airoha_eth *eth = port->qdma->eth;
|
|
struct airoha_flow_table_entry *e;
|
|
struct airoha_flow_data data = {};
|
|
struct net_device *odev = NULL;
|
|
@@ -1136,10 +1135,9 @@ free_entry:
|
|
return err;
|
|
}
|
|
|
|
-static int airoha_ppe_flow_offload_destroy(struct airoha_gdm_port *port,
|
|
+static int airoha_ppe_flow_offload_destroy(struct airoha_eth *eth,
|
|
struct flow_cls_offload *f)
|
|
{
|
|
- struct airoha_eth *eth = port->qdma->eth;
|
|
struct airoha_flow_table_entry *e;
|
|
|
|
e = rhashtable_lookup(ð->flow_table, &f->cookie,
|
|
@@ -1182,10 +1180,9 @@ void airoha_ppe_foe_entry_get_stats(stru
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
-static int airoha_ppe_flow_offload_stats(struct airoha_gdm_port *port,
|
|
+static int airoha_ppe_flow_offload_stats(struct airoha_eth *eth,
|
|
struct flow_cls_offload *f)
|
|
{
|
|
- struct airoha_eth *eth = port->qdma->eth;
|
|
struct airoha_flow_table_entry *e;
|
|
u32 idle;
|
|
|
|
@@ -1209,16 +1206,16 @@ static int airoha_ppe_flow_offload_stats
|
|
return 0;
|
|
}
|
|
|
|
-static int airoha_ppe_flow_offload_cmd(struct airoha_gdm_port *port,
|
|
+static int airoha_ppe_flow_offload_cmd(struct airoha_eth *eth,
|
|
struct flow_cls_offload *f)
|
|
{
|
|
switch (f->command) {
|
|
case FLOW_CLS_REPLACE:
|
|
- return airoha_ppe_flow_offload_replace(port, f);
|
|
+ return airoha_ppe_flow_offload_replace(eth, f);
|
|
case FLOW_CLS_DESTROY:
|
|
- return airoha_ppe_flow_offload_destroy(port, f);
|
|
+ return airoha_ppe_flow_offload_destroy(eth, f);
|
|
case FLOW_CLS_STATS:
|
|
- return airoha_ppe_flow_offload_stats(port, f);
|
|
+ return airoha_ppe_flow_offload_stats(eth, f);
|
|
default:
|
|
break;
|
|
}
|
|
@@ -1288,7 +1285,6 @@ error_npu_put:
|
|
int airoha_ppe_setup_tc_block_cb(struct net_device *dev, void *type_data)
|
|
{
|
|
struct airoha_gdm_port *port = netdev_priv(dev);
|
|
- struct flow_cls_offload *cls = type_data;
|
|
struct airoha_eth *eth = port->qdma->eth;
|
|
int err = 0;
|
|
|
|
@@ -1297,7 +1293,7 @@ int airoha_ppe_setup_tc_block_cb(struct
|
|
if (!eth->npu)
|
|
err = airoha_ppe_offload_setup(eth);
|
|
if (!err)
|
|
- err = airoha_ppe_flow_offload_cmd(port, cls);
|
|
+ err = airoha_ppe_flow_offload_cmd(eth, type_data);
|
|
|
|
mutex_unlock(&flow_offload_mutex);
|
|
|