net: hns3: change the order of reinitializing RoCE and NIC client during reset

The HNS RDMA driver will support VF device later, whose
re-initialization should be done after PF's. This patch
changes the order of hclge_reset_prepare_up() and
hclge_notify_roce_client(), so that PF's RoCE client
will be reinitialized before VF's.

Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index b796d3fb5b0bf36234ada55f5520d7988fd26258..6e1e2cf385c8da8b90b5d35280c4774c3ee56e98 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -3770,11 +3770,6 @@ static int hclge_reset_rebuild(struct hclge_dev *hdev)
 
        hclge_clear_reset_cause(hdev);
 
-       ret = hclge_reset_prepare_up(hdev);
-       if (ret)
-               return ret;
-
-
        ret = hclge_notify_roce_client(hdev, HNAE3_INIT_CLIENT);
        /* ignore RoCE notify error if it fails HCLGE_RESET_MAX_FAIL_CNT - 1
         * times
@@ -3783,6 +3778,10 @@ static int hclge_reset_rebuild(struct hclge_dev *hdev)
            hdev->rst_stats.reset_fail_cnt < HCLGE_RESET_MAX_FAIL_CNT - 1)
                return ret;
 
+       ret = hclge_reset_prepare_up(hdev);
+       if (ret)
+               return ret;
+
        rtnl_lock();
        ret = hclge_notify_client(hdev, HNAE3_UP_CLIENT);
        rtnl_unlock();