Commit 803bef81 authored by Jacob Keller's avatar Jacob Keller Committed by Paolo Abeni
Browse files

ice: factor out ice_ptp_rebuild_owner() 



The ice_ptp_reset() function uses a goto to skip past clock owner
operations if performing a PF reset or if the device is not the clock
owner. This is a bit confusing. Factor this out into
ice_ptp_rebuild_owner() instead.

The ice_ptp_reset() function is called by ice_rebuild() to restore PTP
functionality after a device reset. Follow the convention set by the
ice_main.c file and rename this function to ice_ptp_rebuild(), in the
same way that we have ice_prepare_for_reset() and
ice_ptp_prepare_for_reset().

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarKarol Kolacinski <karol.kolacinski@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 1abefdca

drivers/net/ethernet/intel/ice/ice_main.c

+1 −1
Original line number Diff line number Diff line
@@ -7548,7 +7548,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type) 
	 * fail.

	 */

	if (test_bit(ICE_FLAG_PTP_SUPPORTED, pf->flags))

		ice_ptp_reset(pf, reset_type);

		ice_ptp_rebuild(pf, reset_type);



	if (ice_is_feature_supported(pf, ICE_F_GNSS))

		ice_gnss_init(pf);

drivers/net/ethernet/intel/ice/ice_ptp.c

+38 −24
Original line number Diff line number Diff line
@@ -2665,11 +2665,13 @@ void ice_ptp_prepare_for_reset(struct ice_pf *pf, enum ice_reset_req reset_type) 
}



/**

 * ice_ptp_reset - Initialize PTP hardware clock support after reset

 * ice_ptp_rebuild_owner - Initialize PTP clock owner after reset

 * @pf: Board private structure

 * @reset_type: the reset type being performed

 *

 * Companion function for ice_ptp_rebuild() which handles tasks that only the

 * PTP clock owner instance should perform.

 */

void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type)

static int ice_ptp_rebuild_owner(struct ice_pf *pf)

{

	struct ice_ptp *ptp = &pf->ptp;

	struct ice_hw *hw = &pf->hw;
@@ -2677,32 +2679,21 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type) 
	u64 time_diff;

	int err;



	if (ptp->state == ICE_PTP_READY) {

		ice_ptp_prepare_for_reset(pf, reset_type);

	} else if (ptp->state != ICE_PTP_RESETTING) {

		err = -EINVAL;

		dev_err(ice_pf_to_dev(pf), "PTP was not initialized\n");

		goto err;

	}



	if (reset_type == ICE_RESET_PFR || !ice_pf_src_tmr_owned(pf))

		goto pfr;



	err = ice_ptp_init_phc(hw);

	if (err)

		goto err;

		return err;



	/* Acquire the global hardware lock */

	if (!ice_ptp_lock(hw)) {

		err = -EBUSY;

		goto err;

		return err;

	}



	/* Write the increment time value to PHY and LAN */

	err = ice_ptp_write_incval(hw, ice_base_incval(pf));

	if (err) {

		ice_ptp_unlock(hw);

		goto err;

		return err;

	}



	/* Write the initial Time value to PHY and LAN using the cached PHC
@@ -2718,7 +2709,7 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type) 
	err = ice_ptp_write_init(pf, &ts);

	if (err) {

		ice_ptp_unlock(hw);

		goto err;

		return err;

	}



	/* Release the global hardware lock */
@@ -2727,11 +2718,39 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type) 
	if (!ice_is_e810(hw)) {

		/* Enable quad interrupts */

		err = ice_ptp_cfg_phy_interrupt(pf, true, 1);

		if (err)

			return err;



		ice_ptp_restart_all_phy(pf);

	}



	return 0;

}



/**

 * ice_ptp_rebuild - Initialize PTP hardware clock support after reset

 * @pf: Board private structure

 * @reset_type: the reset type being performed

 */

void ice_ptp_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)

{

	struct ice_ptp *ptp = &pf->ptp;

	int err;



	if (ptp->state == ICE_PTP_READY) {

		ice_ptp_prepare_for_reset(pf, reset_type);

	} else if (ptp->state != ICE_PTP_RESETTING) {

		err = -EINVAL;

		dev_err(ice_pf_to_dev(pf), "PTP was not initialized\n");

		goto err;

	}



	if (ice_pf_src_tmr_owned(pf) && reset_type != ICE_RESET_PFR) {

		err = ice_ptp_rebuild_owner(pf);

		if (err)

			goto err;

	}



pfr:

	/* Init Tx structures */

	if (ice_is_e810(&pf->hw)) {

		err = ice_ptp_init_tx_e810(pf, &ptp->port.tx);
@@ -2746,11 +2765,6 @@ void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type) 


	ptp->state = ICE_PTP_READY;



	/* Restart the PHY timestamping block */

	if (!test_bit(ICE_PFR_REQ, pf->state) &&

	    ice_pf_src_tmr_owned(pf))

		ice_ptp_restart_all_phy(pf);



	/* Start periodic work going */

	kthread_queue_delayed_work(ptp->kworker, &ptp->work, 0);

drivers/net/ethernet/intel/ice/ice_ptp.h

+3 −3
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ enum ice_tx_tstamp_work ice_ptp_process_ts(struct ice_pf *pf); 


u64 ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc,

			const struct ice_pkt_ctx *pkt_ctx);

void ice_ptp_reset(struct ice_pf *pf, enum ice_reset_req reset_type);

void ice_ptp_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type);

void ice_ptp_prepare_for_reset(struct ice_pf *pf,

			       enum ice_reset_req reset_type);

void ice_ptp_init(struct ice_pf *pf);
@@ -358,7 +358,7 @@ ice_ptp_get_rx_hwts(const union ice_32b_rx_flex_desc *rx_desc, 
	return 0;

}



static inline void ice_ptp_reset(struct ice_pf *pf,

static inline void ice_ptp_rebuild(struct ice_pf *pf,

				   enum ice_reset_req reset_type)

{

}