net: hns3: Add PCIe AER error recovery

[muen/linux.git] / drivers / net / ethernet / hisilicon / hns3 / hns3pf / hclge_main.c

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 94d36787b4c9543e5c7ed3895dea37fac92005ca..50753658b8d7327eaa5212aac5b1ead825a4aa74 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2489,12 +2489,18 @@ static void hclge_reset(struct hclge_dev *hdev)
        ae_dev->reset_type = HNAE3_NONE_RESET;
 }
 
-static void hclge_reset_event(struct hnae3_handle *handle)
+static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle)
 {
-       struct hclge_vport *vport = hclge_get_vport(handle);
-       struct hclge_dev *hdev = vport->back;
+       struct hnae3_ae_dev *ae_dev = pci_get_drvdata(pdev);
+       struct hclge_dev *hdev = ae_dev->priv;
 
-       /* check if this is a new reset request and we are not here just because
+       /* We might end up getting called broadly because of 2 below cases:
+        * 1. Recoverable error was conveyed through APEI and only way to bring
+        *    normalcy is to reset.
+        * 2. A new reset request from the stack due to timeout
+        *
+        * For the first case,error event might not have ae handle available.
+        * check if this is a new reset request and we are not here just because
         * last reset attempt did not succeed and watchdog hit us again. We will
         * know this if last reset request did not occur very recently (watchdog
         * timer = 5*HZ, let us check after sufficiently large time, say 4*5*Hz)
@@ -2503,6 +2509,9 @@ static void hclge_reset_event(struct hnae3_handle *handle)
         * want to make sure we throttle the reset request. Therefore, we will
         * not allow it again before 3*HZ times.
         */
+       if (!handle)
+               handle = &hdev->vport[0].nic;
+
        if (time_before(jiffies, (handle->last_reset_time + 3 * HZ)))
                return;
        else if (time_after(jiffies, (handle->last_reset_time + 4 * 5 * HZ)))