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

ethernet:gmac: avoid pinctrl operation after a spin lock is acquired in suspend and resume

Browse Source
This commit is contained in:
roger
2014-09-22 15:31:15 +08:00
parent 269d928b5c
commit 46dcf30869
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/net/ethernet/rockchip/gmac/stmmac_main.c
View File

@@ -2912,6 +2912,8 @@ int stmmac_suspend(struct net_device *ndev)
{
struct stmmac_priv *priv = netdev_priv(ndev);
unsigned long flags;
bool pwr_off_phy = false;
struct bsp_priv * bsp_priv = NULL;
if (!ndev || !netif_running(ndev))
return 0;
@@ -2939,18 +2941,21 @@ int stmmac_suspend(struct net_device *ndev)
stmmac_set_mac(priv->ioaddr, false);
/* Disable clock in case of PWM is off */
if ((priv->plat) && (priv->plat->bsp_priv)) {
struct bsp_priv * bsp_priv = priv->plat->bsp_priv;
if (bsp_priv) {
if (bsp_priv->gmac_clk_enable) {
bsp_priv->gmac_clk_enable(false);
}
if (bsp_priv->phy_power_on) {
bsp_priv->phy_power_on(false);
}
bsp_priv = priv->plat->bsp_priv;
pwr_off_phy = true;
if (bsp_priv && bsp_priv->gmac_clk_enable) {
bsp_priv->gmac_clk_enable(false);
}
}
}
spin_unlock_irqrestore(&priv->lock, flags);
if (pwr_off_phy && bsp_priv) {
if (bsp_priv->phy_power_on) {
bsp_priv->phy_power_on(false);
}
}
return 0;
}
@@ -2958,6 +2963,8 @@ int stmmac_resume(struct net_device *ndev)
{
struct stmmac_priv *priv = netdev_priv(ndev);
unsigned long flags;
bool pwr_on_phy = false;
struct bsp_priv * bsp_priv = NULL;
if (!netif_running(ndev))
return 0;
@@ -2974,16 +2981,13 @@ int stmmac_resume(struct net_device *ndev)
priv->hw->mac->pmt(priv->ioaddr, 0);
else {
/* enable the clk prevously disabled */
if ((priv->plat) && (priv->plat->bsp_priv)) {
struct bsp_priv * bsp_priv = priv->plat->bsp_priv;
if (bsp_priv) {
if (bsp_priv->gmac_clk_enable) {
bsp_priv->gmac_clk_enable(true);
}
if (bsp_priv->phy_power_on) {
bsp_priv->phy_power_on(true);
}
if (priv->plat && (priv->plat->bsp_priv)) {
bsp_priv = priv->plat->bsp_priv;
if (bsp_priv && bsp_priv->gmac_clk_enable) {
bsp_priv->gmac_clk_enable(true);
}
pwr_on_phy = true;
}
}
@@ -3000,6 +3004,12 @@ int stmmac_resume(struct net_device *ndev)
spin_unlock_irqrestore(&priv->lock, flags);
if (pwr_on_phy && bsp_priv) {
if (bsp_priv->phy_power_on) {
bsp_priv->phy_power_on(true);
}
}
if (priv->phydev)
phy_start(priv->phydev);