net: hns3: add exception handling when enable NIC HW error interrupts

If we failed to enable NIC HW error interrupts during client
initialization in some cases, we should do exception handling to clear
flags and free the resources.

Fixes: 00ea6e5fda9d ("net: hns3: delay and separate enabling of NIC and ROCE HW errors")
Signed-off-by: Weihang Li <liweihang@hisilicon.com>
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/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index b0a99c30a384357e5a5621ee1fba2d4657ed1acb..b25365c343d10832d3a99c7d6603a31b1c9cdfbb 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -8297,13 +8297,15 @@ static int hclge_init_nic_client_instance(struct hnae3_ae_dev *ae_dev,
                goto init_nic_err;
        }
 
-       hnae3_set_client_init_flag(client, ae_dev, 1);
-
        /* Enable nic hw error interrupts */
        ret = hclge_config_nic_hw_error(hdev, true);
-       if (ret)
+       if (ret) {
                dev_err(&ae_dev->pdev->dev,
                        "fail(%d) to enable hw error interrupts\n", ret);
+               goto init_nic_err;
+       }
+
+       hnae3_set_client_init_flag(client, ae_dev, 1);
 
        if (netif_msg_drv(&hdev->vport->nic))
                hclge_info_show(hdev);