Commit b69c5b58 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'octeontx2-ptp-bugs' 



Subbaraya Sundeep says:

====================
octeontx2: Fix PTP bugs

This patchset addresses two problems found when using
ptp.
Patch 1 - Increases the refcount of ptp device before use
which was missing and it lead to refcount increment after use
bug when module is loaded and unloaded couple of times.
Patch 2 - PTP resources allocated by VF are not being freed
during VF teardown. This patch fixes that.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fff63521 eabd0f88

drivers/net/ethernet/marvell/octeontx2/af/ptp.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ struct ptp *ptp_get(void) 
	/* Check driver is bound to PTP block */

	if (!ptp)

		ptp = ERR_PTR(-EPROBE_DEFER);

	else

		pci_dev_get(ptp->pdev);



	return ptp;

}

drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c

+4 −1
Original line number Diff line number Diff line
@@ -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))