ice: introduce ice_base_incval function

A future change will add additional possible increment values for the
E822 device support. To handle this, we want to look up the increment
value to use instead of hard coding it to the nominal value for E810
devices. Introduce ice_base_incval as a function to get the best nominal
increment value to use.

For now, it just returns the E810 value, but will be refactored in the
future to look up the value based on the device type and configured
clock frequency.

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 4d9e122837facdabbfc0e0fc07f0fc2f4cfa03fb..0afdcda2c8d2863202c31654fb9bcaa31076cd02 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -681,6 +681,20 @@ static int ice_ptp_write_adj(struct ice_pf *pf, s32 adj)
        return ice_ptp_adj_clock(hw, adj);
 }
 
+/**
+ * ice_base_incval - Get base timer increment value
+ * @pf: Board private structure
+ *
+ * Look up the base timer increment value for this device. The base increment
+ * value is used to define the nominal clock tick rate. This increment value
+ * is programmed during device initialization. It is also used as the basis
+ * for calculating adjustments using scaled_ppm.
+ */
+static u64 ice_base_incval(struct ice_pf *pf)
+{
+       return ICE_PTP_NOMINAL_INCVAL_E810;
+}
+
 /**
  * ice_ptp_adjfine - Adjust clock increment rate
  * @info: the driver's PTP info structure
@@ -698,7 +712,7 @@ static int ice_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm)
        int neg_adj = 0;
        int err;
 
-       incval = ICE_PTP_NOMINAL_INCVAL_E810;
+       incval = ice_base_incval(pf);
 
        if (scaled_ppm < 0) {
                neg_adj = 1;
@@ -1814,7 +1828,7 @@ void ice_ptp_reset(struct ice_pf *pf)
        }
 
        /* Write the increment time value to PHY and LAN */
-       err = ice_ptp_write_incval(hw, ICE_PTP_NOMINAL_INCVAL_E810);
+       err = ice_ptp_write_incval(hw, ice_base_incval(pf));
        if (err) {
                ice_ptp_unlock(hw);
                goto err;
@@ -1930,7 +1944,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
        }
 
        /* Write the increment time value to PHY and LAN */
-       err = ice_ptp_write_incval(hw, ICE_PTP_NOMINAL_INCVAL_E810);
+       err = ice_ptp_write_incval(hw, ice_base_incval(pf));
        if (err) {
                ice_ptp_unlock(hw);
                goto err_exit;