Add nanosecond slewing to Linux driver

For offset adjustments below 10 microseconds use kernel PLL with
locked frequency and 1s time constant.

diff --git a/chrony_timex.h b/chrony_timex.h
index 6b8027b465205b778941d852cd5f0a27b1bc2306..870b5a9f212e6521cc23bccf9c9cf5f94e3a69b5 100644 (file)
--- a/chrony_timex.h
+++ b/chrony_timex.h
@@ -35,9 +35,12 @@ struct timex {
        int  :32; int  :32; int  :32; int  :32;
 };
 
+#define ADJ_OFFSET             0x0001  /* time offset */
 #define ADJ_FREQUENCY          0x0002  /* frequency offset */
 #define ADJ_MAXERROR           0x0004  /* maximum time error */
 #define ADJ_STATUS             0x0010  /* clock status */
+#define ADJ_TIMECONST          0x0020  /* pll time constant */
+#define ADJ_NANO               0x2000  /* select nanosecond resolution */
 #define ADJ_TICK               0x4000  /* tick value */
 #define ADJ_OFFSET_SINGLESHOT  0x8001  /* old-fashioned adjtime */
 #define ADJ_OFFSET_SS_READ     0xa001  /* read-only adjtime */
@@ -60,6 +63,7 @@ struct timex {
 #define STA_PPSERROR   0x0800  /* PPS signal calibration error (ro) */
 
 #define STA_CLOCKERR   0x1000  /* clock hardware fault (ro) */
+#define STA_NANO       0x2000  /* resolution (0 = us, 1 = ns) (ro) */
 
 /* This doesn't seem to be in any include files !! */
 

diff --git a/sys_linux.c b/sys_linux.c
index 5a7b51fa13414fb2ecc023316d5c6dee38901d40..24b9eac6e09a0f4ebcf4387babba5d4cadd36100 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -113,6 +113,11 @@ txc.modes is set to ADJ_OFFSET_SS_READ. */
 
 static int have_readonly_adjtime;
 
+/* Flag indicating whether kernel supports PLL in nanosecond resolution.
+   If supported, it will be used instead of adjtime() for very small
+   adjustments. */
+static int have_nanopll;
+
 /* ================================================== */
 
 static void handle_end_of_slew(void *anything);
@@ -137,6 +142,9 @@ static double offset_register;
 /* Flag set true if an adjtime slew was started and still may be running */
 static int slow_slewing;
 
+/* Flag set true if a PLL nano slew was started and still may be running */
+static int nano_slewing;
+
 /* Flag set true if a fast slew (one done by altering tick) is being
    run at the moment */
 static int fast_slewing;
@@ -173,6 +181,9 @@ static double delta_total_tick;
    assuming it is resync'ed about once per day. (TBC) */
 #define MAX_ADJUST_WITH_ADJTIME (0.2)
 
+/* Max amount of time that should be adjusted by kernel PLL */
+#define MAX_ADJUST_WITH_NANOPLL (1.0e-5)
+
 /* The amount by which we alter 'tick' when doing a large slew */
 static int slew_delta_tick;
 
@@ -185,6 +196,11 @@ static int max_tick_bias;
 static struct timeval slow_slew_error_end;
 static int slow_slew_error;
 
+/* Timeval at which the latest nano PLL adjustment was started and maximum
+   offset correction error it can cause */
+static struct timeval nano_slew_error_start;
+static int nano_slew_error;
+
 /* The latest time at which 'tick' in kernel may be actually updated
    and maximum offset correction error it can cause */
 static struct timeval fast_slew_error_end;
@@ -245,6 +261,48 @@ get_slow_slew_error(struct timeval *now)
   return left > 0.0 ? slow_slew_error / 1e6 : 0.0;
 }
 
