Skip to content

Commit 12a5a28

Browse files
jacob-kelleranguy11
authored andcommitted
ice: remove ICE_F_PTP_EXTTS feature flag
The ICE_F_PTP_EXTTS feature flag is ostensibly intended to support checking whether the device supports external timestamp pins. It is only checked in E810-specific code flows, and is enabled for all E810-based devices. E822 and E823 flows unconditionally enable external timestamp support. This makes the feature flag meaningless, as it is always enabled. Just unconditionally enable support for external timestamp pins and remove this unnecessary flag. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent dd84744 commit 12a5a28

3 files changed

Lines changed: 1 addition & 5 deletions

File tree

drivers/net/ethernet/intel/ice/ice.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@
198198

199199
enum ice_feature {
200200
ICE_F_DSCP,
201-
ICE_F_PTP_EXTTS,
202201
ICE_F_PHY_RCLK,
203202
ICE_F_SMA_CTRL,
204203
ICE_F_CGU,

drivers/net/ethernet/intel/ice/ice_lib.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3989,7 +3989,6 @@ void ice_init_feature_support(struct ice_pf *pf)
39893989
case ICE_DEV_ID_E810_XXV_QSFP:
39903990
case ICE_DEV_ID_E810_XXV_SFP:
39913991
ice_set_feature_support(pf, ICE_F_DSCP);
3992-
ice_set_feature_support(pf, ICE_F_PTP_EXTTS);
39933992
if (ice_is_phy_rclk_present(&pf->hw))
39943993
ice_set_feature_support(pf, ICE_F_PHY_RCLK);
39953994
/* If we don't own the timer - don't enable other caps */

drivers/net/ethernet/intel/ice/ice_ptp.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2268,9 +2268,7 @@ static void
22682268
ice_ptp_setup_pins_e810(struct ice_pf *pf, struct ptp_clock_info *info)
22692269
{
22702270
info->n_per_out = N_PER_OUT_E810;
2271-
2272-
if (ice_is_feature_supported(pf, ICE_F_PTP_EXTTS))
2273-
info->n_ext_ts = N_EXT_TS_E810;
2271+
info->n_ext_ts = N_EXT_TS_E810;
22742272

22752273
if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL)) {
22762274
info->n_ext_ts = N_EXT_TS_E810;

0 commit comments

Comments
 (0)