From: Weihang Li Date: Thu, 20 Jun 2019 08:52:45 +0000 (+0800) Subject: net: hns3: add exception handling when enable NIC HW error interrupts X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bcf643c51434e1f7930e3b951a406eb63c4c71f6;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index b0a99c30a384..b25365c343d1 100644 --- 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);