Re: [PATCH v2 iwl-next 1/9] ice: use ice_pf_src_tmr_owned where available

[Leon Romanovsky <leon@kernel.org>]

On Thu, Aug 17, 2023 at 04:17:38PM +0200, Karol Kolacinski wrote:
> The ice_pf_src_tmr_owned() macro exists to check the function capability
> bit indicating if the current function owns the PTP hardware clock.

This is first patch in the series, but I can't find mentioned macro.
My net-next is based on 5b0a1414e0b0 ("Merge branch 'smc-features'")
➜  kernel git:(net-next) git grep ice_pf_src_tmr_owned
shows nothing.

On which branch is it based?

Thanks


> 
> This is slightly shorter than the more verbose access via
> hw.func_caps.ts_func_info.src_tmr_owned. Be consistent and use this
> where possible rather than open coding its equivalent.
> 
> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
> Signed-off-by: Karol Kolacinski <karol.kolacinski@intel.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_main.c | 2 +-
>  drivers/net/ethernet/intel/ice/ice_ptp.c  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
> index a6dd336d2500..b6858f04152c 100644
> --- a/drivers/net/ethernet/intel/ice/ice_main.c
> +++ b/drivers/net/ethernet/intel/ice/ice_main.c
> @@ -3185,7 +3185,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 97b8581ae931..0669ca905c46 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ptp.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
> @@ -2447,7 +2447,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);
> -- 
> 2.39.2
> 
>