diff options
| author |   Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2015-01-16 12:46:39 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-16 22:24:19 -0500 |
| commit | 03e50fd7b18351ab4766d4d0f7d25c5b4fefa9d9 (patch) | |
| tree | 1db0e5d28e034846bb029989193c70bae657958b /drivers | |
| parent | amd-xgbe: Add check to be sure amd-xgbe-phy driver is used (diff) | |
| download | linux-dev-03e50fd7b18351ab4766d4d0f7d25c5b4fefa9d9.tar.xz linux-dev-03e50fd7b18351ab4766d4d0f7d25c5b4fefa9d9.zip | |
amd-xgbe-phy: On suspend, save CTRL1 reg for use on resume
Reads to registers are undefined when the PCS is powered down. To be
safe, save the CTRL1 register used for power down during suspend and
restore that value during resume.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/amd-xgbe-phy.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/net/phy/amd-xgbe-phy.c b/drivers/net/phy/amd-xgbe-phy.c index b65a0a8f921d..5ce42e324eb7 100644 --- a/drivers/net/phy/amd-xgbe-phy.c +++ b/drivers/net/phy/amd-xgbe-phy.c @@ -350,6 +350,8 @@ struct amd_xgbe_phy_priv { struct work_struct an_work; struct workqueue_struct *an_workqueue; unsigned int parallel_detect; + + unsigned int lpm_ctrl; /* CTRL1 for resume */ }; static int amd_xgbe_an_enable_kr_training(struct phy_device *phydev) @@ -1250,6 +1252,7 @@ static int amd_xgbe_phy_read_status(struct phy_device *phydev) static int amd_xgbe_phy_suspend(struct phy_device *phydev) { + struct amd_xgbe_phy_priv *priv = phydev->priv; int ret; mutex_lock(&phydev->lock); @@ -1258,6 +1261,8 @@ static int amd_xgbe_phy_suspend(struct phy_device *phydev) if (ret < 0) goto unlock; + priv->lpm_ctrl = ret; + ret |= MDIO_CTRL1_LPOWER; phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret); @@ -1271,23 +1276,16 @@ unlock: static int amd_xgbe_phy_resume(struct phy_device *phydev) { - int ret; + struct amd_xgbe_phy_priv *priv = phydev->priv; mutex_lock(&phydev->lock); - ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1); - if (ret < 0) - goto unlock; - - ret &= ~MDIO_CTRL1_LPOWER; - phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, ret); - - ret = 0; + priv->lpm_ctrl &= ~MDIO_CTRL1_LPOWER; + phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, priv->lpm_ctrl); -unlock: mutex_unlock(&phydev->lock); - return ret; + return 0; } static int amd_xgbe_phy_probe(struct phy_device *phydev) |