netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarod Wilson <jarod@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Jarod Wilson <jarod@redhat.com>,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
	intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org
Subject: [PATCH net] e1000e: fix PTP on e1000_pch_lpt variants
Date: Tue, 19 Jul 2016 16:25:02 -0400	[thread overview]
Message-ID: <1468959902-25071-1-git-send-email-jarod@redhat.com> (raw)

I've got reports that the Intel I-218V NIC in Intel NUC5i5RYH systems used
as a PTP slave experiences random ~10 hour clock jumps, which are resolved
if the same workaround for the 82574 and 82583 is employed. Switching from
an if to a select, because the list of NIC types could well grow further
and we'd already have to wrap the conditionals.

CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: intel-wired-lan@lists.osuosl.org
CC: netdev@vger.kernel.org
Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 2b2e2f8..866fea0 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4335,7 +4335,10 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
 	systim = (cycle_t)systimel;
 	systim |= (cycle_t)systimeh << 32;
 
-	if ((hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82583)) {
+	switch (hw->mac.type) {
+	case e1000_82574:
+	case e1000_82583:
+	case e1000_pch_lpt:
 		u64 time_delta, rem, temp;
 		u32 incvalue;
 		int i;
@@ -4360,6 +4363,9 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
 			    (rem == 0))
 				break;
 		}
+		break;
+	default:
+		break;
 	}
 	return systim;
 }
-- 
1.8.3.1

             reply	other threads:[~2016-07-19 20:25 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-19 20:25 Jarod Wilson [this message]
2016-07-19 20:49 ` [Intel-wired-lan] [PATCH net] e1000e: fix PTP on e1000_pch_lpt variants Rustad, Mark D
2016-07-20 17:05   ` Jarod Wilson
2016-07-20 11:01 ` Sergei Shtylyov
2016-07-23 16:44 ` [PATCH v2 net-next 0/2] e1000e: fix PTP on e1000_pch_variants Jarod Wilson
2016-07-23 16:44   ` [PATCH net-next 1/2] e1000e: factor out systim sanitization Jarod Wilson
2016-07-23 16:44   ` [PATCH net-next 2/2] e1000e: fix PTP on e1000_pch_lpt variants Jarod Wilson
2016-07-25 17:56   ` [Intel-wired-lan] [PATCH v2 net-next 0/2] e1000e: fix PTP on e1000_pch_variants Jesse Brandeburg
2016-07-26 17:39     ` [PATCH net-next 3/2] e1000e: convert systim overflow check to use flags2 Jarod Wilson
2016-07-26 17:53       ` Jeff Kirsher
2016-07-26 17:58         ` Jarod Wilson
2016-07-26 18:25   ` [PATCH v3 net-next 0/2] e1000e: fix PTP on e1000_pch_variants Jarod Wilson
2016-07-26 18:25     ` [PATCH net-next v3 1/2] e1000e: factor out systim sanitization Jarod Wilson
2016-07-27 14:09       ` [Intel-wired-lan] " Avargil, Raanan
2016-07-27 15:01         ` Jarod Wilson
2016-08-02  1:32           ` Jarod Wilson
2016-08-02  7:33             ` Brown, Aaron F
2016-08-11 15:48               ` Jarod Wilson
2016-07-27 21:15         ` Woodford, Timothy W.
2016-07-29 14:40           ` Woodford, Timothy W.
2016-08-04 19:34             ` Brown, Aaron F
2016-08-04 19:30       ` Brown, Aaron F
2016-07-26 18:25     ` [PATCH net-next v3 2/2] e1000e: fix PTP on e1000_pch_lpt variants Jarod Wilson
2016-08-04 19:31       ` [Intel-wired-lan] " Brown, Aaron F
2016-07-24 20:30 ` [Intel-wired-lan] [PATCH net] " kbuild test robot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1468959902-25071-1-git-send-email-jarod@redhat.com \
    --to=jarod@redhat.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).