bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid deadlock in stmmac

This commit is contained in:
Bjarne von Horn 2024-04-08 13:06:03 +02:00
parent 44439c3ea0
commit 3549dc69cc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devices/stmmac/stmmac_main-6.1-ethercat.c
View File

@ -3969,12 +3969,12 @@ static int stmmac_release(struct net_device *dev)
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
u32 chan; u32 chan;
if (device_may_wakeup(priv->device))
phylink_speed_down(priv->phylink, false);
/* Stop and disconnect the PHY */
if (get_ecdev(priv)) { if (get_ecdev(priv)) {
rtnl_lock(); rtnl_lock();
} }
if (device_may_wakeup(priv->device))
phylink_speed_down(priv->phylink, false);
/* Stop and disconnect the PHY */
phylink_stop(priv->phylink); phylink_stop(priv->phylink);
phylink_disconnect_phy(priv->phylink); phylink_disconnect_phy(priv->phylink);
if (get_ecdev(priv)) { if (get_ecdev(priv)) {
@ -7552,14 +7552,11 @@ int stmmac_ec_dvr_remove(struct device *dev)
stmmac_stop_all_dma(priv); stmmac_stop_all_dma(priv);
stmmac_mac_set(priv, priv->ioaddr, false); stmmac_mac_set(priv, priv->ioaddr, false);
if (get_ecdev(priv)) { if (get_ecdev(priv)) {
mutex_lock(&priv->lock);
ecdev_close(get_ecdev(priv)); ecdev_close(get_ecdev(priv));
irq_work_sync(&priv->ec_watchdog_kicker); irq_work_sync(&priv->ec_watchdog_kicker);
ecdev_withdraw(get_ecdev(priv)); ecdev_withdraw(get_ecdev(priv));
priv->ecdev_ = NULL; priv->ecdev_ = NULL;
priv->ecdev_initialized = false; priv->ecdev_initialized = false;
mutex_unlock(&priv->lock);
} else { } else {
netif_carrier_off(ndev); netif_carrier_off(ndev);
unregister_netdev(ndev); unregister_netdev(ndev);