net: hns3: add error handler for hclgevf_reset()

Since hclgevf_reset() may fail for some reasons, so it needs an error
handler to deal with it. When VF reset failed, VF can only be restored
by a higher level reset asserted by PF. So, it needs to reinitialize
its command queue, then it can respond to higher level reset.

Also, this patch adds error logging in the hclgevf_notify_client().

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/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 5da9053ebf4bd0f50b03a493b65d482f711ea94a..4dfac6c0cecebe89a0ce267e103a1ec0b24e6eb3 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -1086,11 +1086,17 @@ static int hclgevf_notify_client(struct hclgevf_dev *hdev,
 {
        struct hnae3_client *client = hdev->nic_client;
        struct hnae3_handle *handle = &hdev->nic;
+       int ret;
 
        if (!client->ops->reset_notify)
                return -EOPNOTSUPP;
 
-       return client->ops->reset_notify(handle, type);
+       ret = client->ops->reset_notify(handle, type);
+       if (ret)
+               dev_err(&hdev->pdev->dev, "notify nic client failed %d(%d)\n",
+                       type, ret);
+
+       return ret;
 }
 
 static int hclgevf_reset_wait(struct hclgevf_dev *hdev)
@@ -1133,7 +1139,9 @@ static int hclgevf_reset_stack(struct hclgevf_dev *hdev)
        int ret;
 
        /* uninitialize the nic client */
-       hclgevf_notify_client(hdev, HNAE3_UNINIT_CLIENT);
+       ret = hclgevf_notify_client(hdev, HNAE3_UNINIT_CLIENT);
+       if (ret)
+               return ret;
 
        /* re-initialize the hclge device */
        ret = hclgevf_reset_hdev(hdev);
@@ -1144,7 +1152,9 @@ static int hclgevf_reset_stack(struct hclgevf_dev *hdev)
        }
 
        /* bring up the nic client again */
-       hclgevf_notify_client(hdev, HNAE3_INIT_CLIENT);
+       ret = hclgevf_notify_client(hdev, HNAE3_INIT_CLIENT);
+       if (ret)
+               return ret;
 
        return 0;
 }
@@ -1183,11 +1193,15 @@ static int hclgevf_reset(struct hclgevf_dev *hdev)
        rtnl_lock();
 
        /* bring down the nic to stop any ongoing TX/RX */
-       hclgevf_notify_client(hdev, HNAE3_DOWN_CLIENT);
+       ret = hclgevf_notify_client(hdev, HNAE3_DOWN_CLIENT);
+       if (ret)
+               goto err_reset_lock;
 
        rtnl_unlock();
 
-       hclgevf_reset_prepare_wait(hdev);
+       ret = hclgevf_reset_prepare_wait(hdev);
+       if (ret)
+               goto err_reset;
 
        /* check if VF could successfully fetch the hardware reset completion
         * status from the hardware
@@ -1198,27 +1212,36 @@ static int hclgevf_reset(struct hclgevf_dev *hdev)
                dev_err(&hdev->pdev->dev,
                        "VF failed(=%d) to fetch H/W reset completion status\n",
                        ret);
-
-               dev_warn(&hdev->pdev->dev, "VF reset failed, disabling VF!\n");
-               rtnl_lock();
-               hclgevf_notify_client(hdev, HNAE3_UNINIT_CLIENT);
-
-               rtnl_unlock();
-               return ret;
+               goto err_reset;
        }
 
        rtnl_lock();
 
        /* now, re-initialize the nic client and ae device*/
        ret = hclgevf_reset_stack(hdev);
-       if (ret)
+       if (ret) {
                dev_err(&hdev->pdev->dev, "failed to reset VF stack\n");
+               goto err_reset_lock;
+       }
 
        /* bring up the nic to enable TX/RX again */
-       hclgevf_notify_client(hdev, HNAE3_UP_CLIENT);
+       ret = hclgevf_notify_client(hdev, HNAE3_UP_CLIENT);
+       if (ret)
+               goto err_reset_lock;
 
        rtnl_unlock();
 
+       return ret;
+err_reset_lock:
+       rtnl_unlock();
+err_reset:
+       /* When VF reset failed, only the higher level reset asserted by PF
+        * can restore it, so re-initialize the command queue to receive
+        * this higher reset event.
+        */
+       hclgevf_cmd_init(hdev);
+       dev_err(&hdev->pdev->dev, "failed to reset VF\n");
+
        return ret;
 }