From ee9e1531054c6f75ce5d77716e3cd9865c4db897 Mon Sep 17 00:00:00 2001
From: lean <coolsnowwolf@gmail.com>
Date: Wed, 5 Jan 2022 19:25:24 +0800
Subject: [PATCH] mtk_eth_soc: add missing ipv6 flow offload support for 5.10

---
 ...soc-add-ipv6-flow-offloading-support.patch | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch

diff --git a/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch b/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch
new file mode 100644
index 000000000..26067c9dd
--- /dev/null
+++ b/target/linux/generic/backport-5.10/610-v5.13-54-net-ethernet-mtk_eth_soc-add-ipv6-flow-offloading-support.patch
@@ -0,0 +1,105 @@
+--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
++++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+@@ -7,6 +7,7 @@
+ #include <linux/rhashtable.h>
+ #include <linux/if_ether.h>
+ #include <linux/ip.h>
++#include <linux/ipv6.h>
+ #include <net/flow_offload.h>
+ #include <net/pkt_cls.h>
+ #include <net/dsa.h>
+@@ -20,6 +21,11 @@ struct mtk_flow_data {
+ 			__be32 src_addr;
+ 			__be32 dst_addr;
+ 		} v4;
++
++		struct {
++			struct in6_addr src_addr;
++			struct in6_addr dst_addr;
++		} v6;
+ 	};
+ 
+ 	__be16 src_port;
+@@ -64,6 +70,14 @@ mtk_flow_set_ipv4_addr(struct mtk_foe_en
+ 					    data->v4.dst_addr, data->dst_port);
+ }
+ 
++static int
++mtk_flow_set_ipv6_addr(struct mtk_foe_entry *foe, struct mtk_flow_data *data)
++{
++	return mtk_foe_entry_set_ipv6_tuple(foe,
++					    data->v6.src_addr.s6_addr32, data->src_port,
++					    data->v6.dst_addr.s6_addr32, data->dst_port);
++}
++
+ static void
+ mtk_flow_offload_mangle_eth(const struct flow_action_entry *act, void *eth)
+ {
+@@ -128,6 +142,29 @@ mtk_flow_mangle_ipv4(const struct flow_a
+ }
+ 
+ static int
++mtk_flow_mangle_ipv6(const struct flow_action_entry *act,
++		     struct mtk_flow_data *data)
++{
++	__be32 *dest;
++	size_t offset_of_ip6_daddr = offsetof(struct ipv6hdr, daddr);
++	size_t offset_of_ip6_saddr = offsetof(struct ipv6hdr, saddr);
++	u32 idx;
++
++	if (act->mangle.offset >= offset_of_ip6_daddr && act->mangle.offset < offset_of_ip6_daddr) {
++		idx = (act->mangle.offset - offset_of_ip6_saddr) / 4;
++		dest = &data->v6.src_addr.s6_addr32[idx];
++	} else if (act->mangle.offset >= offset_of_ip6_daddr &&
++		   act->mangle.offset < offset_of_ip6_daddr + 16) {
++		idx = (act->mangle.offset - offset_of_ip6_daddr) / 4;
++		dest = &data->v6.dst_addr.s6_addr32[idx];
++	}
++
++	memcpy(dest, &act->mangle.val, sizeof(u32));
++
++	return 0;
++}
++
++static int
+ mtk_flow_get_dsa_port(struct net_device **dev)
+ {
+ #if IS_ENABLED(CONFIG_NET_DSA)
+@@ -254,6 +291,9 @@ mtk_flow_offload_replace(struct mtk_eth
+ 	case FLOW_DISSECTOR_KEY_IPV4_ADDRS:
+ 		offload_type = MTK_PPE_PKT_TYPE_IPV4_HNAPT;
+ 		break;
++	case FLOW_DISSECTOR_KEY_IPV6_ADDRS:
++		offload_type = MTK_PPE_PKT_TYPE_IPV6_ROUTE_5T;
++		break;
+ 	default:
+ 		return -EOPNOTSUPP;
+ 	}
+@@ -289,6 +329,17 @@ mtk_flow_offload_replace(struct mtk_eth
+ 		mtk_flow_set_ipv4_addr(&foe, &data, false);
+ 	}
+ 
++	if (addr_type == FLOW_DISSECTOR_KEY_IPV6_ADDRS) {
++		struct flow_match_ipv6_addrs addrs;
++
++		flow_rule_match_ipv6_addrs(rule, &addrs);
++
++		data.v6.src_addr = addrs.key->src;
++		data.v6.dst_addr = addrs.key->dst;
++
++		mtk_flow_set_ipv6_addr(&foe, &data);
++	}
++
+ 	flow_action_for_each(i, act, &rule->action) {
+ 		if (act->id != FLOW_ACTION_MANGLE)
+ 			continue;
+@@ -301,6 +352,9 @@ mtk_flow_offload_replace(struct mtk_eth
+ 		case FLOW_ACT_MANGLE_HDR_TYPE_IP4:
+ 			err = mtk_flow_mangle_ipv4(act, &data);
+ 			break;
++		case FLOW_ACT_MANGLE_HDR_TYPE_IP6:
++			err = mtk_flow_mangle_ipv6(act, &data);
++			break;
+ 		case FLOW_ACT_MANGLE_HDR_TYPE_ETH:
+ 			/* handled earlier */
+ 			break;