Drop net-hns3-fix-misuse-vf-id-and-vport-id-in-some-logs.patch from 5.10

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/net-hns3-fix-misuse-vf-id-and-vport-id-in-some-logs.patch b/queue-5.10/net-hns3-fix-misuse-vf-id-and-vport-id-in-some-logs.patch
deleted file mode 100644 (file)
index 33bcdc9..0000000
--- a/queue-5.10/net-hns3-fix-misuse-vf-id-and-vport-id-in-some-logs.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 843ecf796fbf62361c849df9c7a55bab98dd490e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 15 Sep 2021 21:52:08 +0800
-Subject: net: hns3: fix misuse vf id and vport id in some logs
-
-From: Jiaran Zhang <zhangjiaran@huawei.com>
-
-[ Upstream commit 311c0aaa9b4bb8dc65f22634e15963316b17c921 ]
-
-vport_id include PF and VFs, vport_id = 0 means PF, other values mean VFs.
-So the actual vf id is equal to vport_id minus 1.
-
-Some VF print logs are actually vport, and logs of vf id actually use
-vport id, so this patch fixes them.
-
-Fixes: ac887be5b0fe ("net: hns3: change print level of RAS error log from warning to error")
-Fixes: adcf738b804b ("net: hns3: cleanup some print format warning")
-Signed-off-by: Jiaran Zhang <zhangjiaran@huawei.com>
-Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c |  8 ++++----
- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c    | 10 ++++++----
- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c |  2 +-
- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c  |  2 +-
- 4 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
-index 3226ca176155..b7fb4f49bc3f 100644
---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
-+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
-@@ -1742,12 +1742,12 @@ static void hclge_handle_over_8bd_err(struct hclge_dev *hdev,
-               return;
-       }
- 
--      dev_err(dev, "PPU_PF_ABNORMAL_INT_ST over_8bd_no_fe found, vf_id(%u), queue_id(%u)\n",
-+      dev_err(dev, "PPU_PF_ABNORMAL_INT_ST over_8bd_no_fe found, vport(%u), queue_id(%u)\n",
-               vf_id, q_id);
- 
-       if (vf_id) {
-               if (vf_id >= hdev->num_alloc_vport) {
--                      dev_err(dev, "invalid vf id(%u)\n", vf_id);
-+                      dev_err(dev, "invalid vport(%u)\n", vf_id);
-                       return;
-               }
- 
-@@ -1760,8 +1760,8 @@ static void hclge_handle_over_8bd_err(struct hclge_dev *hdev,
- 
-               ret = hclge_inform_reset_assert_to_vf(&hdev->vport[vf_id]);
-               if (ret)
--                      dev_err(dev, "inform reset to vf(%u) failed %d!\n",
--                              hdev->vport->vport_id, ret);
-+                      dev_err(dev, "inform reset to vport(%u) failed %d!\n",
-+                              vf_id, ret);
-       } else {
-               set_bit(HNAE3_FUNC_RESET, reset_requests);
-       }
-diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
-index 24357e907155..a00d71ad82b1 100644
---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
-+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
-@@ -3418,7 +3418,8 @@ static int hclge_set_all_vf_rst(struct hclge_dev *hdev, bool reset)
-               if (ret) {
-                       dev_err(&hdev->pdev->dev,
-                               "set vf(%u) rst failed %d!\n",
--                              vport->vport_id, ret);
-+                              vport->vport_id - HCLGE_VF_VPORT_START_NUM,
-+                              ret);
-                       return ret;
-               }
- 
-@@ -3433,7 +3434,8 @@ static int hclge_set_all_vf_rst(struct hclge_dev *hdev, bool reset)
-               if (ret)
-                       dev_warn(&hdev->pdev->dev,
-                                "inform reset to vf(%u) failed %d!\n",
--                               vport->vport_id, ret);
-+                               vport->vport_id - HCLGE_VF_VPORT_START_NUM,
-+                               ret);
-       }
- 
-       return 0;
-@@ -10043,11 +10045,11 @@ static void hclge_clear_resetting_state(struct hclge_dev *hdev)
-               struct hclge_vport *vport = &hdev->vport[i];
-               int ret;
- 
--               /* Send cmd to clear VF's FUNC_RST_ING */
-+               /* Send cmd to clear vport's FUNC_RST_ING */
-               ret = hclge_set_vf_rst(hdev, vport->vport_id, false);
-               if (ret)
-                       dev_warn(&hdev->pdev->dev,
--                               "clear vf(%u) rst failed %d!\n",
-+                               "clear vport(%u) rst failed %d!\n",
-                                vport->vport_id, ret);
-       }
- }
-diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
-index ff9d84a7147f..8c528ea33406 100644
---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
-+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
-@@ -557,7 +557,7 @@ static int hclge_reset_vf(struct hclge_vport *vport)
-       struct hclge_dev *hdev = vport->back;
- 
-       dev_warn(&hdev->pdev->dev, "PF received VF reset request from VF %u!",
--               vport->vport_id);
-+               vport->vport_id - HCLGE_VF_VPORT_START_NUM);
- 
-       return hclge_func_reset_cmd(hdev, vport->vport_id);
- }
-diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
-index e8495f58a1a8..801ba349498f 100644
---- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
-+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c
-@@ -546,7 +546,7 @@ int hclge_tm_qs_shaper_cfg(struct hclge_vport *vport, int max_tx_rate)
-               ret = hclge_cmd_send(&hdev->hw, &desc, 1);
-               if (ret) {
-                       dev_err(&hdev->pdev->dev,
--                              "vf%u, qs%u failed to set tx_rate:%d, ret=%d\n",
-+                              "vport%u, qs%u failed to set tx_rate:%d, ret=%d\n",
-                               vport->vport_id, shap_cfg_cmd->qs_id,
-                               max_tx_rate, ret);
-                       return ret;
--- 
-2.33.0
-