Re: [Intel-wired-lan] [PATCH] igb: Fix extts capture value format for 82580/i354/i350

[Paul Menzel]

Dear Yuezhen,


Thank you very much for your patch.

Am 31.05.23 um 11:08 schrieb Yuezhen Luan:
> 82580/i354/i350 features circle-counter-like timestamp registers
> that are different with newer i210. The EXTTS capture value in
> AUXTSMPx should be converted from raw circle counter value to
> timestamp value in resolution of 1 nanosec by the driver.

It’d be great, if you added a paragraph how to reproduce the issue.

> Signed-off-by: Yuezhen Luan <eggcar.luan@xxxxxxxxx>
> ---
>   drivers/net/ethernet/intel/igb/igb_main.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index 58872a4c2..187daa8ef 100644
> --- a/drivers/net/ethernet/intel/igb/igb_main.c
> +++ b/drivers/net/ethernet/intel/igb/igb_main.c
> @@ -6947,6 +6947,7 @@ static void igb_extts(struct igb_adapter *adapter, int tsintr_tt)
>   	struct e1000_hw *hw = &adapter->hw;
>   	struct ptp_clock_event event;
>   	struct timespec64 ts;
> +	unsigned long flags;

I do not see the variable *flags* being used.

>   
>   	if (pin < 0 || pin >= IGB_N_SDP)
>   		return;
> @@ -6954,9 +6955,12 @@ static void igb_extts(struct igb_adapter *adapter, int tsintr_tt)
>   	if (hw->mac.type == e1000_82580 ||
>   	    hw->mac.type == e1000_i354 ||
>   	    hw->mac.type == e1000_i350) {
> -		s64 ns = rd32(auxstmpl);
> +		u64 ns = rd32(auxstmpl);
>   
> -		ns += ((s64)(rd32(auxstmph) & 0xFF)) << 32;
> +		ns += ((u64)(rd32(auxstmph) & 0xFF)) << 32;
> +		spin_lock_irqsave(&adapter->tc, ns);
> +		ns = timecounter_cyc2time(&adapter->tc, ns);
> +		spin_unlock_irqrestore(&adapter->tc, ns);
>   		ts = ns_to_timespec64(ns);
>   	} else {
>   		ts.tv_nsec = rd32(auxstmpl);


Kind regards,

Paul