net: hns3: fixes wrong place enabling ROCE HW error when loading
authorHuazhong Tan <tanhuazhong@huawei.com>
Thu, 20 Jun 2019 08:52:44 +0000 (16:52 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Jun 2019 15:59:02 +0000 (11:59 -0400)
The ROCE HW errors should only be enabled when initializing ROCE's
client, the current code enable it no matter initializing NIC or
ROCE client.

So this patch fixes it.

Fixes: 00ea6e5fda9d ("net: hns3: delay and separate enabling of NIC and ROCE HW errors")
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

index 53dbef9..b0a99c3 100644 (file)
@@ -8349,6 +8349,14 @@ static int hclge_init_roce_client_instance(struct hnae3_ae_dev *ae_dev,
                goto init_roce_err;
        }
 
+       /* Enable roce ras interrupts */
+       ret = hclge_config_rocee_ras_interrupt(hdev, true);
+       if (ret) {
+               dev_err(&ae_dev->pdev->dev,
+                       "fail(%d) to enable roce ras interrupts\n", ret);
+               goto init_roce_err;
+       }
+
        hnae3_set_client_init_flag(client, ae_dev, 1);
 
        return 0;
@@ -8403,12 +8411,6 @@ static int hclge_init_client_instance(struct hnae3_client *client,
                }
        }
 
-       /* Enable roce ras interrupts */
-       ret = hclge_config_rocee_ras_interrupt(hdev, true);
-       if (ret)
-               dev_err(&ae_dev->pdev->dev,
-                       "fail(%d) to enable roce ras interrupts\n", ret);
-
        return ret;
 
 clear_nic: