Commit 7049d4a3 authored by Jie Wang's avatar Jie Wang Committed by Jiantao Xiao
Browse files

net: hns3: refactor hclge_mac_link_status_wait for interface reuse 

mainline inclusion
from mainline-v6.5-rc6
commit 08469dac
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I7WQZ1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=08469dacfad25428b66549716811807203744f4f



----------------------------------------------------------------------

Some nic configurations could only be performed after link is down. So this
patch refactor this API for reuse.

Signed-off-by: default avatarJie Wang <wangjie125@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230807113452.474224-3-shaojijie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent 2d973d2a

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

+9 −5
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ static void hclge_restore_hw_table(struct hclge_dev *hdev); 
static void hclge_sync_promisc_mode(struct hclge_dev *hdev);

static void hclge_sync_fd_table(struct hclge_dev *hdev);

static void hclge_reset_end(struct hnae3_handle *handle, bool done);

static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret,

				      int wait_cnt);



static struct hnae3_ae_algo ae_algo;
@@ -8077,10 +8079,9 @@ static void hclge_phy_link_status_wait(struct hclge_dev *hdev, 
	} while (++i < HCLGE_PHY_LINK_STATUS_NUM);

}



static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret)

static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret,

				      int wait_cnt)

{

#define HCLGE_MAC_LINK_STATUS_NUM  100



	int link_status;

	int i = 0;

	int ret;
@@ -8093,13 +8094,15 @@ static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret) 
			return 0;



		msleep(HCLGE_LINK_STATUS_MS);

	} while (++i < HCLGE_MAC_LINK_STATUS_NUM);

	} while (++i < wait_cnt);

	return -EBUSY;

}



static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en,

					  bool is_phy)

{

#define HCLGE_MAC_LINK_STATUS_NUM  100



	int link_ret;



	link_ret = en ? HCLGE_LINK_STATUS_UP : HCLGE_LINK_STATUS_DOWN;
@@ -8107,7 +8110,8 @@ static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en, 
	if (is_phy)

		hclge_phy_link_status_wait(hdev, link_ret);



	return hclge_mac_link_status_wait(hdev, link_ret);

	return hclge_mac_link_status_wait(hdev, link_ret,

					  HCLGE_MAC_LINK_STATUS_NUM);

}



static int hclge_set_app_loopback(struct hclge_dev *hdev, bool en)