]> git.baikalelectronics.ru Git - kernel.git/commitdiff
octeontx2-nicvf: Free VF PTP resources.
authorRakesh Babu Saladi <rsaladi2@marvell.com>
Fri, 7 Jan 2022 06:30:30 +0000 (12:00 +0530)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Jan 2022 14:04:19 +0000 (14:04 +0000)
When a VF is removed respective PTP resources are not
being freed currently. This patch fixes it.

Fixes: b43d73887cd8 ("octeontx2-nicvf: Add PTP hardware clock support to NIX VF")
Signed-off-by: Rakesh Babu Saladi <rsaladi2@marvell.com>
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c

index 78944ad3492ff0a6cc698883826fab1e3488686f..d75f3a78fabf15b06ccbb3d7a44bcf4eeafc6718 100644 (file)
@@ -684,7 +684,7 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        err = register_netdev(netdev);
        if (err) {
                dev_err(dev, "Failed to register netdevice\n");
-               goto err_detach_rsrc;
+               goto err_ptp_destroy;
        }
 
        err = otx2_wq_init(vf);
@@ -709,6 +709,8 @@ static int otx2vf_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 err_unreg_netdev:
        unregister_netdev(netdev);
+err_ptp_destroy:
+       otx2_ptp_destroy(vf);
 err_detach_rsrc:
        if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))
                qmem_free(vf->dev, vf->dync_lmt);
@@ -742,6 +744,7 @@ static void otx2vf_remove(struct pci_dev *pdev)
        unregister_netdev(netdev);
        if (vf->otx2_wq)
                destroy_workqueue(vf->otx2_wq);
+       otx2_ptp_destroy(vf);
        otx2vf_disable_mbox_intr(vf);
        otx2_detach_resources(&vf->mbox);
        if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))