Commit a521c8a0 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Move bnxt_ptp_init() from bnxt_open() back to bnxt_init_one() 



It was pointed out by Richard Cochran that registering the PHC during
probe is better than during ifup, so move bnxt_ptp_init() back to
bnxt_init_one().  In order to work correctly after firmware reset which
may result in PTP config. changes, we modify bnxt_ptp_init() to return
if the PHC has been registered earlier.  If PTP is no longer supported
by the new firmware, we will unregister the PHC and clean up.

This partially reverts:

d7859afb ("bnxt_en: Move bnxt_ptp_init() to bnxt_open()")

Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63caca1e

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+9 −9
Original line number Diff line number Diff line
@@ -7495,9 +7495,14 @@ static int __bnxt_hwrm_ptp_qcfg(struct bnxt *bp) 
		rc = -ENODEV;

		goto no_ptp;

	}

	rc = bnxt_ptp_init(bp);

	if (!rc)

		return 0;



	netdev_warn(bp->dev, "PTP initialization failed.\n");



no_ptp:

	bnxt_ptp_clear(bp);

	kfree(ptp);

	bp->ptp_cfg = NULL;

	return rc;
@@ -7577,6 +7582,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) 
		if (flags & FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED) {

			__bnxt_hwrm_ptp_qcfg(bp);

		} else {

			bnxt_ptp_clear(bp);

			kfree(bp->ptp_cfg);

			bp->ptp_cfg = NULL;

		}
@@ -10277,15 +10283,9 @@ static int bnxt_open(struct net_device *dev) 
	if (rc)

		return rc;



	if (bnxt_ptp_init(bp)) {

		netdev_warn(dev, "PTP initialization failed.\n");

		kfree(bp->ptp_cfg);

		bp->ptp_cfg = NULL;

	}

	rc = __bnxt_open_nic(bp, true, true);

	if (rc) {

		bnxt_hwrm_if_change(bp, false);

		bnxt_ptp_clear(bp);

	} else {

		if (test_and_clear_bit(BNXT_STATE_FW_RESET_DET, &bp->state)) {

			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state)) {
@@ -10376,7 +10376,6 @@ static int bnxt_close(struct net_device *dev) 
{

	struct bnxt *bp = netdev_priv(dev);



	bnxt_ptp_clear(bp);

	bnxt_hwmon_close(bp);

	bnxt_close_nic(bp, true, true);

	bnxt_hwrm_shutdown_link(bp);
@@ -11363,7 +11362,6 @@ static void bnxt_fw_reset_close(struct bnxt *bp) 
		bnxt_clear_int_mode(bp);

		pci_disable_device(bp->pdev);

	}

	bnxt_ptp_clear(bp);

	__bnxt_close_nic(bp, true, false);

	bnxt_vf_reps_free(bp);

	bnxt_clear_int_mode(bp);
@@ -12706,6 +12704,7 @@ static void bnxt_remove_one(struct pci_dev *pdev) 
	if (BNXT_PF(bp))

		devlink_port_type_clear(&bp->dl_port);



	bnxt_ptp_clear(bp);

	pci_disable_pcie_error_reporting(pdev);

	unregister_netdev(dev);

	clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
@@ -13318,6 +13317,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	bnxt_free_hwrm_short_cmd_req(bp);

	bnxt_free_hwrm_resources(bp);

	bnxt_ethtool_free(bp);

	bnxt_ptp_clear(bp);

	kfree(bp->ptp_cfg);

	bp->ptp_cfg = NULL;

	kfree(bp->fw_health);

drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c

+3 −0
Original line number Diff line number Diff line
@@ -414,6 +414,9 @@ int bnxt_ptp_init(struct bnxt *bp) 
	if (rc)

		return rc;



	if (ptp->ptp_clock)

		return 0;



	atomic_set(&ptp->tx_avail, BNXT_MAX_TX_TS);

	spin_lock_init(&ptp->ptp_lock);