Skip to contentSkip to conversation

Patch "net: igb: fix the start time for periodic output signals" has been added to the 4.0-stable tree

PATCH [email protected] 1 participant 1 message Jul 4, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net: igb: fix the start time for periodic output signals

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-igb-fix-the-start-time-for-periodic-output-signals.patch
and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Fri Jul 3 19:59:52 PDT 2015

From: Richard Cochran <[email protected]>
Date: Thu, 11 Jun 2015 14:51:30 +0200
Subject: net: igb: fix the start time for periodic output signals

From: Richard Cochran <[email protected]>

[ Upstream commit 58c98be137830d34b79024cc5dc95ef54fcd7ffe ]

When programming the start of a periodic output, the code wrongly places the seconds value into the "low" register and the nanoseconds into the "high" register. Even though this is backwards, it slipped through my testing, because the re-arming code in the interrupt service routine is correct, and the signal does appear starting with the second edge.

This patch fixes the issue by programming the registers correctly.

---
 drivers/net/ethernet/intel/igb/igb_ptp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/igb/igb_ptp.c +2 -2
@@ -540,8 +540,8 @@ static int igb_ptp_feature_enable_i210(s
 			igb->perout[i].start.tv_nsec = rq->perout.start.nsec;
 			igb->perout[i].period.tv_sec = ts.tv_sec;
 			igb->perout[i].period.tv_nsec = ts.tv_nsec;
-			wr32(trgttiml, rq->perout.start.sec);
-			wr32(trgttimh, rq->perout.start.nsec);
+			wr32(trgttimh, rq->perout.start.sec);
+			wr32(trgttiml, rq->perout.start.nsec);
 			tsauxc |= tsauxc_mask;
 			tsim |= tsim_mask;
 		} else {

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/net-igb-fix-the-start-time-for-periodic-output-signals.patch