Unverified Commit bd4d9615 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10918 【OLK 6.6】net: hns3: use the user's cfg after reset 

Merge Pull Request from: @chen-hao418 
 
 maillist inclusion
    category: bugfix
    bugzilla: https://gitee.com/openeuler/kernel/issues/IAKGBX
    CVE: NA

    Reference: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/commit/?id=30545e17eac1f50c5ef49644daf6af205100a965 
 
Link:https://gitee.com/openeuler/kernel/pulls/10918

 

Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 130fc493 f6c0b921

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+18 −6
Original line number Diff line number Diff line
@@ -2696,8 +2696,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);



	if (ret)

		return ret;



	hdev->hw.mac.req_speed = speed;

	hdev->hw.mac.req_duplex = duplex;



	return hclge_cfg_mac_speed_dup(hdev, speed, duplex, lane_num);

	return 0;

}



static int hclge_set_autoneg_en(struct hclge_dev *hdev, bool enable)
@@ -3015,13 +3024,16 @@ 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 (hdev->hw.mac.support_autoneg) {

		ret = hclge_set_autoneg_en(hdev, hdev->hw.mac.autoneg);

		if (ret)

			return ret;

	}



	if (hdev->hw.mac.support_autoneg) {

		ret = hclge_set_autoneg_en(hdev, hdev->hw.mac.autoneg);

	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;

	}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c

+3 −0
Original line number Diff line number Diff line
@@ -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");