diff options
| author |   Richard Cochran <richardcochran@gmail.com> | 2015-06-11 14:51:30 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-06-11 16:04:02 -0700 |
| commit | 58c98be137830d34b79024cc5dc95ef54fcd7ffe (patch) | |
| tree | b66c06d6b9e183b1cfda3f9d5c86e25bcd4aa298 /drivers/net/ethernet/intel/igb/igb_ptp.c | |
| parent | enic: fix memory leak in rq_clean (diff) | |
| download | linux-dev-58c98be137830d34b79024cc5dc95ef54fcd7ffe.tar.xz linux-dev-58c98be137830d34b79024cc5dc95ef54fcd7ffe.zip | |
net: igb: fix the start time for periodic output signals
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.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_ptp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index e3b9b63ad010..c3a9392cbc19 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -538,8 +538,8 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, 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 { |