]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: hns3: fix port duplex configure error in IMP reset
authorJie Wang <wangjie125@huawei.com>
Thu, 7 Mar 2024 01:01:14 +0000 (09:01 +0800)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:16:56 +0000 (18:16 -0400)
[ Upstream commit 11d80f79dd9f871a52feba4bf24b5ac39f448eb7 ]

Currently, the mac port is fixed to configured as full dplex mode in
hclge_mac_init() when driver initialization or reset restore. Users may
change the mode to half duplex with ethtool,  so it may cause the user
configuration dropped after reset.

To fix it, don't change the duplex mode when resetting.

Fixes: 2d03eacc0b7e ("net: hns3: Only update mac configuation when necessary")
Signed-off-by: Jie Wang <wangjie125@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index 5ea9e59569effbb56ea5e198eb80cd782c1f7a28..609d3799d77389e973be08e86cebae77d5fff02a 100644 (file)
@@ -2890,7 +2890,10 @@ static int hclge_mac_init(struct hclge_dev *hdev)
        int ret;
 
        hdev->support_sfp_query = true;
-       hdev->hw.mac.duplex = HCLGE_MAC_FULL;
+
+       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)