net: phy: add qca8081 config_aneg

Reuse at803x phy driver config_aneg excepting
adding 2500M auto-negotiation.

Signed-off-by: Luo Jie <luoj@codeaurora.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index c4b7ac03cd3545d05c00ef7898bfc64b8ba13040..70c1025e8e5d7a319aa701767076aa792a1f3d4a 100644 (file)
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -1109,7 +1109,30 @@ static int at803x_config_aneg(struct phy_device *phydev)
                        return ret;
        }
 
-       return genphy_config_aneg(phydev);
+       /* Do not restart auto-negotiation by setting ret to 0 defautly,
+        * when calling __genphy_config_aneg later.
+        */
+       ret = 0;
+
+       if (phydev->drv->phy_id == QCA8081_PHY_ID) {
+               int phy_ctrl = 0;
+
+               /* The reg MII_BMCR also needs to be configured for force mode, the
+                * genphy_config_aneg is also needed.
+                */
+               if (phydev->autoneg == AUTONEG_DISABLE)
+                       genphy_c45_pma_setup_forced(phydev);
+
+               if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
+                       phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
+
+               ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
+                               MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return __genphy_config_aneg(phydev, ret);
 }
 
 static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
@@ -1663,6 +1686,7 @@ static struct phy_driver at803x_driver[] = {
        .set_wol                = at803x_set_wol,
        .get_wol                = at803x_get_wol,
        .get_features           = at803x_get_features,
+       .config_aneg            = at803x_config_aneg,
        .suspend                = genphy_suspend,
        .resume                 = genphy_resume,
        .read_status            = qca808x_read_status,