[][MAC80211][ppe][Refactor PPE driver for backward compatible mt7622]
[Description]
Refactor PPE driver for backward compatible mt7622.
If without this patch, the MT7622's PPE can't bind the entries in the latest flowblock codebase.
[Release-log]
N/A
Change-Id: I1d4080ec413229e40dc3a46491a052da448e1dc9
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6409031
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
index 7a06015..df74a7d 100755
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9995-flow-offload-add-mkhnat-dual-ppe-new-v2.patch
@@ -212,13 +212,17 @@
index a76f4b0ac..21cc55145 100644
--- a/drivers/net/ethernet/mediatek/mtk_ppe.h
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
-@@ -8,6 +8,8 @@
+@@ -8,10 +8,12 @@
#include <linux/bitfield.h>
#include <linux/rhashtable.h>
+ #if defined(CONFIG_MEDIATEK_NETSYS_V2)
+#define MTK_MAX_PPE_NUM 2
-+
#define MTK_ETH_PPE_BASE 0x2000
+ #else
++#define MTK_MAX_PPE_NUM 1
+ #define MTK_ETH_PPE_BASE 0xc00
+ #endif
#define MTK_PPE_ENTRIES_SHIFT 3
@@ -253,6 +255,7 @@ struct mtk_flow_entry {
@@ -354,11 +358,12 @@
} else {
return -EOPNOTSUPP;
}
-@@ -435,11 +441,25 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f)
+@@ -435,11 +441,27 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f)
if (!entry)
return -ENOMEM;
+ i = 0;
++#if defined(CONFIG_MEDIATEK_NETSYS_V2)
+ if (idev && idev->netdev_ops->ndo_fill_receive_path) {
+ ctx.dev = idev;
+ idev->netdev_ops->ndo_fill_receive_path(&ctx, &path);
@@ -370,6 +375,7 @@
+ return -EINVAL;
+ }
+ }
++#endif
+
entry->cookie = f->cookie;
memcpy(&entry->data, &foe, sizeof(entry->data));