net: airoha: Fix IPv6 hw acceleration in bridge mode

ib2 and airoha_foe_mac_info_common have not the same offsets in
airoha_foe_bridge and airoha_foe_ipv6 structures. Current codebase does
not accelerate IPv6 traffic in bridge mode since ib2 and l2 info are not
set properly copying airoha_foe_bridge struct into airoha_foe_ipv6 one
in airoha_ppe_foe_commit_subflow_entry routine.
Fix IPv6 hw acceleration in bridge mode resolving ib2 and
airoha_foe_mac_info_common overwrite in
airoha_ppe_foe_commit_subflow_entry() and configuring them with proper
values.

Fixes: cd53f622611f ("net: airoha: Add L2 hw acceleration support")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250602-airoha-flowtable-ipv6-fix-v2-2-3287f8b55214@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c
index a783f16980e6b7fdb69cec7ff09883a9c83d42d5..557779093a79a4b42a1dc49b8ba0dacbdc219385 100644 (file)
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
@@ -639,7 +639,6 @@ airoha_ppe_foe_commit_subflow_entry(struct airoha_ppe *ppe,
        u32 mask = AIROHA_FOE_IB1_BIND_PACKET_TYPE | AIROHA_FOE_IB1_BIND_UDP;
        struct airoha_foe_entry *hwe_p, hwe;
        struct airoha_flow_table_entry *f;
-       struct airoha_foe_mac_info *l2;
        int type;
 
        hwe_p = airoha_ppe_foe_get_entry(ppe, hash);
@@ -656,18 +655,20 @@ airoha_ppe_foe_commit_subflow_entry(struct airoha_ppe *ppe,
 
        memcpy(&hwe, hwe_p, sizeof(*hwe_p));
        hwe.ib1 = (hwe.ib1 & mask) | (e->data.ib1 & ~mask);
-       l2 = &hwe.bridge.l2;
-       memcpy(l2, &e->data.bridge.l2, sizeof(*l2));
 
        type = FIELD_GET(AIROHA_FOE_IB1_BIND_PACKET_TYPE, hwe.ib1);
-       if (type == PPE_PKT_TYPE_IPV4_HNAPT)
-               memcpy(&hwe.ipv4.new_tuple, &hwe.ipv4.orig_tuple,
-                      sizeof(hwe.ipv4.new_tuple));
-       else if (type >= PPE_PKT_TYPE_IPV6_ROUTE_3T &&
-                l2->common.etype == ETH_P_IP)
-               l2->common.etype = ETH_P_IPV6;
-
-       hwe.bridge.ib2 = e->data.bridge.ib2;
+       if (type >= PPE_PKT_TYPE_IPV6_ROUTE_3T) {
+               memcpy(&hwe.ipv6.l2, &e->data.bridge.l2, sizeof(hwe.ipv6.l2));
+               hwe.ipv6.ib2 = e->data.bridge.ib2;
+       } else {
+               memcpy(&hwe.bridge.l2, &e->data.bridge.l2,
+                      sizeof(hwe.bridge.l2));
+               hwe.bridge.ib2 = e->data.bridge.ib2;
+               if (type == PPE_PKT_TYPE_IPV4_HNAPT)
+                       memcpy(&hwe.ipv4.new_tuple, &hwe.ipv4.orig_tuple,
+                              sizeof(hwe.ipv4.new_tuple));
+       }
+
        hwe.bridge.data = e->data.bridge.data;
        airoha_ppe_foe_commit_entry(ppe, &hwe, hash);