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>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index fdcfe2e3aabd9e85b8c3deec0a5ba82e8ec8c151..04665aff22344cd3b14b1a72471cc1abdc8e035c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -198,7 +198,6 @@
 
 enum ice_feature {
        ICE_F_DSCP,
-       ICE_F_PTP_EXTTS,
        ICE_F_PHY_RCLK,
        ICE_F_SMA_CTRL,
        ICE_F_CGU,

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 01aa3d36b5a73f2c0f0b95d5d6a6dbb888d12d6f..3821964860541d93bcc1115283be921ef409ce2b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -3989,7 +3989,6 @@ void ice_init_feature_support(struct ice_pf *pf)
        case ICE_DEV_ID_E810_XXV_QSFP:
        case ICE_DEV_ID_E810_XXV_SFP:
                ice_set_feature_support(pf, ICE_F_DSCP);
-               ice_set_feature_support(pf, ICE_F_PTP_EXTTS);
                if (ice_is_phy_rclk_present(&pf->hw))
                        ice_set_feature_support(pf, ICE_F_PHY_RCLK);
                /* If we don't own the timer - don't enable other caps */

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index a91acba0606f48a194ce326e5d5538573676e89c..066e7aadfa97e3a210403afd8f6944baffaeac1a 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -2268,9 +2268,7 @@ static void
 ice_ptp_setup_pins_e810(struct ice_pf *pf, struct ptp_clock_info *info)
 {
        info->n_per_out = N_PER_OUT_E810;
-
-       if (ice_is_feature_supported(pf, ICE_F_PTP_EXTTS))
-               info->n_ext_ts = N_EXT_TS_E810;
+       info->n_ext_ts = N_EXT_TS_E810;
 
        if (ice_is_feature_supported(pf, ICE_F_SMA_CTRL)) {
                info->n_ext_ts = N_EXT_TS_E810;