ice: PTP: move setting of tstamp_config

The tstamp_config structure is being set inside of
ice_ptp_cfg_timestamp, which is the function used to set Tx and
Rx timestamping during initialization.

This function is also used in order to set the PHY port timestamping
status. However, it makes sense to always set the tstamp_config directly
whenever the ice_set_tx_tstamp or ice_set_rx_tstamp functions are
called.

Move assignment of tstamp_config into the related functions and out of
ice_ptp_cfg_timestamp.

Now that we assign the timestamp mode in the relevant functions, we no
longer modify the config value in ice_set_timestamp_mode. In turn, we
no longer want to copy that config value into the PF cached structure.
Instead, this is now the source of truth for actual configuration. On
success of ice_set_timestamp_mode, copy the real configured mode back to
report it out to userspace.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
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 0afdcda2c8d2863202c31654fb9bcaa31076cd02..686527c48977132ab546243985397cb3e3eed1cf 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -281,6 +281,8 @@ static void ice_set_tx_tstamp(struct ice_pf *pf, bool on)
        else
                val &= ~PFINT_OICR_TSYN_TX_M;
        wr32(&pf->hw, PFINT_OICR_ENA, val);
+
+       pf->ptp.tstamp_config.tx_type = on ? HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;
 }
 
 /**
@@ -303,6 +305,9 @@ static void ice_set_rx_tstamp(struct ice_pf *pf, bool on)
                        continue;
                vsi->rx_rings[i]->ptp_rx = on;
        }
+
+       pf->ptp.tstamp_config.rx_filter = on ? HWTSTAMP_FILTER_ALL :
+                                              HWTSTAMP_FILTER_NONE;
 }
 
 /**
@@ -317,14 +322,6 @@ void ice_ptp_cfg_timestamp(struct ice_pf *pf, bool ena)
 {
        ice_set_tx_tstamp(pf, ena);
        ice_set_rx_tstamp(pf, ena);
-
-       if (ena) {
-               pf->ptp.tstamp_config.rx_filter = HWTSTAMP_FILTER_ALL;
-               pf->ptp.tstamp_config.tx_type = HWTSTAMP_TX_ON;
-       } else {
-               pf->ptp.tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;
-               pf->ptp.tstamp_config.tx_type = HWTSTAMP_TX_OFF;
-       }
 }
 
 /**
@@ -1248,7 +1245,6 @@ ice_ptp_set_timestamp_mode(struct ice_pf *pf, struct hwtstamp_config *config)
        case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
        case HWTSTAMP_FILTER_NTP_ALL:
        case HWTSTAMP_FILTER_ALL:
-               config->rx_filter = HWTSTAMP_FILTER_ALL;
                ice_set_rx_tstamp(pf, true);
                break;
        default:
@@ -1280,8 +1276,8 @@ int ice_ptp_set_ts_config(struct ice_pf *pf, struct ifreq *ifr)
        if (err)
                return err;
 
-       /* Save these settings for future reference */
-       pf->ptp.tstamp_config = config;
+       /* Return the actual configuration set */
+       config = pf->ptp.tstamp_config;
 
        return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
                -EFAULT : 0;