ice: Re-enable timestamping correctly after reset

During reset, TX_TSYN interrupt should be processed as it may process
timestamps in brief moments before and after reset.
Timestamping should be enabled on VSIs at the end of reset procedure.
On ice_get_phy_tx_tstamp_ready error, interrupt should not be rearmed
because error only happens on resets.

Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 0a7eed9b43a6332f65f80ce4267de6b9334fef6f..a39c2d9bdafea68c9bac5434dc474ddb28523b5f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3151,7 +3151,7 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)
 
        if (oicr & PFINT_OICR_TSYN_TX_M) {
                ena_mask &= ~PFINT_OICR_TSYN_TX_M;
-               if (!hw->reset_ongoing && ice_ptp_pf_handles_tx_interrupt(pf))
+               if (ice_ptp_pf_handles_tx_interrupt(pf))
                        set_bit(ICE_MISC_THREAD_TX_TSTAMP, pf->misc_thread);
        }
 

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 71f405f8a6fee67663feb4b5ea805dfb75239c9a..ac3f24693a508b5d1067c69a36d814dd67fcbc2d 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -705,7 +705,9 @@ static enum ice_tx_tstamp_work ice_ptp_tx_tstamp_owner(struct ice_pf *pf)
 
                /* Read the Tx ready status first */
                err = ice_get_phy_tx_tstamp_ready(&pf->hw, i, &tstamp_ready);
-               if (err || tstamp_ready)
+               if (err)
+                       break;
+               else if (tstamp_ready)
                        return ICE_TX_TSTAMP_WORK_PENDING;
        }
 
@@ -2468,12 +2470,10 @@ void ice_ptp_reset(struct ice_pf *pf)
        int err, itr = 1;
        u64 time_diff;
 
-       if (test_bit(ICE_PFR_REQ, pf->state))
+       if (test_bit(ICE_PFR_REQ, pf->state) ||
+           !ice_pf_src_tmr_owned(pf))
                goto pfr;
 
-       if (!ice_pf_src_tmr_owned(pf))
-               goto reset_ts;
-
        err = ice_ptp_init_phc(hw);
        if (err)
                goto err;
@@ -2517,10 +2517,6 @@ void ice_ptp_reset(struct ice_pf *pf)
                        goto err;
        }
 
-reset_ts:
-       /* Restart the PHY timestamping block */
-       ice_ptp_reset_phy_timestamping(pf);
-
 pfr:
        /* Init Tx structures */
        if (ice_is_e810(&pf->hw)) {
@@ -2536,6 +2532,11 @@ pfr:
 
        set_bit(ICE_FLAG_PTP, pf->flags);
 
+       /* 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);