Skip to contentSkip to conversation

e1000e: fix timing for 82579 Gigabit Ethernet controller

PATCH In review Bernd Faust 4 participants 7 messages Feb 16, 2017 – Mar 24, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/e1000e/netdev.c +6 -0
index 7017281..8b7113d 100644
@@ -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

#1 lore raw
Quoted 32 lines · Bernd Faust

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.

---
  drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/e1000e/netdev.c +6 -1
index 7017281..8b7113d 100644
@@ -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 */
--
Quoted 5 lines

2.7.4
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at 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

#2 lore raw
Quoted 48 lines · Sasha
Quoted 32 lines · Bernd Faust

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.

---
  drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/e1000e/netdev.c +6 -0
index 7017281..8b7113d 100644
@@ -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) {
Quoted 7 lines
              /* Stable 96MHz frequency */
Signature · 5 lines
2.7.4
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at 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.

Quoted 6 lines

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

#3 lore raw
Quoted 62 lines · Sasha
Quoted 48 lines · Sasha
Quoted 32 lines · Bernd Faust

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.

---
  drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/e1000e/netdev.c +6 -0
index 7017281..8b7113d 100644
@@ -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) {
Quoted 7 lines
              /* Stable 96MHz frequency */
Signature · 5 lines
2.7.4
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at 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.

Quoted 7 lines

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.

Quoted 6 lines

Sasha

_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at 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.

#4 lore raw
In reply to Neftin, Sasha
Quoted 56 lines · Sasha
Quoted 48 lines · Sasha
Quoted 32 lines · Bernd Faust

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.

---
  drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/e1000e/netdev.c +6 -0
index 7017281..8b7113d 100644
@@ -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) {
Quoted 7 lines
              /* Stable 96MHz frequency */
Signature · 5 lines
2.7.4
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at 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.

Quoted 7 lines

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

Thanks,

Sasha

Quoted 8 lines

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.

#5 lore raw
Quoted 73 lines

-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Neftin, Sasha
Sent: Monday, February 27, 2017 12:40 AM
To: Bernd Faust <[email protected]>; Kirsher, Jeffrey T <[email protected]>; intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org; linux-kernel at vger.kernel.org
Subject: Re: [Intel-wired-lan] [PATCH] e1000e: fix timing for 82579 Gigabit Ethernet controller

Quoted 62 lines · Sasha
Quoted 48 lines · Sasha
Quoted 33 lines · Bernd Faust

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.

---
  drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/net/ethernet/intel/e1000e/netdev.c +6 -0
index 7017281..8b7113d 100644
@@ -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 */
Quoted 6 lines

--
2.7.4
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan at 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.

Quoted 7 lines

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.

Quoted 7 lines
Quoted 2 lines

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

Tested-by on v1 1/1
#6 lore raw
In reply to Bernd Faust
Quoted 14 lines

From: netdev-owner at vger.kernel.org [mailto:netdev-
owner at vger.kernel.org] On Behalf Of Bernd Faust
Sent: Thursday, February 16, 2017 10:42 AM
To: Kirsher, Jeffrey T <[email protected]>; Lubetkin, YanirX <[email protected]>; intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org; linux-kernel at vger.kernel.org
Cc: Bernd Faust <[email protected]>
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.

Quoted 8 lines

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.

---
 drivers/net/ethernet/intel/e1000e/netdev.c | 6 ++++++
 1 file changed, 6 insertions(+)