[][MAC80211][hnat][Fix LAN/WAN software path low t-Put issue]
[Description]
Fix LAN/WAN software path low t-Put issue.
To improve the software path performance of the ETH to ETH scenario,
we have disabled threaded NAPI and changed RPS strategy in the ETH
driver.
Without this patch, the software path performance of ETH to ETH may
be poor.
[Release-log]
N/A
Change-Id: Ib61148ef16102860a54d86f82d01f3300fc10c67
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7971831
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-mtketh-add-threaded-napi-support.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-mtketh-add-threaded-napi-support.patch
deleted file mode 100755
index 99e3ecd..0000000
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3000-mtketh-add-threaded-napi-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index b6bdb978..9de1b0b6 100755
---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3696,6 +3696,9 @@ static int mtk_probe(struct platform_device *pdev)
- * for NAPI to work
- */
- init_dummy_netdev(ð->dummy_dev);
-+ eth->dummy_dev.threaded = 1;
-+ strcpy(eth->dummy_dev.name, "mtk_eth");
-+
- netif_napi_add(ð->dummy_dev, ð->tx_napi, mtk_napi_tx,
- MTK_NAPI_WEIGHT);
- netif_napi_add(ð->dummy_dev, ð->rx_napi[0].napi, mtk_napi_rx,
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
deleted file mode 100755
index 2089f78..0000000
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3001-mtketh-add-qdma-sw-solution-for-mac80211-sdk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index 28cda15..d34a3a0 100755
---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -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"
-@@ -3722,6 +3722,10 @@ static int mtk_probe(struct platform_device *pdev)
- timer_setup(ð->mtk_dma_monitor_timer, mtk_dma_monitor, 0);
- eth->mtk_dma_monitor_timer.expires = jiffies;
- add_timer(ð->mtk_dma_monitor_timer);
--#endif
-+
-+ mtk_w32(eth, 0x00000404, MTK_QTX_CFG(MTK_QDMA_GMAC2_QID));
-+ mtk_w32(eth, 0x40000000, MTK_QTX_SCH(MTK_QDMA_GMAC2_QID));
-+ mtk_w32(eth, 0x80008000, QDMA_TX_4SCH_BASE(0));
-+#endif
-
- return 0;
diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-add-wed.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-add-wed.patch
index 201a629..fe2dc53 100755
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-add-wed.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/999-3005-add-wed.patch
@@ -138,7 +138,7 @@
index 819d8a0be..2121335a1
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -20,12 +21,14 @@
+@@ -20,11 +21,13 @@
#include <linux/pinctrl/devinfo.h>
#include <linux/phylink.h>
#include <linux/gpio/consumer.h>
@@ -148,7 +148,6 @@
#include "mtk_eth_soc.h"
#include "mtk_eth_dbg.h"
#include "mtk_eth_reset.h"
- #include "mtk_hnat/hnat.h"
+#include "mtk_wed.h"
#if defined(CONFIG_NET_MEDIATEK_HNAT) || defined(CONFIG_NET_MEDIATEK_HNAT_MODULE)
diff --git a/target/linux/mediatek/base-files/sbin/smp-mt76.sh b/target/linux/mediatek/base-files/sbin/smp-mt76.sh
index 83d7799..709e228 100755
--- a/target/linux/mediatek/base-files/sbin/smp-mt76.sh
+++ b/target/linux/mediatek/base-files/sbin/smp-mt76.sh
@@ -214,6 +214,15 @@
# wifi3_irq=247
#fi
fi
+
+ for vif in $NET_IF_LIST;
+ do
+ if [[ "$vif" == "lan"* ]] || \
+ [[ "$vif" == "wlan"* ]] || [[ "$vif" == "phy"* ]]; then
+ LAN_IF_LIST="$LAN_IF_LIST $vif"
+ fi
+ done;
+ dbg2 "$LAN_IF_LIST = $LAN_IF_LIST"
# Please update the CPU binding in each cases.
# CPU#_AFFINITY="add binding irq number here"
# CPU#_RPS="add binding interface name here"
@@ -234,8 +243,8 @@
CPU2_AFFINITY="$wifi2_irq $wifi3_irq"
CPU3_AFFINITY="$wifi1_irq"
- CPU0_RPS="$RPS_IF_LIST"
- CPU1_RPS="$RPS_IF_LIST"
+ CPU0_RPS="$LAN_IF_LIST"
+ CPU1_RPS="$LAN_IF_LIST"
CPU2_RPS="$RPS_IF_LIST"
CPU3_RPS="$RPS_IF_LIST"
fi