net: hns3: use the user's cfg after reset

Consider the followed case that the user change speed and reset the net
interface. Before the hw change speed successfully, the driver get old
old speed from hw by timer task. After reset, the previous speed is config
to hw. As a result, the new speed is configed successfully but lost after
PF reset. The followed pictured shows more dirrectly.

+------+              +----+                 +----+
| USER |              | PF |                 | HW |
+---+--+              +-+--+                 +-+--+
    |  ethtool -s 100G  |                      |
    +------------------>|   set speed 100G     |
    |                   +--------------------->|
    |                   |  set successfully    |
    |                   |<---------------------+---+
    |                   |query cfg (timer task)|   |
    |                   +--------------------->|   | handle speed
    |                   |     return 200G      |   | changing event
    |  ethtool --reset  |<---------------------+   | (100G)
    +------------------>|  cfg previous speed  |<--+
    |                   |  after reset (200G)  |
    |                   +--------------------->|
    |                   |                      +---+
    |                   |query cfg (timer task)|   |
    |                   +--------------------->|   | handle speed
    |                   |     return 100G      |   | changing event
    |                   |<---------------------+   | (200G)
    |                   |                      |<--+
    |                   |query cfg (timer task)|
    |                   +--------------------->|
    |                   |     return 200G      |
    |                   |<---------------------+
    |                   |                      |
    v                   v                      v

This patch save new speed if hw change speed successfully, which will be
used after reset successfully.

Fixes: 2d03eacc0b7e ("net: hns3: Only update mac configuation when necessary")
Signed-off-by: Peiyang Wang <wangpeiyang1@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 125e044..465f0d5 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2653,8 +2653,17 @@ static int hclge_cfg_mac_speed_dup_h(struct hnae3_handle *handle, int speed,
 {
        struct hclge_vport *vport = hclge_get_vport(handle);
        struct hclge_dev *hdev = vport->back;
+       int ret;
+
+       ret = hclge_cfg_mac_speed_dup(hdev, speed, duplex, lane_num);
 
-       return hclge_cfg_mac_speed_dup(hdev, speed, duplex, lane_num);
+       if (ret)
+               return ret;
+
+       hdev->hw.mac.req_speed = speed;
+       hdev->hw.mac.req_duplex = duplex;
+
+       return 0;
 }
 
 static int hclge_set_autoneg_en(struct hclge_dev *hdev, bool enable)
@@ -2956,17 +2965,20 @@ static int hclge_mac_init(struct hclge_dev *hdev)
        if (!test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))
                hdev->hw.mac.duplex = HCLGE_MAC_FULL;
 
-       ret = hclge_cfg_mac_speed_dup_hw(hdev, hdev->hw.mac.speed,
-                                        hdev->hw.mac.duplex, hdev->hw.mac.lane_num);
-       if (ret)
-               return ret;
-
        if (hdev->hw.mac.support_autoneg) {
                ret = hclge_set_autoneg_en(hdev, hdev->hw.mac.autoneg);
                if (ret)
                        return ret;
        }
 
+       if (!hdev->hw.mac.autoneg) {
+               ret = hclge_cfg_mac_speed_dup_hw(hdev, hdev->hw.mac.req_speed,
+                                                hdev->hw.mac.req_duplex,
+                                                hdev->hw.mac.lane_num);
+               if (ret)
+                       return ret;
+       }
+
        mac->link = 0;
 
        if (mac->user_fec_mode & BIT(HNAE3_FEC_USER_DEF)) {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
index 85fb11d..8007965 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c
@@ -191,6 +191,9 @@ static void hclge_mac_adjust_link(struct net_device *netdev)
        if (ret)
                netdev_err(netdev, "failed to adjust link.\n");
 
+       hdev->hw.mac.req_speed = (u32)speed;
+       hdev->hw.mac.req_duplex = (u8)duplex;
+
        ret = hclge_cfg_flowctrl(hdev);
        if (ret)
                netdev_err(netdev, "failed to configure flow control.\n");