ice: introduce ice_pf_src_tmr_owned

Add ice_pf_src_tmr_owned() macro to check the function capability bit
indicating if the current function owns the PTP hardware clock. This is
slightly shorter than the more verbose access via
hw.func_caps.ts_func_info.src_tmr_owned. Use this where possible rather
than open coding its equivalent.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
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 04665aff22344cd3b14b1a72471cc1abdc8e035c..d30ae39c19f034a61ac01736f8b9ae14f83961a7 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -196,6 +196,8 @@
 
 #define ice_pf_to_dev(pf) (&((pf)->pdev->dev))
 
+#define ice_pf_src_tmr_owned(pf) ((pf)->hw.func_caps.ts_func_info.src_tmr_owned)
+
 enum ice_feature {
        ICE_F_DSCP,
        ICE_F_PHY_RCLK,

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 3821964860541d93bcc1115283be921ef409ce2b..1549890a3cbf85fb4e645f21d735e82b5d970950 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -3992,7 +3992,7 @@ void ice_init_feature_support(struct ice_pf *pf)
                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 */
-               if (!pf->hw.func_caps.ts_func_info.src_tmr_owned)
+               if (!ice_pf_src_tmr_owned(pf))
                        break;
                if (ice_is_cgu_present(&pf->hw))
                        ice_set_feature_support(pf, ICE_F_CGU);

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index b73d3b1e48d1f704be2b855a8fe09987095c6711..e22f41fea8dbc31ad8c7c787036adea50743c541 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3159,7 +3159,7 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)
 
                ena_mask &= ~PFINT_OICR_TSYN_EVNT_M;
 
-               if (hw->func_caps.ts_func_info.src_tmr_owned) {
+               if (ice_pf_src_tmr_owned(pf)) {
                        /* Save EVENTs from GLTSYN register */
                        pf->ptp.ext_ts_irq |= gltsyn_stat &
                                              (GLTSYN_STAT_EVENT0_M |

diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 7ae1f1abe9656e9a8d84d6cccb875819bbecf26d..05f922d3b3162b73ee3db43b895538e14df4a502 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -436,7 +436,7 @@ static void ice_clear_ptp_clock_index(struct ice_pf *pf)
        int err;
 
        /* Do not clear the index if we don't own the timer */
-       if (!hw->func_caps.ts_func_info.src_tmr_owned)
+       if (!ice_pf_src_tmr_owned(pf))
                return;
 
        tmr_idx = hw->func_caps.ts_func_info.tmr_index_assoc;
@@ -2499,7 +2499,7 @@ void ice_ptp_reset(struct ice_pf *pf)
        if (test_bit(ICE_PFR_REQ, pf->state))
                goto pfr;
 
-       if (!hw->func_caps.ts_func_info.src_tmr_owned)
+       if (!ice_pf_src_tmr_owned(pf))
                goto reset_ts;
 
        err = ice_ptp_init_phc(hw);
@@ -2751,7 +2751,7 @@ void ice_ptp_init(struct ice_pf *pf)
        /* If this function owns the clock hardware, it must allocate and
         * configure the PTP clock device to represent it.
         */
-       if (hw->func_caps.ts_func_info.src_tmr_owned) {
+       if (ice_pf_src_tmr_owned(pf)) {
                err = ice_ptp_init_owner(pf);
                if (err)
                        goto err;