shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ETH: remove release open when resume for amlogic phy. [1/1]

Browse Source 
PD#SWPL-13132

Problem:
stammac release/open when resume will change the dma addr.
if stmmac_xmit and stmmac_tx_work are running at the same time
it will cause panic

Solution:
remove stmmac_release/open call in stmmac_resume for chip
g12a/g12b/tl1/tm2

Verify:
verify on TL1

Change-Id: I5abf2ccf72c39483bbd1cce7b9e24bf596f30d0f
Signed-off-by: qi duan <qi.duan@amlogic.com>
This commit is contained in:
qi duan
2019-08-22 05:45:15 -04:00
committed by Chris KIM
parent bf83bc7ca9
commit 2a8fc35925
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View File

@@ -54,7 +54,9 @@
#include <linux/reset.h>
#include <linux/of_mdio.h>
#include "dwmac1000.h"
#ifdef CONFIG_AMLOGIC_ETH_PRIVE
#include "stmmac_platform.h"
#endif
#ifdef CONFIG_DWMAC_MESON
#include <phy_debug.h>
#endif
@@ -3672,8 +3674,10 @@ int stmmac_resume(struct device *dev)
phy_start(priv->phydev);
#ifdef TX_MONITOR
stmmac_release(priv_monitor->dev);
stmmac_open(priv_monitor->dev);
if (!ee_reset_base) {
stmmac_release(priv_monitor->dev);
stmmac_open(priv_monitor->dev);
}
#endif
return 0;
}

1
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
View File

@@ -35,6 +35,7 @@ int stmmac_pltfr_suspend(struct device *dev);
int stmmac_pltfr_resume(struct device *dev);
extern unsigned int external_rx_delay;
extern unsigned int external_tx_delay;
extern void __iomem *ee_reset_base;
#endif
extern const struct dev_pm_ops stmmac_pltfr_pm_ops;