]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: airoha: Rely on airoha_eth struct in airoha_ppe_flow_offload_cmd signature
authorLorenzo Bianconi <lorenzo@kernel.org>
Sat, 23 Aug 2025 07:56:02 +0000 (09:56 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 26 Aug 2025 00:16:00 +0000 (17:16 -0700)
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

index 0d5cd3a13a3ee3d877f344ee0644d76d1c9df74a..36b45e98279a1d18ef0c7e185d8fca7b32c70436 100644 (file)
@@ -935,11 +935,10 @@ static int airoha_ppe_entry_idle_time(struct airoha_ppe *ppe,
        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(&eth->flow_table, &f->cookie,
@@ -1182,10 +1180,9 @@ void airoha_ppe_foe_entry_get_stats(struct airoha_ppe *ppe, u32 hash,
        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(struct airoha_gdm_port *port,
        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 net_device *dev, void *type_data)
        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);