Commit 03e50fd7 authored by Lendacky, Thomas's avatar Lendacky, Thomas Committed by David S. Miller
Browse files

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: default avatarTom Lendacky <>
Signed-off-by: default avatarDavid S. Miller <>
parent 94c043e5
......@@ -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;
......@@ -1258,6 +1261,8 @@ static int amd_xgbe_phy_suspend(struct phy_device *phydev)
if (ret < 0)
goto unlock;
priv->lpm_ctrl = ret;
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;
ret = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
if (ret < 0)
goto unlock;
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);
return ret;
return 0;
static int amd_xgbe_phy_probe(struct phy_device *phydev)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment