ice: reschedule ice_ptp_wait_for_offset_valid during reset

If the ice_ptp_wait_for_offest_valid function is scheduled to run while the
driver is resetting, it will exit without completing calibration. The work
function gets scheduled by ice_ptp_port_phy_restart which will be called as
part of the reset recovery process.

It is possible for the first execution to occur before the driver has
completely cleared its resetting flags. Ensure calibration completes by
rescheduling the task until reset is fully completed.

Reported-by: Siddaraju DH <siddaraju.dh@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 7b5120906d3f88bb67820b6c7d438aa4d0f3a6f1..d63161d73eb16b30bdbbba0376ddbe642e394283 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -1240,8 +1240,13 @@ static void ice_ptp_wait_for_offsets(struct kthread_work *work)
        pf = ptp_port_to_pf(port);
        hw = &pf->hw;
 
-       if (ice_is_reset_in_progress(pf->state))
+       if (ice_is_reset_in_progress(pf->state)) {
+               /* wait for device driver to complete reset */
+               kthread_queue_delayed_work(pf->ptp.kworker,
+                                          &port->ov_work,
+                                          msecs_to_jiffies(100));
                return;
+       }
 
        tx_err = ice_ptp_check_tx_fifo(port);
        if (!tx_err)