Commit 78267d0c authored by Jacob Keller's avatar Jacob Keller Committed by Tony Nguyen

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: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 48096710
...@@ -681,6 +681,20 @@ static int ice_ptp_write_adj(struct ice_pf *pf, s32 adj) ...@@ -681,6 +681,20 @@ static int ice_ptp_write_adj(struct ice_pf *pf, s32 adj)
return ice_ptp_adj_clock(hw, 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 * ice_ptp_adjfine - Adjust clock increment rate
* @info: the driver's PTP info structure * @info: the driver's PTP info structure
...@@ -698,7 +712,7 @@ static int ice_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm) ...@@ -698,7 +712,7 @@ static int ice_ptp_adjfine(struct ptp_clock_info *info, long scaled_ppm)
int neg_adj = 0; int neg_adj = 0;
int err; int err;
incval = ICE_PTP_NOMINAL_INCVAL_E810; incval = ice_base_incval(pf);
if (scaled_ppm < 0) { if (scaled_ppm < 0) {
neg_adj = 1; neg_adj = 1;
...@@ -1814,7 +1828,7 @@ void ice_ptp_reset(struct ice_pf *pf) ...@@ -1814,7 +1828,7 @@ void ice_ptp_reset(struct ice_pf *pf)
} }
/* Write the increment time value to PHY and LAN */ /* 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) { if (err) {
ice_ptp_unlock(hw); ice_ptp_unlock(hw);
goto err; goto err;
...@@ -1930,7 +1944,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf) ...@@ -1930,7 +1944,7 @@ static int ice_ptp_init_owner(struct ice_pf *pf)
} }
/* Write the increment time value to PHY and LAN */ /* 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) { if (err) {
ice_ptp_unlock(hw); ice_ptp_unlock(hw);
goto err_exit; goto err_exit;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment