|
@@ -240,7 +240,6 @@ static int nfp_pcie_sriov_read_nfd_limit(struct nfp_pf *pf)
|
|
return pci_sriov_set_totalvfs(pf->pdev, pf->limit_vfs);
|
|
return pci_sriov_set_totalvfs(pf->pdev, pf->limit_vfs);
|
|
|
|
|
|
pf->limit_vfs = ~0;
|
|
pf->limit_vfs = ~0;
|
|
- pci_sriov_set_totalvfs(pf->pdev, 0); /* 0 is unset */
|
|
|
|
/* Allow any setting for backwards compatibility if symbol not found */
|
|
/* Allow any setting for backwards compatibility if symbol not found */
|
|
if (err == -ENOENT)
|
|
if (err == -ENOENT)
|
|
return 0;
|
|
return 0;
|
|
@@ -668,7 +667,7 @@ static int nfp_pci_probe(struct pci_dev *pdev,
|
|
|
|
|
|
err = nfp_net_pci_probe(pf);
|
|
err = nfp_net_pci_probe(pf);
|
|
if (err)
|
|
if (err)
|
|
- goto err_sriov_unlimit;
|
|
|
|
|
|
+ goto err_fw_unload;
|
|
|
|
|
|
err = nfp_hwmon_register(pf);
|
|
err = nfp_hwmon_register(pf);
|
|
if (err) {
|
|
if (err) {
|
|
@@ -680,8 +679,6 @@ static int nfp_pci_probe(struct pci_dev *pdev,
|
|
|
|
|
|
err_net_remove:
|
|
err_net_remove:
|
|
nfp_net_pci_remove(pf);
|
|
nfp_net_pci_remove(pf);
|
|
-err_sriov_unlimit:
|
|
|
|
- pci_sriov_set_totalvfs(pf->pdev, 0);
|
|
|
|
err_fw_unload:
|
|
err_fw_unload:
|
|
kfree(pf->rtbl);
|
|
kfree(pf->rtbl);
|
|
nfp_mip_close(pf->mip);
|
|
nfp_mip_close(pf->mip);
|
|
@@ -715,7 +712,6 @@ static void nfp_pci_remove(struct pci_dev *pdev)
|
|
nfp_hwmon_unregister(pf);
|
|
nfp_hwmon_unregister(pf);
|
|
|
|
|
|
nfp_pcie_sriov_disable(pdev);
|
|
nfp_pcie_sriov_disable(pdev);
|
|
- pci_sriov_set_totalvfs(pf->pdev, 0);
|
|
|
|
|
|
|
|
nfp_net_pci_remove(pf);
|
|
nfp_net_pci_remove(pf);
|
|
|
|
|