diff mbox

e1000e: fix timing for 82579 Gigabit Ethernet controller

Message ID 1487270527-4549-1-git-send-email-berndfaust@gmail.com
State Accepted
Delegated to: Jeff Kirsher
Headers show

Commit Message

Bernd Faust Feb. 16, 2017, 6:42 p.m. UTC 
After an upgrade to Linux kernel v4.x the hardware timestamps of the
82579 Gigabit Ethernet Controller are different than expected.
The values that are being read are almost four times as big as before
the kernel upgrade.

The difference is that after the upgrade the driver sets the clock
frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
confirmed that the correct frequency for this network adapter is 96MHz.

Signed-off-by: Bernd Faust <berndfaust@gmail.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

--
2.7.4

Comments

Sasha Neftin Feb. 19, 2017, 12:55 p.m. UTC | #1 
On 2/16/2017 20:42, Bernd Faust wrote:
> After an upgrade to Linux kernel v4.x the hardware timestamps of the
> 82579 Gigabit Ethernet Controller are different than expected.
> The values that are being read are almost four times as big as before
> the kernel upgrade.
>
> The difference is that after the upgrade the driver sets the clock
> frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
> confirmed that the correct frequency for this network adapter is 96MHz.
>
> Signed-off-by: Bernd Faust <berndfaust@gmail.com>
> ---
>   drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index 7017281..8b7113d 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -3511,6 +3511,12 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)
>
>   	switch (hw->mac.type) {
>   	case e1000_pch2lan:
> +		/* Stable 96MHz frequency */
> +		incperiod = INCPERIOD_96MHz;
> +		incvalue = INCVALUE_96MHz;
> +		shift = INCVALUE_SHIFT_96MHz;
> +		adapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;
> +		break;
>   	case e1000_pch_lpt:
>   		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
>   			/* Stable 96MHz frequency */
> --
> 2.7.4
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@lists.osuosl.org
> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan

Hello,

e1000_pch2lan mac type corresponds to 82579LM and 82579V network 
adapters. System clock frequency indication (SYSCFI) for these devices 
supports both 25MHz and 96MHz frequency. By default TSYNCRXCTL.SYSCFI is 
set to 1 and that means 96MHz frequency is picked.

It is better to keep the current implementation as it covers all options.

Thanks,

Sasha
Sasha Neftin Feb. 26, 2017, 9:08 a.m. UTC | #2 
On 2/19/2017 14:55, Neftin, Sasha wrote:
> On 2/16/2017 20:42, Bernd Faust wrote:
>> After an upgrade to Linux kernel v4.x the hardware timestamps of the
>> 82579 Gigabit Ethernet Controller are different than expected.
>> The values that are being read are almost four times as big as before
>> the kernel upgrade.
>>
>> The difference is that after the upgrade the driver sets the clock
>> frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
>> confirmed that the correct frequency for this network adapter is 96MHz.
>>
>> Signed-off-by: Bernd Faust <berndfaust@gmail.com>
>> ---
>>   drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
>>   1 file changed, 6 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c 
>> b/drivers/net/ethernet/intel/e1000e/netdev.c
>> index 7017281..8b7113d 100644
>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
>> @@ -3511,6 +3511,12 @@ s32 e1000e_get_base_timinca(struct 
>> e1000_adapter *adapter, u32 *timinca)
>>
>>       switch (hw->mac.type) {
>>       case e1000_pch2lan:
>> +        /* Stable 96MHz frequency */
>> +        incperiod = INCPERIOD_96MHz;
>> +        incvalue = INCVALUE_96MHz;
>> +        shift = INCVALUE_SHIFT_96MHz;
>> +        adapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;
>> +        break;
>>       case e1000_pch_lpt:
>>           if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
>>               /* Stable 96MHz frequency */
>> -- 
>> 2.7.4
>> _______________________________________________
>> Intel-wired-lan mailing list
>> Intel-wired-lan@lists.osuosl.org
>> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>
> Hello,
>
> e1000_pch2lan mac type corresponds to 82579LM and 82579V network 
> adapters. System clock frequency indication (SYSCFI) for these devices 
> supports both 25MHz and 96MHz frequency. By default TSYNCRXCTL.SYSCFI 
> is set to 1 and that means 96MHz frequency is picked.
>
> It is better to keep the current implementation as it covers all options.
>
> Thanks,
>
> Sasha
>
Hello,

During last couple of weeks I saw few  complaints from community on same 
timing problem with 82579. I will double check clock definition with HW 
architecture.

Sasha
Sasha Neftin Feb. 27, 2017, 8:20 a.m. UTC | #3 
On 2/26/2017 11:08, Neftin, Sasha wrote:
> On 2/19/2017 14:55, Neftin, Sasha wrote:
>> On 2/16/2017 20:42, Bernd Faust wrote:
>>> After an upgrade to Linux kernel v4.x the hardware timestamps of the
>>> 82579 Gigabit Ethernet Controller are different than expected.
>>> The values that are being read are almost four times as big as before
>>> the kernel upgrade.
>>>
>>> The difference is that after the upgrade the driver sets the clock
>>> frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
>>> confirmed that the correct frequency for this network adapter is 96MHz.
>>>
>>> Signed-off-by: Bernd Faust <berndfaust@gmail.com>
>>> ---
>>>   drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
>>>   1 file changed, 6 insertions(+)
>>>
>>> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c 
>>> b/drivers/net/ethernet/intel/e1000e/netdev.c
>>> index 7017281..8b7113d 100644
>>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
>>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
>>> @@ -3511,6 +3511,12 @@ s32 e1000e_get_base_timinca(struct 
>>> e1000_adapter *adapter, u32 *timinca)
>>>
>>>       switch (hw->mac.type) {
>>>       case e1000_pch2lan:
>>> +        /* Stable 96MHz frequency */
>>> +        incperiod = INCPERIOD_96MHz;
>>> +        incvalue = INCVALUE_96MHz;
>>> +        shift = INCVALUE_SHIFT_96MHz;
>>> +        adapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;
>>> +        break;
>>>       case e1000_pch_lpt:
>>>           if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
>>>               /* Stable 96MHz frequency */
>>> -- 
>>> 2.7.4
>>> _______________________________________________
>>> Intel-wired-lan mailing list
>>> Intel-wired-lan@lists.osuosl.org
>>> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>>
>> Hello,
>>
>> e1000_pch2lan mac type corresponds to 82579LM and 82579V network 
>> adapters. System clock frequency indication (SYSCFI) for these 
>> devices supports both 25MHz and 96MHz frequency. By default 
>> TSYNCRXCTL.SYSCFI is set to 1 and that means 96MHz frequency is picked.
>>
>> It is better to keep the current implementation as it covers all 
>> options.
>>
>> Thanks,
>>
>> Sasha
>>
> Hello,
>
> During last couple of weeks I saw few  complaints from community on 
> same timing problem with 82579. I will double check clock definition 
> with HW architecture.
>
> Sasha
>
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@lists.osuosl.org
> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan

I've double checked - 82579 support 96MHz frequency only. So, let's 
accept this suggestion to upstream.

Ack.
Sasha Neftin Feb. 27, 2017, 8:39 a.m. UTC | #4 
On 2/26/2017 11:08, Neftin, Sasha wrote:
> On 2/19/2017 14:55, Neftin, Sasha wrote:
>> On 2/16/2017 20:42, Bernd Faust wrote:
>>> After an upgrade to Linux kernel v4.x the hardware timestamps of the
>>> 82579 Gigabit Ethernet Controller are different than expected.
>>> The values that are being read are almost four times as big as before
>>> the kernel upgrade.
>>>
>>> The difference is that after the upgrade the driver sets the clock
>>> frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
>>> confirmed that the correct frequency for this network adapter is 96MHz.
>>>
>>> Signed-off-by: Bernd Faust <berndfaust@gmail.com>
>>> ---
>>>   drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
>>>   1 file changed, 6 insertions(+)
>>>
>>> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c 
>>> b/drivers/net/ethernet/intel/e1000e/netdev.c
>>> index 7017281..8b7113d 100644
>>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
>>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
>>> @@ -3511,6 +3511,12 @@ s32 e1000e_get_base_timinca(struct 
>>> e1000_adapter *adapter, u32 *timinca)
>>>
>>>       switch (hw->mac.type) {
>>>       case e1000_pch2lan:
>>> +        /* Stable 96MHz frequency */
>>> +        incperiod = INCPERIOD_96MHz;
>>> +        incvalue = INCVALUE_96MHz;
>>> +        shift = INCVALUE_SHIFT_96MHz;
>>> +        adapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;
>>> +        break;
>>>       case e1000_pch_lpt:
>>>           if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
>>>               /* Stable 96MHz frequency */
>>> -- 
>>> 2.7.4
>>> _______________________________________________
>>> Intel-wired-lan mailing list
>>> Intel-wired-lan@lists.osuosl.org
>>> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
>>
>> Hello,
>>
>> e1000_pch2lan mac type corresponds to 82579LM and 82579V network 
>> adapters. System clock frequency indication (SYSCFI) for these 
>> devices supports both 25MHz and 96MHz frequency. By default 
>> TSYNCRXCTL.SYSCFI is set to 1 and that means 96MHz frequency is picked.
>>
>> It is better to keep the current implementation as it covers all 
>> options.
>>
>> Thanks,
>>
>> Sasha
>>
> Hello,
>
> During last couple of weeks I saw few  complaints from community on 
> same timing problem with 82579. I will double check clock definition 
> with HW architecture.
>
> Sasha
>
I've double checked - 82579 support 96MHz frequency only. So, let's 
accept this suggestion to upstream.

Ack.
Keller, Jacob E Feb. 28, 2017, 9:09 p.m. UTC | #5 
> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@lists.osuosl.org] On
> Behalf Of Neftin, Sasha
> Sent: Monday, February 27, 2017 12:40 AM
> To: Bernd Faust <berndfaust@gmail.com>; Kirsher, Jeffrey T
> <jeffrey.t.kirsher@intel.com>; intel-wired-lan@lists.osuosl.org;
> netdev@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [Intel-wired-lan] [PATCH] e1000e: fix timing for 82579 Gigabit
> Ethernet controller
> 
> On 2/26/2017 11:08, Neftin, Sasha wrote:
> > On 2/19/2017 14:55, Neftin, Sasha wrote:
> >> On 2/16/2017 20:42, Bernd Faust wrote:
> >>> After an upgrade to Linux kernel v4.x the hardware timestamps of the
> >>> 82579 Gigabit Ethernet Controller are different than expected.
> >>> The values that are being read are almost four times as big as before
> >>> the kernel upgrade.
> >>>
> >>> The difference is that after the upgrade the driver sets the clock
> >>> frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
> >>> confirmed that the correct frequency for this network adapter is 96MHz.
> >>>
> >>> Signed-off-by: Bernd Faust <berndfaust@gmail.com>
> >>> ---
> >>>   drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
> >>>   1 file changed, 6 insertions(+)
> >>>
> >>> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c
> >>> b/drivers/net/ethernet/intel/e1000e/netdev.c
> >>> index 7017281..8b7113d 100644
> >>> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> >>> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> >>> @@ -3511,6 +3511,12 @@ s32 e1000e_get_base_timinca(struct
> >>> e1000_adapter *adapter, u32 *timinca)
> >>>
> >>>       switch (hw->mac.type) {
> >>>       case e1000_pch2lan:
> >>> +        /* Stable 96MHz frequency */
> >>> +        incperiod = INCPERIOD_96MHz;
> >>> +        incvalue = INCVALUE_96MHz;
> >>> +        shift = INCVALUE_SHIFT_96MHz;
> >>> +        adapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;
> >>> +        break;
> >>>       case e1000_pch_lpt:
> >>>           if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
> >>>               /* Stable 96MHz frequency */
> >>> --
> >>> 2.7.4
> >>> _______________________________________________
> >>> Intel-wired-lan mailing list
> >>> Intel-wired-lan@lists.osuosl.org
> >>> http://lists.osuosl.org/mailman/listinfo/intel-wired-lan
> >>
> >> Hello,
> >>
> >> e1000_pch2lan mac type corresponds to 82579LM and 82579V network
> >> adapters. System clock frequency indication (SYSCFI) for these
> >> devices supports both 25MHz and 96MHz frequency. By default
> >> TSYNCRXCTL.SYSCFI is set to 1 and that means 96MHz frequency is picked.
> >>
> >> It is better to keep the current implementation as it covers all
> >> options.
> >>
> >> Thanks,
> >>
> >> Sasha
> >>
> > Hello,
> >
> > During last couple of weeks I saw few  complaints from community on
> > same timing problem with 82579. I will double check clock definition
> > with HW architecture.
> >
> > Sasha
> >
> I've double checked - 82579 support 96MHz frequency only. So, let's
> accept this suggestion to upstream.
> 
> Ack.
> 

This resolves also a complaint from someone on the LinuxPTP development mailing list.

ACK.

Thanks,
Jake
Brown, Aaron F March 24, 2017, 12:43 a.m. UTC | #6 
> From: netdev-owner@vger.kernel.org [mailto:netdev-
> owner@vger.kernel.org] On Behalf Of Bernd Faust
> Sent: Thursday, February 16, 2017 10:42 AM
> To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; Lubetkin, YanirX
> <yanirx.lubetkin@intel.com>; intel-wired-lan@lists.osuosl.org;
> netdev@vger.kernel.org; linux-kernel@vger.kernel.org
> Cc: Bernd Faust <berndfaust@gmail.com>
> Subject: [PATCH] e1000e: fix timing for 82579 Gigabit Ethernet controller
> 
> After an upgrade to Linux kernel v4.x the hardware timestamps of the
> 82579 Gigabit Ethernet Controller are different than expected.
> The values that are being read are almost four times as big as before
> the kernel upgrade.
> 
> The difference is that after the upgrade the driver sets the clock
> frequency to 25MHz, where before the upgrade it was set to 96MHz. Intel
> confirmed that the correct frequency for this network adapter is 96MHz.
> 
> Signed-off-by: Bernd Faust <berndfaust@gmail.com>
> ---
>  drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
>  1 file changed, 6 insertions(+)

Tested-by: Aaron Brown <aaron.f.brown@intel.com>
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 7017281..8b7113d 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -3511,6 +3511,12 @@  s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)

 	switch (hw->mac.type) {
 	case e1000_pch2lan:
+		/* Stable 96MHz frequency */
+		incperiod = INCPERIOD_96MHz;
+		incvalue = INCVALUE_96MHz;
+		shift = INCVALUE_SHIFT_96MHz;
+		adapter->cc.shift = shift + INCPERIOD_SHIFT_96MHz;
+		break;
 	case e1000_pch_lpt:
 		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {
 			/* Stable 96MHz frequency */