net: hns3: Fix for CMDQ and Misc. interrupt init order problem

[ Upstream commit eddf04626d1d6d0bcd01ac6a287e49f5ddb90a26 ]

When vf module is loading, the cmd queue initialization should
happen before misc interrupt initialization, otherwise the misc
interrupt handle will cause using uninitialized cmd queue problem.
There is also the same issue when vf module is unloading.

This patch fixes it by adjusting the location of some function.

Fixes: e2cb1dec9779 ("net: hns3: Add HNS3 VF HCL(Hardware Compatibility Layer) Support")
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 374177cf793561e9f875441ea24cc4f2738eaee2..7a6510314657434f19d2daaf642265851236274d 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -1631,6 +1631,10 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev)
 
        hclgevf_state_init(hdev);
 
+       ret = hclgevf_cmd_init(hdev);
+       if (ret)
+               goto err_cmd_init;
+
        ret = hclgevf_misc_irq_init(hdev);
        if (ret) {
                dev_err(&pdev->dev, "failed(%d) to init Misc IRQ(vector0)\n",
@@ -1638,10 +1642,6 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev)
                goto err_misc_irq_init;
        }
 
-       ret = hclgevf_cmd_init(hdev);
-       if (ret)
-               goto err_cmd_init;
-
        ret = hclgevf_configure(hdev);
        if (ret) {
                dev_err(&pdev->dev, "failed(%d) to fetch configuration\n", ret);
@@ -1689,10 +1689,10 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev)
        return 0;
 
 err_config:
-       hclgevf_cmd_uninit(hdev);
-err_cmd_init:
        hclgevf_misc_irq_uninit(hdev);
 err_misc_irq_init:
+       hclgevf_cmd_uninit(hdev);
+err_cmd_init:
        hclgevf_state_uninit(hdev);
        hclgevf_uninit_msi(hdev);
 err_irq_init:
@@ -1702,9 +1702,9 @@ err_irq_init:
 
 static void hclgevf_uninit_hdev(struct hclgevf_dev *hdev)
 {
-       hclgevf_cmd_uninit(hdev);
-       hclgevf_misc_irq_uninit(hdev);
        hclgevf_state_uninit(hdev);
+       hclgevf_misc_irq_uninit(hdev);
+       hclgevf_cmd_uninit(hdev);
        hclgevf_uninit_msi(hdev);
        hclgevf_pci_uninit(hdev);
 }