AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 06:40:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

stmmac: Don't init ptp again when resume from suspend/hibernation

Browse Source 
Both stmmac_open() and stmmac_resume() call stmmac_hw_setup(), and
stmmac_hw_setup() call stmmac_init_ptp() unconditionally. However, only
stmmac_release() calls stmmac_release_ptp(). Since stmmac_suspend()
doesn't call stmmac_release_ptp(), stmmac_resume() also needn't call
stmmac_init_ptp().

This patch also fix a "scheduling while atomic" problem when resume
from suspend/hibernation. Because stmmac_init_ptp() will trigger
scheduling while stmmac_resume() hold a spinlock.

Callgraph of "scheduling while atomic":
stmmac_resume() --> stmmac_hw_setup() --> stmmac_init_ptp() -->
stmmac_ptp_register() --> ptp_clock_register() --> device_create() -->
device_create_groups_vargs() --> device_add() --> devtmpfs_create_node()
--> wait_for_common() --> schedule_timeout() --> __schedule()

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Huacai Chen 2014-12-19 22:38:18 +08:00 committed by David S. Miller
parent da413eec72
commit fe13192911
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1671,7 +1671,7 @@ static void stmmac_init_tx_coalesce(struct stmmac_priv *priv)
* 0 on success and an appropriate (-)ve integer as defined in errno.h * 0 on success and an appropriate (-)ve integer as defined in errno.h
* file on failure. * file on failure.
*/ */
static int stmmac_hw_setup(struct net_device *dev) static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
{ {
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
int ret; int ret;
@ -1708,9 +1708,11 @@ static int stmmac_hw_setup(struct net_device *dev)
stmmac_mmc_setup(priv); stmmac_mmc_setup(priv);
ret = stmmac_init_ptp(priv); if (init_ptp) {
if (ret && ret != -EOPNOTSUPP) ret = stmmac_init_ptp(priv);
pr_warn("%s: failed PTP initialisation\n", __func__); if (ret && ret != -EOPNOTSUPP)
pr_warn("%s: failed PTP initialisation\n", __func__);
}
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
ret = stmmac_init_fs(dev); ret = stmmac_init_fs(dev);
@ -1787,7 +1789,7 @@ static int stmmac_open(struct net_device *dev)
goto init_error; goto init_error;
} }
ret = stmmac_hw_setup(dev); ret = stmmac_hw_setup(dev, true);
if (ret < 0) { if (ret < 0) {
pr_err("%s: Hw setup failed\n", __func__); pr_err("%s: Hw setup failed\n", __func__);
goto init_error; goto init_error;
@ -3036,7 +3038,7 @@ int stmmac_resume(struct net_device *ndev)
netif_device_attach(ndev); netif_device_attach(ndev);
init_dma_desc_rings(ndev, GFP_ATOMIC); init_dma_desc_rings(ndev, GFP_ATOMIC);
stmmac_hw_setup(ndev); stmmac_hw_setup(ndev, false);
stmmac_init_tx_coalesce(priv); stmmac_init_tx_coalesce(priv);
napi_enable(&priv->napi); napi_enable(&priv->napi);