Backups/immortalwrt-mt798x
1
0
Fork 0
mirror of https://github.com/hanwckf/immortalwrt-mt798x.git synced 2025-01-07 01:53:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Description]

Browse Source 
Fix panic issue for mtk_pending_work.

If without this patch, mtk_pending_work might cause kernel panic
in the one gmac system.

[Release-log]
N/A

Change-Id: I9d2940645d738bac8888a7410c5ad5586a08c115
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6814894
This commit is contained in:
developer 2022-11-22 09:59:14 +08:00 committed by hanwckf
parent daba7b9a2d
commit 19f2e53562
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
View File

@ -3081,10 +3081,15 @@ static void mtk_pending_work(struct work_struct *work)
mtk_prepare_reset_fe(eth);
/* Trigger Wifi SER reset */
call_netdevice_notifiers(MTK_FE_START_RESET, eth->netdev[0]);
rtnl_unlock();
wait_for_completion_timeout(&wait_ser_done, 5000);
rtnl_lock();
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i])
continue;
call_netdevice_notifiers(MTK_FE_START_RESET, eth->netdev[i]);
rtnl_unlock();
wait_for_completion_timeout(&wait_ser_done, 5000);
rtnl_lock();
break;
}
while (test_and_set_bit_lock(MTK_RESETTING, &eth->state))
cpu_relax();
@ -3111,7 +3116,7 @@ static void mtk_pending_work(struct work_struct *work)
/* restart DMA and enable IRQs */
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!test_bit(i, &restart))
if (!test_bit(i, &restart) || !eth->netdev[i])
continue;
err = mtk_open(eth->netdev[i]);
if (err) {
@ -3135,6 +3140,8 @@ static void mtk_pending_work(struct work_struct *work)
/* Power up sgmii */
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i])
continue;
mac = netdev_priv(eth->netdev[i]);
phy_node = of_parse_phandle(mac->of_node, "phy-handle", 0);
if (!phy_node && eth->sgmii->regmap[i]) {
@ -3143,11 +3150,15 @@ 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__);
call_netdevice_notifiers(MTK_FE_RESET_DONE, eth->netdev[0]);
pr_info("[%s] WiFi SER reset done !\n", __func__);
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!eth->netdev[i])
continue;
call_netdevice_notifiers(MTK_FE_RESET_NAT_DONE, eth->netdev[i]);
pr_info("[%s] HNAT reset done !\n", __func__);
call_netdevice_notifiers(MTK_FE_RESET_DONE, eth->netdev[i]);
pr_info("[%s] WiFi SER reset done !\n", __func__);
break;
}
atomic_dec(&reset_lock);
if (atomic_read(&force) > 0)