[][MAC80211][Change ethernet patches to mtk_openwrt_feeds]
[Description]
Change ethernet patches to mtk_openwrt_feeds
[Release-log]
N/A
Change-Id: I61ea3878160ec3139a462824cf32385e7a4cbd92
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/5876615
diff --git a/autobuild_mac80211_release/lede-build-sanity.sh b/autobuild_mac80211_release/lede-build-sanity.sh
index f23148f..89d7590 100755
--- a/autobuild_mac80211_release/lede-build-sanity.sh
+++ b/autobuild_mac80211_release/lede-build-sanity.sh
@@ -110,6 +110,7 @@
patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0002-master-hostapd-makefile-for-utils.patch
patch -f -p1 -i ${MTK_FEED_DIR}/autobuild_mac80211_release/0003-master-mt76-makefile-for-new-chip.patch
cp -rfa ${MTK_FEED_DIR}/autobuild_mac80211_release/package/ ${BUILD_DIR}
+ cp -rfa ${MTK_FEED_DIR}/autobuild_mac80211_release/target/ ${BUILD_DIR}
}
copy_main_Config() {
diff --git a/autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/9999-flow-offload-add-net_device_path.patch b/autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/9999-flow-offload-add-net_device_path.patch
deleted file mode 100644
index 1fc6880..0000000
--- a/autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/9999-flow-offload-add-net_device_path.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -829,6 +829,59 @@ typedef u16 (*select_queue_fallback_t)(s
- struct sk_buff *skb,
- struct net_device *sb_dev);
-
-+enum net_device_path_type {
-+ DEV_PATH_ETHERNET = 0,
-+ DEV_PATH_VLAN,
-+ DEV_PATH_BRIDGE,
-+ DEV_PATH_PPPOE,
-+ DEV_PATH_DSA,
-+};
-+
-+struct net_device_path {
-+ enum net_device_path_type type;
-+ const struct net_device *dev;
-+ union {
-+ struct {
-+ u16 id;
-+ __be16 proto;
-+ u8 h_dest[ETH_ALEN];
-+ } encap;
-+ struct {
-+ enum {
-+ DEV_PATH_BR_VLAN_KEEP,
-+ DEV_PATH_BR_VLAN_TAG,
-+ DEV_PATH_BR_VLAN_UNTAG,
-+ DEV_PATH_BR_VLAN_UNTAG_HW,
-+ } vlan_mode;
-+ u16 vlan_id;
-+ __be16 vlan_proto;
-+ } bridge;
-+ struct {
-+ int port;
-+ u16 proto;
-+ } dsa;
-+ };
-+};
-+
-+#define NET_DEVICE_PATH_STACK_MAX 5
-+#define NET_DEVICE_PATH_VLAN_MAX 2
-+
-+struct net_device_path_stack {
-+ int num_paths;
-+ struct net_device_path path[NET_DEVICE_PATH_STACK_MAX];
-+};
-+
-+struct net_device_path_ctx {
-+ const struct net_device *dev;
-+ const u8 *daddr;
-+
-+ int num_vlans;
-+ struct {
-+ u16 id;
-+ __be16 proto;
-+ } vlan[NET_DEVICE_PATH_VLAN_MAX];
-+};
-+
- enum tc_setup_type {
- TC_SETUP_QDISC_MQPRIO,
- TC_SETUP_CLSU32,
-@@ -844,6 +897,7 @@ enum tc_setup_type {
- TC_SETUP_ROOT_QDISC,
- TC_SETUP_QDISC_GRED,
- TC_SETUP_QDISC_TAPRIO,
-+ TC_SETUP_FT,
- };
-
- /* These structures hold the attributes of bpf state that are being passed
-@@ -1258,6 +1312,8 @@ enum flow_offload_type {
- * Get devlink port instance associated with a given netdev.
- * Called with a reference on the netdevice and devlink locks only,
- * rtnl_lock is not held.
-+ * int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, struct net_device_path *path);
-+ * Get the forwarding path to reach the real device from the HW destination address
- */
- struct net_device_ops {
- int (*ndo_init)(struct net_device *dev);
-@@ -1460,6 +1516,8 @@ struct net_device_ops {
- int (*ndo_xsk_wakeup)(struct net_device *dev,
- u32 queue_id, u32 flags);
- struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev);
-+ int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx,
-+ struct net_device_path *path);
- };
-
- /**
-@@ -2684,6 +2742,8 @@ void dev_remove_offload(struct packet_of
-
- int dev_get_iflink(const struct net_device *dev);
- int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb);
-+int dev_fill_forward_path(const struct net_device *dev, const u8 *daddr,
-+ struct net_device_path_stack *stack);
- struct net_device *__dev_get_by_flags(struct net *net, unsigned short flags,
- unsigned short mask);
- struct net_device *dev_get_by_name(struct net *net, const char *name);
diff --git a/autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/1004-mtketh-add-threaded-napi-support.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/1004-mtketh-add-threaded-napi-support.patch
similarity index 100%
rename from autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/1004-mtketh-add-threaded-napi-support.patch
rename to autobuild_mac80211_release/target/linux/mediatek/patches-5.4/1004-mtketh-add-threaded-napi-support.patch
diff --git a/autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/1007-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/1007-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
similarity index 74%
rename from autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/1007-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
rename to autobuild_mac80211_release/target/linux/mediatek/patches-5.4/1007-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
index b3e8644..2b143bf 100644
--- a/autobuild_mac80211_release/mt7986_mac80211/target/linux/mediatek/patches-5.4/1007-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/1007-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
@@ -1,18 +1,18 @@
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index 991558dd..6b1ce272 100755
+index 28cda15..d34a3a0 100755
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -23,6 +23,7 @@
-
+@@ -24,6 +24,7 @@
#include "mtk_eth_soc.h"
#include "mtk_eth_dbg.h"
+ #include "mtk_eth_reset.h"
+#include "mtk_hnat/hnat.h"
#if defined(CONFIG_NET_MEDIATEK_HNAT) || defined(CONFIG_NET_MEDIATEK_HNAT_MODULE)
#include "mtk_hnat/nf_hnat_mtk.h"
-@@ -3590,6 +3591,12 @@ static int mtk_probe(struct platform_device *pdev)
-
- platform_set_drvdata(pdev, eth);
+@@ -3713,6 +3714,12 @@ static int mtk_probe(struct platform_device *pdev)
+ eth->mtk_dma_monitor_timer.expires = jiffies;
+ add_timer(ð->mtk_dma_monitor_timer);
+#if defined(CONFIG_MEDIATEK_NETSYS_V2)
+ mtk_w32(eth, 0x00000404, MTK_QTX_CFG(MTK_QDMA_GMAC2_QID));