>From: Jacob Keller <[email protected]> > >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.
To me at least, the wording of the title (Factor out) is kinda confusing when compared to the message itself, as if you were going to remove the ice_ptp_rebuild_owner anyway. Other than that, LGTM. > >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: Jacob Keller <[email protected]> >Signed-off-by: Karol Kolacinski <[email protected]> >Reviewed-by: Jacob Keller <[email protected]> >--- > drivers/net/ethernet/intel/ice/ice_main.c | 2 +- > drivers/net/ethernet/intel/ice/ice_ptp.c | 66 ++++++++++++++--------- > drivers/net/ethernet/intel/ice/ice_ptp.h | 5 +- > 3 files changed, 44 insertions(+), 29 deletions(-) > >diff --git a/drivers/net/ethernet/intel/ice/ice_main.c >b/drivers/net/ethernet/intel/ice/ice_main.c >index a14e8734cc27..1fa3f40743f5 100644 >--- a/drivers/net/ethernet/intel/ice/ice_main.c >+++ b/drivers/net/ethernet/intel/ice/ice_main.c >@@ -7554,7 +7554,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); >diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c >b/drivers/net/ethernet/intel/ice/ice_ptp.c >index fe2d8389627b..8a589f853e96 100644 >--- a/drivers/net/ethernet/intel/ice/ice_ptp.c >+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c >@@ -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,34 +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_RESETTING) { >- if (ptp->state == ICE_PTP_READY) { >- ice_ptp_prepare_for_reset(pf, reset_type); >- } else { >- 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 >@@ -2720,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 */ >@@ -2729,11 +2718,41 @@ 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_RESETTING) { >+ if (ptp->state == ICE_PTP_READY) { >+ ice_ptp_prepare_for_reset(pf, reset_type); >+ } else { >+ 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); >@@ -2748,11 +2767,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); > >diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h >b/drivers/net/ethernet/intel/ice/ice_ptp.h >index de79a86056e3..3af20025043a 100644 >--- a/drivers/net/ethernet/intel/ice/ice_ptp.h >+++ b/drivers/net/ethernet/intel/ice/ice_ptp.h >@@ -316,6 +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_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); >@@ -357,8 +358,8 @@ 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, >- enum ice_reset_req reset_type) >+static inline void ice_ptp_rebuild(struct ice_pf *pf, >+ enum ice_reset_req reset_type) > { > } > >-- >2.40.1 > > > Reviewed-by: Jan Sokolowski <[email protected]> _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
