ice: suppress DPLL errors during reset recovery

During reset recovery, the admin queue returns EBUSY which is expected
behavior. However, the DPLL subsystem was logging these as errors and
incrementing the error counter, potentially leading to unnecessary
warnings and even disabling the DPLL periodic worker if the threshold
was reached.

Suppress error logging and error counter increments when the admin
queue returns EBUSY, as this is expected during reset recovery and
not a real failure condition.

test case:
- ethtool --reset eth3 irq-shared dma-shared filter-shared offload-shared
mac-shared phy-shared ram-shared
- observe if dmesg EBUSY errors are gone

Fixes: d7999f5ea64b ("ice: implement dpll interface to control cgu")
Signed-off-by: Przemyslaw Korba <przemyslaw.korba@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_dpll.c b/drivers/net/ethernet/intel/ice/ice_dpll.c
index 30c3a4db7d611cb21cd77eb9cb898b9ebcbb5c40..85a74cd6ea1f3ee2ec6f457698edc4c101d96352 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dpll.c
+++ b/drivers/net/ethernet/intel/ice/ice_dpll.c
@@ -793,7 +793,7 @@ err:
                                   ret,
                                   libie_aq_str(pf->hw.adminq.sq_last_status),
                                   pin_type_name[pin_type], pin->idx);
-       else
+       else if (pf->hw.adminq.sq_last_status != LIBIE_AQ_RC_EBUSY)
                dev_err_ratelimited(ice_pf_to_dev(pf),
                                    "err:%d %s failed to update %s pin:%u\n",
                                    ret,
@@ -3024,7 +3024,8 @@ static int ice_dpll_pps_update_phase_offsets(struct ice_pf *pf,
        *phase_offset_pins_updated = 0;
        ret = ice_aq_get_cgu_input_pin_measure(&pf->hw, DPLL_TYPE_PPS, meas,
                                               ARRAY_SIZE(meas));
-       if (ret && pf->hw.adminq.sq_last_status == LIBIE_AQ_RC_EAGAIN) {
+       if (ret && (pf->hw.adminq.sq_last_status == LIBIE_AQ_RC_EAGAIN ||
+                   pf->hw.adminq.sq_last_status == LIBIE_AQ_RC_EBUSY)) {
                return 0;
        } else if (ret) {
                dev_err(ice_pf_to_dev(pf),
@@ -3086,10 +3087,12 @@ ice_dpll_update_state(struct ice_pf *pf, struct ice_dpll *d, bool init)
                d->dpll_idx, d->prev_input_idx, d->input_idx,
                d->dpll_state, d->prev_dpll_state, d->mode);
        if (ret) {
-               dev_err(ice_pf_to_dev(pf),
-                       "update dpll=%d state failed, ret=%d %s\n",
-                       d->dpll_idx, ret,
-                       libie_aq_str(pf->hw.adminq.sq_last_status));
+               /* EBUSY is expected during reset recovery, don't log error */
+               if (pf->hw.adminq.sq_last_status != LIBIE_AQ_RC_EBUSY)
+                       dev_err(ice_pf_to_dev(pf),
+                               "update dpll=%d state failed, ret=%d %s\n",
+                               d->dpll_idx, ret,
+                               libie_aq_str(pf->hw.adminq.sq_last_status));
                return ret;
        }
        if (init) {
@@ -3158,7 +3161,9 @@ static void ice_dpll_periodic_work(struct kthread_work *work)
            d->periodic_counter % dp->phase_offset_monitor_period == 0)
                ret = ice_dpll_pps_update_phase_offsets(pf, &phase_offset_ntf);
        if (ret) {
-               d->cgu_state_acq_err_num++;
+               /* EBUSY is expected during reset recovery */
+               if (pf->hw.adminq.sq_last_status != LIBIE_AQ_RC_EBUSY)
+                       d->cgu_state_acq_err_num++;
                /* stop rescheduling this worker */
                if (d->cgu_state_acq_err_num >
                    ICE_CGU_STATE_ACQ_ERR_THRESHOLD) {