net: hns3: Fix for CMDQ and Misc. interrupt init order problem
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>
This commit is contained in:
parent
7bb572fddd
commit
eddf04626d
@ -1634,6 +1634,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",
|
||||
@ -1641,10 +1645,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);
|
||||
@ -1692,10 +1692,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:
|
||||
@ -1705,9 +1705,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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user