Excellent series. I know that some of the Intel hardware has measurable delays, and we were thinking of whether it was better to hack the driver for this delay, but being able to do it generically here is a good way to avoid having to modify the driver for this.
Thanks, Jake > -----Original Message----- > From: Richard Cochran [mailto:richardcoch...@gmail.com] > Sent: Saturday, December 06, 2014 1:59 PM > To: linuxptp-devel@lists.sourceforge.net > Subject: [Linuxptp-devel] [PATCH RFC 4/4] port: correct transmit and > receive time stamps for their calibrated delays. > > Signed-off-by: Richard Cochran <richardcoch...@gmail.com> > --- > port.c | 33 +++++++++++++++++++++++++++++++-- > 1 file changed, 31 insertions(+), 2 deletions(-) > > diff --git a/port.c b/port.c > index 25265f7..aa9354b 100644 > --- a/port.c > +++ b/port.c > @@ -313,6 +313,22 @@ static void fc_prune(struct foreign_clock *fc) > } > } > > +static void ts_add(struct timespec *ts, int ns) > +{ > + if (!ns) { > + return; > + } > + ts->tv_nsec += ns; > + while (ts->tv_nsec < 0) { > + ts->tv_nsec += (long) NS_PER_SEC; > + ts->tv_sec--; > + } > + while (ts->tv_nsec >= (long) NS_PER_SEC) { > + ts->tv_nsec -= (long) NS_PER_SEC; > + ts->tv_sec++; > + } > +} > + > static void ts_to_timestamp(struct timespec *src, struct Timestamp *dst) > { > dst->seconds_lsb = src->tv_sec; > @@ -492,7 +508,13 @@ static int peer_prepare_and_send(struct port *p, > struct ptp_message *msg, > return -1; > } > cnt = transport_peer(p->trp, &p->fda, event, msg); > - return cnt <= 0 ? -1 : 0; > + if (cnt <= 0) { > + return -1; > + } > + if (msg_sots_valid(msg)) { > + ts_add(&msg->hwts.ts, p->pod.tx_timestamp_offset); > + } > + return 0; > } > > static int port_capable(struct port *p) > @@ -2189,6 +2211,7 @@ enum fsm_event port_event(struct port *p, int > fd_index) > return EV_NONE; > } > if (msg_sots_valid(msg)) { > + ts_add(&msg->hwts.ts, -p->pod.rx_timestamp_offset); > clock_check_ts(p->clock, msg->hwts.ts); > } > if (port_ignore(p, msg)) { > @@ -2258,7 +2281,13 @@ int port_prepare_and_send(struct port *p, > struct ptp_message *msg, int event) > if (msg_pre_send(msg)) > return -1; > cnt = transport_send(p->trp, &p->fda, event, msg); > - return cnt <= 0 ? -1 : 0; > + if (cnt <= 0) { > + return -1; > + } > + if (msg_sots_valid(msg)) { > + ts_add(&msg->hwts.ts, p->pod.tx_timestamp_offset); > + } > + return 0; > } > > struct PortIdentity port_identity(struct port *p) > -- > 1.7.10.4 > > > ------------------------------------------------------------------------------ > Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server > from Actuate! Instantly Supercharge Your Business Reports and Dashboards > with Interactivity, Sharing, Native Excel Exports, App Integration & more > Get technology previously reserved for billion-dollar corporations, FREE > http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg. > clktrk > _______________________________________________ > Linuxptp-devel mailing list > Linuxptp-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linuxptp-devel ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Linuxptp-devel mailing list Linuxptp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
