commit bc6b585072907c48ef63213fd26054e069be3a29
author developer <developer@mediatek.com> Tue Nov 22 21:09:44 2022 +0800
committer developer <developer@mediatek.com> Tue Nov 22 21:48:09 2022 +0800
tree 64065dc36feb7dec55baec9bfce05702626be93e
parent 22ccfc55a759b42d8a4273222a8ff4decebb867f

[][MAC80211][eth][Fix WED SER patch fail issue]

[Description]
Fix WED SER patch fail issue

[Release-log]
N/A


Change-Id: I16350d5bd3c636f81681d36af2532ad9da10f8d6
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6820724

autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-add-wed-ser-support.patch

diff --git a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-add-wed-ser-support.patch b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-add-wed-ser-support.patch
index 94956b3..d97d4c1 100755
--- a/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-add-wed-ser-support.patch
+++ b/autobuild_mac80211_release/target/linux/mediatek/patches-5.4/9999-add-wed-ser-support.patch
@@ -16,34 +16,33 @@
 index c582bb9..5259141 100644
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3220,10 +3220,14 @@ static void mtk_pending_work(struct work_struct *work)
- 	mtk_prepare_reset_fe(eth);
- 
- 	/* Trigger Wifi SER reset */
+@@ -3619,10 +3619,14 @@ static void mtk_pending_work(struct work_struct *work)
+ 	for (i = 0; i < MTK_MAC_COUNT; i++) {
+ 		if (!eth->netdev[i])
+ 			continue;
 +#ifdef CONFIG_NET_MEDIATEK_SOC_WED
-+	mtk_wed_fe_reset(MTK_FE_START_RESET);
++		mtk_wed_fe_reset(MTK_FE_START_RESET);
 +#else
- 	call_netdevice_notifiers(MTK_FE_START_RESET, eth->netdev[0]);
- 	rtnl_unlock();
- 	wait_for_completion_timeout(&wait_ser_done, 5000);
- 	rtnl_lock();
+ 		call_netdevice_notifiers(MTK_FE_START_RESET, eth->netdev[i]);
+ 		rtnl_unlock();
+ 		wait_for_completion_timeout(&wait_ser_done, 5000);
+ 		rtnl_lock();
 +#endif
+ 		break;
+ 	}
  
- 	while (test_and_set_bit_lock(MTK_RESETTING, &eth->state))
- 		cpu_relax();
-@@ -3284,8 +3288,11 @@ static void mtk_pending_work(struct work_struct *work)
- 
- 	call_netdevice_notifiers(MTK_FE_RESET_NAT_DONE, eth->netdev[0]);
- 	pr_info("[%s] HNAT reset done !\n", __func__);
--
+@@ -3690,7 +3694,11 @@ static void mtk_pending_work(struct work_struct *work)
+ 			continue;
+ 		call_netdevice_notifiers(MTK_FE_RESET_NAT_DONE, eth->netdev[i]);
+ 		pr_info("[%s] HNAT reset done !\n", __func__);
 +#ifdef CONFIG_NET_MEDIATEK_SOC_WED
-+	mtk_wed_fe_reset(MTK_FE_RESET_DONE);
++		mtk_wed_fe_reset(MTK_FE_RESET_DONE);
 +#else
- 	call_netdevice_notifiers(MTK_FE_RESET_DONE, eth->netdev[0]);
+ 		call_netdevice_notifiers(MTK_FE_RESET_DONE, eth->netdev[i]);
 +#endif
- 	pr_info("[%s] WiFi SER reset done !\n", __func__);
- 
- 	atomic_dec(&reset_lock);
+ 		pr_info("[%s] WiFi SER reset done !\n", __func__);
+ 		break;
+ 	}
 diff --git a/drivers/net/ethernet/mediatek/mtk_wed.c b/drivers/net/ethernet/mediatek/mtk_wed.c
 index 7552795..c98d749 100644
 --- a/drivers/net/ethernet/mediatek/mtk_wed.c