aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMugunthan V N <mugunthanvnm@ti.com>2015-06-25 12:51:02 -0400
committerDavid S. Miller <davem@davemloft.net>2015-06-28 19:59:10 -0400
commiteb686231fce3770299760f24fdcf5ad041f44153 (patch)
tree476376d86affe32c4f8cfba21565a966886cd756
parent4fdeddfe04d0d0fdd4cc57bc25a02adf40dbb60a (diff)
net: phy: fix phy link up when limiting speed via device tree
When limiting phy link speed using "max-speed" to 100mbps or less on a giga bit phy, phy never completes auto negotiation and phy state machine is held in PHY_AN. Fixing this issue by comparing the giga bit advertise though phydev->supported doesn't have it but phy has BMSR_ESTATEN set. So that auto negotiation is restarted as old and new advertise are different and link comes up fine. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/phy_device.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index bdfe51fc3a65..d551df62e61a 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -796,10 +796,11 @@ static int genphy_config_advert(struct phy_device *phydev)
796 if (phydev->supported & (SUPPORTED_1000baseT_Half | 796 if (phydev->supported & (SUPPORTED_1000baseT_Half |
797 SUPPORTED_1000baseT_Full)) { 797 SUPPORTED_1000baseT_Full)) {
798 adv |= ethtool_adv_to_mii_ctrl1000_t(advertise); 798 adv |= ethtool_adv_to_mii_ctrl1000_t(advertise);
799 if (adv != oldadv)
800 changed = 1;
801 } 799 }
802 800
801 if (adv != oldadv)
802 changed = 1;
803
803 err = phy_write(phydev, MII_CTRL1000, adv); 804 err = phy_write(phydev, MII_CTRL1000, adv);
804 if (err < 0) 805 if (err < 0)
805 return err; 806 return err;