[BUG: 1627] proto-ext-whiterabbit: fix pps for links longer than ~13km

For links longer than ~13km, a value (uint32_t) returned from a function __div64_32 shifted by 16 bits overflowed, introducing PPS offset. Bug introduced in the commit: 35eef679 time: introduce a new unified data structure Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

[BUG: 1627] proto-ext-whiterabbit: fix pps for links longer than ~13km
For links longer than ~13km, a value (uint32_t) returned from a function __div64_32 shifted by 16 bits overflowed, introducing PPS offset. Bug introduced in the commit: 35eef679 time: introduce a new unified data structure Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
aff58d83 · Adam Wujek · 5856bd77 · aff58d83
Commit aff58d83 authored Aug 01, 2017 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

wr-servo.c proto-ext-whiterabbit/wr-servo.c +1 -1

No files found.
--- a/proto-ext-whiterabbit/wr-servo.c
+++ b/proto-ext-whiterabbit/wr-servo.c
@@ -80,7 +80,7 @@ static void picos_to_ts(int64_t picos, struct pp_time *ts)
 	phase = __div64_32(&nsec, 1000);
 	sec = nsec;

-	ts->scaled_nsecs = __div64_32(&sec, PP_NSEC_PER_SEC) << 16;
+	ts->scaled_nsecs = ((int64_t)__div64_32(&sec, PP_NSEC_PER_SEC)) << 16;
 	ts->scaled_nsecs += (phase << 16) / 1000;
 	ts->scaled_nsecs *= sign;
 	ts->secs = sec * sign;