net: hns3: add support to update flow control settings after autoneg

When auto-negotiation is enabled, the MAC flow control settings is
based on the flow control negotiation result. And it should be configured
after a valid link has been established. This patch adds support to update
flow control settings after auto-negotiation has completed.

Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Fuyun Liang <liangfuyun1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 0f55ee6710cc570c7c8b405cf08b4cab9a8164e7..bb312123cef3802f1b8038d6f09572cfccf79457 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -4707,6 +4707,42 @@ static int hclge_cfg_pauseparam(struct hclge_dev *hdev, u32 rx_en, u32 tx_en)
        return 0;
 }
 
+int hclge_cfg_flowctrl(struct hclge_dev *hdev)
+{
+       struct phy_device *phydev = hdev->hw.mac.phydev;
+       u16 remote_advertising = 0;
+       u16 local_advertising = 0;
+       u32 rx_pause, tx_pause;
+       u8 flowctl;
+
+       if (!phydev->link || !phydev->autoneg)
+               return 0;
+
+       if (phydev->advertising & ADVERTISED_Pause)
+               local_advertising = ADVERTISE_PAUSE_CAP;
+
+       if (phydev->advertising & ADVERTISED_Asym_Pause)
+               local_advertising |= ADVERTISE_PAUSE_ASYM;
+
+       if (phydev->pause)
+               remote_advertising = LPA_PAUSE_CAP;
+
+       if (phydev->asym_pause)
+               remote_advertising |= LPA_PAUSE_ASYM;
+
+       flowctl = mii_resolve_flowctrl_fdx(local_advertising,
+                                          remote_advertising);
+       tx_pause = flowctl & FLOW_CTRL_TX;
+       rx_pause = flowctl & FLOW_CTRL_RX;
+
+       if (phydev->duplex == HCLGE_MAC_HALF) {
+               tx_pause = 0;
+               rx_pause = 0;
+       }
+
+       return hclge_cfg_pauseparam(hdev, rx_pause, tx_pause);
+}
+
 static void hclge_get_pauseparam(struct hnae3_handle *handle, u32 *auto_neg,
                                 u32 *rx_en, u32 *tx_en)
 {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index cda520c7a2f958c41e058c6c77e09a1af4e879ad..28cc063306c4b493c9eb7feb58b65928fd636268 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -602,4 +602,5 @@ int hclge_rss_init_hw(struct hclge_dev *hdev);
 
 void hclge_mbx_handler(struct hclge_dev *hdev);
 void hclge_reset_tqp(struct hnae3_handle *handle, u16 queue_id);
+int hclge_cfg_flowctrl(struct hclge_dev *hdev);
 #endif

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
index 7069e9408d7de58b164293480c9bd75fa5eae3cf..3745153ed55f921f6f485a18f4b4da93ea0013df 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
@@ -183,6 +183,10 @@ static void hclge_mac_adjust_link(struct net_device *netdev)
        ret = hclge_cfg_mac_speed_dup(hdev, speed, duplex);
        if (ret)
                netdev_err(netdev, "failed to adjust link.\n");
+
+       ret = hclge_cfg_flowctrl(hdev);
+       if (ret)
+               netdev_err(netdev, "failed to configure flow control.\n");
 }
 
 int hclge_mac_start_phy(struct hclge_dev *hdev)