faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sys_linux: add support for PTP_SYS_OFFSET_PRECISE

Browse source 
This is for hardware that can precisely cross timestamp the PHC with the
system clock.
This commit is contained in:
Miroslav Lichvar 2017-01-19 16:05:49 +01:00
parent 9df4d36157
commit 31b6a14444
4 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ntp_io_linux.c
View file

@ -368,7 +368,7 @@ process_hw_timestamp(struct Interface *iface, struct timespec *hw_ts,
int l2_length; int l2_length;
if (HCL_NeedsNewSample(iface->clock, &local_ts->ts)) { if (HCL_NeedsNewSample(iface->clock, &local_ts->ts)) {
if (!SYS_Linux_GetPHCSample(iface->phc_fd, iface->precision, &iface->phc_mode, if (!SYS_Linux_GetPHCSample(iface->phc_fd, 0, iface->precision, &iface->phc_mode,
&sample_phc_ts, &sample_sys_ts, &err)) &sample_phc_ts, &sample_sys_ts, &err))
return; return;

2
refclock_phc.c
View file

@ -83,7 +83,7 @@ static int phc_poll(RCL_Instance instance)
phc = (struct phc_instance *)RCL_GetDriverData(instance); phc = (struct phc_instance *)RCL_GetDriverData(instance);
if (!SYS_Linux_GetPHCSample(phc->fd, RCL_GetPrecision(instance), &phc->mode, if (!SYS_Linux_GetPHCSample(phc->fd, 0, RCL_GetPrecision(instance), &phc->mode,
&phc_ts, &sys_ts, &err)) &phc_ts, &sys_ts, &err))
return 0; return 0;

40
sys_linux.c
View file

@ -517,6 +517,9 @@ SYS_Linux_EnableSystemCallFilter(int level)
FIONREAD, TCGETS, FIONREAD, TCGETS,
#if defined(FEAT_PHC) || defined(HAVE_LINUX_TIMESTAMPING) #if defined(FEAT_PHC) || defined(HAVE_LINUX_TIMESTAMPING)
PTP_SYS_OFFSET, PTP_SYS_OFFSET,
#ifdef PTP_SYS_OFFSET_PRECISE
PTP_SYS_OFFSET_PRECISE,
#endif
#endif #endif
#ifdef FEAT_PPS #ifdef FEAT_PPS
PPS_FETCH, PPS_FETCH,
@ -729,6 +732,35 @@ get_phc_sample(int phc_fd, double precision, struct timespec *phc_ts,
return 1; return 1;
} }
/* ================================================== */
static int
get_precise_phc_sample(int phc_fd, double precision, struct timespec *phc_ts,
struct timespec *sys_ts, double *err)
{
#ifdef PTP_SYS_OFFSET_PRECISE
struct ptp_sys_offset_precise sys_off;
/* Silence valgrind */
memset(&sys_off, 0, sizeof (sys_off));
if (ioctl(phc_fd, PTP_SYS_OFFSET_PRECISE, &sys_off)) {
DEBUG_LOG(LOGF_SysLinux, "ioctl(%s) failed : %s", "PTP_SYS_OFFSET_PRECISE",
strerror(errno));
return 0;
}
phc_ts->tv_sec = sys_off.device.sec;
phc_ts->tv_nsec = sys_off.device.nsec;
sys_ts->tv_sec = sys_off.sys_realtime.sec;
sys_ts->tv_nsec = sys_off.sys_realtime.nsec;
*err = MAX(LCL_GetSysPrecisionAsQuantum(), precision);
return 1;
#else
return 0;
#endif
}
/* ================================================== */ /* ================================================== */
@ -766,10 +798,14 @@ SYS_Linux_OpenPHC(const char *path, int phc_index)
/* ================================================== */ /* ================================================== */
int int
SYS_Linux_GetPHCSample(int fd, double precision, int *reading_mode, SYS_Linux_GetPHCSample(int fd, int nocrossts, double precision, int *reading_mode,
struct timespec *phc_ts, struct timespec *sys_ts, double *err) struct timespec *phc_ts, struct timespec *sys_ts, double *err)
{ {
if ((*reading_mode == 1 || !*reading_mode) && if ((*reading_mode == 2 || !*reading_mode) && !nocrossts &&
get_precise_phc_sample(fd, precision, phc_ts, sys_ts, err)) {
*reading_mode = 2;
return 1;
} else if ((*reading_mode == 1 || !*reading_mode) &&
get_phc_sample(fd, precision, phc_ts, sys_ts, err)) { get_phc_sample(fd, precision, phc_ts, sys_ts, err)) {
*reading_mode = 1; *reading_mode = 1;
return 1; return 1;

2
sys_linux.h
View file

@ -43,7 +43,7 @@ extern int SYS_Linux_CheckKernelVersion(int req_major, int req_minor);
extern int SYS_Linux_OpenPHC(const char *path, int phc_index); extern int SYS_Linux_OpenPHC(const char *path, int phc_index);
extern int SYS_Linux_GetPHCSample(int fd, double precision, int *reading_mode, extern int SYS_Linux_GetPHCSample(int fd, int nocrossts, double precision, int *reading_mode,
struct timespec *phc_ts, struct timespec *sys_ts, double *err); struct timespec *phc_ts, struct timespec *sys_ts, double *err);
#endif /* GOT_SYS_LINUX_H */ #endif /* GOT_SYS_LINUX_H */