+static void
+update_nano_slew_error(long offset, int new)
+{
+  struct timezone tz;
+  struct timeval now;
+  double ago;
+
+  if (offset == 0 && nano_slew_error == 0)
+    return;
+
+  if (gettimeofday(&now, &tz) < 0) {
+    CROAK("gettimeofday() failed");
+  }
+
+  /* maximum error in offset reported by adjtimex, assuming PLL constant 0 
+     and SHIFT_PLL = 2 */
+  offset /= new ? 4 : 3;
+  if (offset < 0)
+    offset = -offset;
+
+  UTI_DiffTimevalsToDouble(&ago, &now, &nano_slew_error_start);
+  if (ago > 1.1) {
+    if (!new && nano_slew_error > offset)
+      nano_slew_error = offset;
+  } else {
+    if (nano_slew_error < offset)
+      nano_slew_error = offset;
+  }
+
+  if (new)
+    nano_slew_error_start = now;
+}
+
+static double
+get_nano_slew_error(void)
+{
+  if (nano_slew_error == 0)
+    return 0.0;
+
+  return nano_slew_error / 1e9;
+}
+
 static void
 update_fast_slew_error(struct timeval *now)
 {
@@ -376,7 +434,7 @@ initiate_slew(void)
     return;
   }
 
-  /* Cancel any standard adjtime that is running */
+  /* Cancel any slewing that is running */
   if (slow_slewing) {
     offset = 0;
     if (TMX_ApplyOffset(&offset) < 0) {
@@ -385,13 +443,35 @@ initiate_slew(void)
     offset_register -= (double) offset / 1.0e6;
     slow_slewing = 0;
     update_slow_slew_error(0);
+  } else if (nano_slewing) {
+    if (TMX_GetPLLOffsetLeft(&offset) < 0) {
+      CROAK("adjtimex() failed in accrue_offset");
+    }
+    offset_register -= (double) offset / 1.0e9;
+
+    offset = 0;
+    if (TMX_ApplyPLLOffset(offset) < 0) {
+      CROAK("adjtimex() failed in accrue_offset");
+    }
+    nano_slewing = 0;
+    update_nano_slew_error(offset, 1);
   }
 
-  if (fabs(offset_register) < MAX_ADJUST_WITH_ADJTIME) {
+  if (have_nanopll && fabs(offset_register) < MAX_ADJUST_WITH_NANOPLL) {
+    /* Use PLL with fixed frequency to do the shift */
+    offset = 1.0e9 * -offset_register;
+
+    if (TMX_ApplyPLLOffset(offset) < 0) {
+      CROAK("adjtimex() failed in accrue_offset");
+    }
+    offset_register = 0.0;
+    nano_slewing = 1;
+    update_nano_slew_error(offset, 1);
+  } else if (fabs(offset_register) < MAX_ADJUST_WITH_ADJTIME) {
     /* Use adjtime to do the shift */
     offset = our_round(1.0e6 * -offset_register);
 
-    offset_register += offset * 1e-6;
+    offset_register += offset / 1.0e6;
 
     if (offset != 0) {
       if (TMX_ApplyOffset(&offset) < 0) {
@@ -666,14 +746,14 @@ get_offset_correction(struct timeval *raw,
   /* Correction is given by these things :
      1. Any value in offset register
      2. Amount of fast slew remaining
-     3. Any amount of adjtime correction remaining */
+     3. Any amount of adjtime correction remaining
+     4. Any amount of nanopll correction remaining */
 
 
-  double adjtime_left;
   double fast_slew_duration;
   double fast_slew_achieved;
   double fast_slew_remaining;
-  long offset, toffset;
+  long offset, noffset, toffset;
 
   if (!slow_slewing) {
     offset = 0;
@@ -708,10 +788,19 @@ get_offset_correction(struct timeval *raw,
       slow_slewing = 0;
     }
   }
-
   update_slow_slew_error(offset);
 
-  adjtime_left = (double)offset / 1.0e6;
+  if (!nano_slewing) {
+    noffset = 0;
+  } else {
+    if (TMX_GetPLLOffsetLeft(&noffset) < 0) {
+      CROAK("adjtimex() failed in get_offset_correction");
+    }
+    if (noffset == 0) {
+      nano_slewing = 0;
+    }
+  }
+  update_nano_slew_error(noffset, 0);
 
   if (fast_slewing) {
     UTI_DiffTimevalsToDouble(&fast_slew_duration, raw, &slew_start_tv);
@@ -722,8 +811,8 @@ get_offset_correction(struct timeval *raw,
     fast_slew_remaining = 0.0;
   }  
 
-  *corr = - (offset_register + fast_slew_remaining) + adjtime_left;
-  *err = get_slow_slew_error(raw) + get_fast_slew_error(raw);
+  *corr = - (offset_register + fast_slew_remaining) + offset / 1.0e6 + noffset / 1.0e9;
+  *err = get_slow_slew_error(raw) + get_fast_slew_error(raw) + get_nano_slew_error();;
 
   return;
 }
@@ -867,6 +956,8 @@ get_version_specific_details(void)
   version_major = major;
   version_minor = minor;
   version_patchlevel = patch;
+
+  have_nanopll = 0;
   
   switch (major) {
     case 1:
@@ -942,6 +1033,7 @@ get_version_specific_details(void)
           /* These don't seem to need scaling */
           freq_scale = 1.0;
           have_readonly_adjtime = 2;
+          have_nanopll = 1;
           break;
         default:
           LOG_FATAL(LOGF_SysLinux, "Kernel version not supported yet, sorry.");
@@ -992,6 +1084,11 @@ SYS_Linux_Initialise(void)
     have_readonly_adjtime = 0;
   }
 
+  if (have_nanopll && TMX_EnableNanoPLL() < 0) {
+    LOG(LOGS_INFO, LOGF_SysLinux, "adjtimex() doesn't support nanosecond PLL");
+    have_nanopll = 0;
+  }
+
   TMX_SetSync(CNF_GetRTCSync());
 }
 

diff --git a/wrap_adjtimex.c b/wrap_adjtimex.c
index f34f477fd88f1541e41a7cdec850b602fa4c3aeb..6e782daf28819224d6eff03fd0a946cf353f6b4e 100644 (file)
--- a/wrap_adjtimex.c
+++ b/wrap_adjtimex.c
@@ -74,8 +74,6 @@ TMX_SetFrequency(double *freq, long tick)
   txc.freq = (long)(*freq * (double)(1 << SHIFT_USEC));
   *freq = txc.freq / (double)(1 << SHIFT_USEC);
   txc.tick = tick;
-
-  /* Prevent any of the FLL/PLL stuff coming up */
   txc.status = status; 
 
   if (!(status & STA_UNSYNC)) {
@@ -201,5 +199,46 @@ int TMX_SetSync(int sync)
   return adjtimex(&txc);
 }
 
+int
+TMX_EnableNanoPLL(void)
+{
+  struct timex txc;
+  int result;
+
+  txc.modes = ADJ_STATUS | ADJ_OFFSET | ADJ_TIMECONST | ADJ_NANO;
+  txc.status = STA_PLL | STA_FREQHOLD;
+  txc.offset = 0;
+  txc.constant = 0;
+  result = adjtimex(&txc);
+  if (result < 0 || !(txc.status & STA_NANO) || txc.offset || txc.constant)
+    return -1;
+
+  status |= STA_PLL | STA_FREQHOLD;
+  return result;
+}
+
+int
+TMX_ApplyPLLOffset(long offset)
+{
+  struct timex txc;
+
+  txc.modes = ADJ_OFFSET | ADJ_TIMECONST | ADJ_NANO;
+  txc.offset = offset;
+  txc.constant = 0;
+  return adjtimex(&txc);
+}
+
+int
+TMX_GetPLLOffsetLeft(long *offset)
+{
+  struct timex txc;
+  int result;
+
+  txc.modes = 0;
+  result = adjtimex(&txc);
+  *offset = txc.offset;
+  return result;
+}
+
 #endif
 

diff --git a/wrap_adjtimex.h b/wrap_adjtimex.h
index 45c79def9033c5bdbf6d934b2afebd5ff338aa30..fa5885e135bd54bafff5d8f44a866ea634e4d519 100644 (file)
--- a/wrap_adjtimex.h
+++ b/wrap_adjtimex.h
@@ -77,6 +77,9 @@ int TMX_GetOffsetLeft(long *offset);
 int TMX_ReadCurrentParams(struct tmx_params *params);
 int TMX_SetLeap(int leap);
 int TMX_SetSync(int sync);
+int TMX_EnableNanoPLL(void);
+int TMX_ApplyPLLOffset(long offset);
+int TMX_GetPLLOffsetLeft(long *offset);
 
 #endif  /* GOT_WRAP_ADJTIMEX_H */