net: hns3: fix delete tc fail issue

When the tc is removed during reset, hns3 driver will return a errcode.
But kernel ignores this errcode, As a result,
the driver status is inconsistent with the kernel status.

This patch retains the deletion status when the deletion fails
and continues to delete after the reset to ensure that
the status of the driver is consistent with that of kernel.

Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index a72caaf05475f2259cc093ab8ac19581190bd51b..f19f1e1d1f9f036005e59ea3ceea722b7d870fa0 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -820,6 +820,7 @@ struct hnae3_tc_info {
        u8 max_tc; /* Total number of TCs */
        u8 num_tc; /* Total number of enabled TCs */
        bool mqprio_active;
+       bool mqprio_destroy;
        bool dcb_ets_active;
 };
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
index b98301e205f7fff69b21f36a96e93ec358a371c1..eabbacb1c714087a53d0381514b140e802c409b8 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c
@@ -619,6 +619,8 @@ static int hclge_setup_tc(struct hnae3_handle *h,
                return ret;
        }
 
+       kinfo->tc_info.mqprio_destroy = !tc;
+
        ret = hclge_notify_down_uinit(hdev);
        if (ret)
                return ret;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 16860eea980007c10a5c197db596c671cf96fad3..349e4a1946ab0462c68348c0f3e5918a93662814 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -12105,6 +12105,8 @@ static int hclge_reset_ae_dev(struct hnae3_ae_dev *ae_dev)
                return ret;
        }
 
+       hclge_reset_tc_config(hdev);
+
        ret = hclge_tm_init_hw(hdev, true);
        if (ret) {
                dev_err(&pdev->dev, "tm init hw fail, ret =%d\n", ret);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
index c58c3122176289cb0991e45e823f74ad3bf83e3a..00c3f2548bf6bf6ad4c203803d7fced15b8dee0a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
@@ -2143,3 +2143,19 @@ int hclge_tm_flush_cfg(struct hclge_dev *hdev, bool enable)
 
        return ret;
 }
+
+void hclge_reset_tc_config(struct hclge_dev *hdev)
+{
+       struct hclge_vport *vport = &hdev->vport[0];
+       struct hnae3_knic_private_info *kinfo;
+
+       kinfo = &vport->nic.kinfo;
+
+       if (!kinfo->tc_info.mqprio_destroy)
+               return;
+
+       /* clear tc info, including mqprio_destroy and mqprio_active */
+       memset(&kinfo->tc_info, 0, sizeof(kinfo->tc_info));
+       hclge_tm_schd_info_update(hdev, 0);
+       hclge_comm_rss_indir_init_cfg(hdev->ae_dev, &hdev->rss_cfg);
+}

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
index 53eec6df5194682da957a0a2f57a161df87fc953..0985916629d3bf679da1abe025c284920cea0c3a 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h
@@ -277,4 +277,5 @@ int hclge_tm_get_port_shaper(struct hclge_dev *hdev,
 int hclge_up_to_tc_map(struct hclge_dev *hdev);
 int hclge_dscp_to_tc_map(struct hclge_dev *hdev);
 int hclge_tm_flush_cfg(struct hclge_dev *hdev, bool enable);
+void hclge_reset_tc_config(struct hclge_dev *hdev);
 #endif