From: Lendacky, Thomas Date: Tue, 4 Nov 2014 22:07:35 +0000 (-0600) Subject: amd-xgbe-phy: Sync PCS and PHY modes after reset X-Git-Tag: v3.19-rc1~118^2~271^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0c95a1faaa155bb49fc4acfec61242e80b8a8502;p=~emulex%2Finfiniband.git amd-xgbe-phy: Sync PCS and PHY modes after reset This patch adds support to sync the states of the PCS and the PHY after a reset is performed. If the PCS and the PHY are not in the same state after reset an extra mode change would be performed. This extra mode change might not be needed if the PCS and the PHY are synced up after reset. Signed-off-by: Tom Lendacky Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/amd-xgbe-phy.c b/drivers/net/phy/amd-xgbe-phy.c index c456559f6e7..37b9f3fff1c 100644 --- a/drivers/net/phy/amd-xgbe-phy.c +++ b/drivers/net/phy/amd-xgbe-phy.c @@ -992,7 +992,8 @@ static int amd_xgbe_phy_soft_reset(struct phy_device *phydev) if (ret & MDIO_CTRL1_RESET) return -ETIMEDOUT; - return 0; + /* Make sure the XPCS and SerDes are in compatible states */ + return amd_xgbe_phy_xgmii_mode(phydev); } static int amd_xgbe_phy_config_init(struct phy_device *phydev)