net: hns: fix the wrong speed for bond

[deliverable/linux.git] / drivers / net / ethernet / hisilicon / hns / hns_ethtool.c

diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
index 67a648c7d3a9e14d51ebbe650ec9b72c8a61015d..564ae1ec6aa8813bfd9a96a78fb5d234690f640c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
@@ -49,7 +49,7 @@ static u32 hns_nic_get_link(struct net_device *net_dev)
        h = priv->ae_handle;
 
        if (priv->phy) {
-               if (!genphy_update_link(priv->phy))
+               if (!genphy_read_status(priv->phy))
                        link_stat = priv->phy->link;
                else
                        link_stat = 0;
@@ -242,6 +242,7 @@ static const char hns_nic_test_strs[][ETH_GSTRING_LEN] = {
 static int hns_nic_config_phy_loopback(struct phy_device *phy_dev, u8 en)
 {
 #define COPPER_CONTROL_REG 0
+#define PHY_POWER_DOWN BIT(11)
 #define PHY_LOOP_BACK BIT(14)
        u16 val = 0;
 
@@ -252,33 +253,40 @@ static int hns_nic_config_phy_loopback(struct phy_device *phy_dev, u8 en)
                /* speed : 1000M */
                phy_write(phy_dev, HNS_PHY_PAGE_REG, 2);
                phy_write(phy_dev, 21, 0x1046);
+
+               phy_write(phy_dev, HNS_PHY_PAGE_REG, 0);
                /* Force Master */
                phy_write(phy_dev, 9, 0x1F00);
+
                /* Soft-reset */
                phy_write(phy_dev, 0, 0x9140);
                /* If autoneg disabled,two soft-reset operations */
                phy_write(phy_dev, 0, 0x9140);
-               phy_write(phy_dev, 22, 0xFA);
+
+               phy_write(phy_dev, HNS_PHY_PAGE_REG, 0xFA);
 
                /* Default is 0x0400 */
                phy_write(phy_dev, 1, 0x418);
 
                /* Force 1000M Link, Default is 0x0200 */
                phy_write(phy_dev, 7, 0x20C);
-               phy_write(phy_dev, 22, 0);
+               phy_write(phy_dev, HNS_PHY_PAGE_REG, 0);
 
-               /* Enable MAC loop-back */
+               /* Enable PHY loop-back */
                val = phy_read(phy_dev, COPPER_CONTROL_REG);
                val |= PHY_LOOP_BACK;
+               val &= ~PHY_POWER_DOWN;
                phy_write(phy_dev, COPPER_CONTROL_REG, val);
        } else {
-               phy_write(phy_dev, 22, 0xFA);
+               phy_write(phy_dev, HNS_PHY_PAGE_REG, 0xFA);
                phy_write(phy_dev, 1, 0x400);
                phy_write(phy_dev, 7, 0x200);
-               phy_write(phy_dev, 22, 0);
+               phy_write(phy_dev, HNS_PHY_PAGE_REG, 0);
+               phy_write(phy_dev, 9, 0xF00);
 
                val = phy_read(phy_dev, COPPER_CONTROL_REG);
                val &= ~PHY_LOOP_BACK;
+               val |= PHY_POWER_DOWN;
                phy_write(phy_dev, COPPER_CONTROL_REG, val);
        }
        return 0;
@@ -339,28 +347,16 @@ static int __lb_up(struct net_device *ndev,
 
        hns_nic_net_reset(ndev);
 
-       if (priv->phy) {
-               phy_disconnect(priv->phy);
-               msleep(100);
-
-               ret = hns_nic_init_phy(ndev, h);
-               if (ret)
-                       return ret;
-       }
-
        ret = __lb_setup(ndev, loop_mode);
        if (ret)
                return ret;
 
-       msleep(100);
+       msleep(200);
 
        ret = h->dev->ops->start ? h->dev->ops->start(h) : 0;
        if (ret)
                return ret;
 
-       if (priv->phy)
-               phy_start(priv->phy);
-
        /* link adjust duplex*/
        if (priv->ae_handle->phy_if != PHY_INTERFACE_MODE_XGMII)
                speed = 1000;
@@ -561,9 +557,6 @@ static int __lb_down(struct net_device *ndev)
                           __func__,
                           ret);
 
-       if (priv->phy)
-               phy_stop(priv->phy);
-
        if (h->dev->ops->stop)
                h->dev->ops->stop(h);
 
@@ -596,7 +589,7 @@ static void hns_nic_self_test(struct net_device *ndev,
        st_param[1][0] = MAC_INTERNALLOOP_SERDES;
        st_param[1][1] = 1; /*serdes must exist*/
        st_param[2][0] = MAC_INTERNALLOOP_PHY; /* only supporte phy node*/
-       st_param[2][1] = ((!!(priv->ae_handle->phy_node)) &&
+       st_param[2][1] = ((!!(priv->ae_handle->phy_dev)) &&
                (priv->ae_handle->phy_if != PHY_INTERFACE_MODE_XGMII));
 
        if (eth_test->flags == ETH_TEST_FL_OFFLINE) {