提交 b2d3f011 编写于 作者: J Jie Wang 提交者: Jiantao Xiao

net: hns3: refactor hclge_mac_link_status_wait for interface reuse

driver inclusion
category: cleanup
bugzilla: https://gitee.com/openeuler/kernel/issues/I7D6IP
CVE: NA

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

Some nic configurations could only be performed after link is down. So this
patch refactor this API for reuse.
Signed-off-by: NJie Wang <wangjie125@huawei.com>
上级 d3f6c764
...@@ -73,6 +73,8 @@ static void hclge_restore_hw_table(struct hclge_dev *hdev); ...@@ -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_promisc_mode(struct hclge_dev *hdev);
static void hclge_sync_fd_table(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 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; static struct hnae3_ae_algo ae_algo;
...@@ -8086,10 +8088,9 @@ static void hclge_phy_link_status_wait(struct hclge_dev *hdev, ...@@ -8086,10 +8088,9 @@ static void hclge_phy_link_status_wait(struct hclge_dev *hdev,
} while (++i < HCLGE_PHY_LINK_STATUS_NUM); } 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 link_status;
int i = 0; int i = 0;
int ret; int ret;
...@@ -8102,13 +8103,15 @@ static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret) ...@@ -8102,13 +8103,15 @@ static int hclge_mac_link_status_wait(struct hclge_dev *hdev, int link_ret)
return 0; return 0;
msleep(HCLGE_LINK_STATUS_MS); msleep(HCLGE_LINK_STATUS_MS);
} while (++i < HCLGE_MAC_LINK_STATUS_NUM); } while (++i < wait_cnt);
return -EBUSY; return -EBUSY;
} }
static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en, static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en,
bool is_phy) bool is_phy)
{ {
#define HCLGE_MAC_LINK_STATUS_NUM 100
int link_ret; int link_ret;
link_ret = en ? HCLGE_LINK_STATUS_UP : HCLGE_LINK_STATUS_DOWN; link_ret = en ? HCLGE_LINK_STATUS_UP : HCLGE_LINK_STATUS_DOWN;
...@@ -8116,7 +8119,8 @@ static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en, ...@@ -8116,7 +8119,8 @@ static int hclge_mac_phy_link_status_wait(struct hclge_dev *hdev, bool en,
if (is_phy) if (is_phy)
hclge_phy_link_status_wait(hdev, link_ret); 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) static int hclge_set_app_loopback(struct hclge_dev *hdev, bool en)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册