Merge remote-tracking branch 'origin/hm-wrsfl' into hm-wrsfl-lowjitter

Support aligning the PPS out to PPS input when WRSFL works as GM.

Merge remote-tracking branch 'origin/hm-wrsfl' into hm-wrsfl-lowjitter
Support aligning the PPS out to PPS input when WRSFL works as GM.
aae3fe04 · li hongming · d4d8d2c8 · 429c2ef5 · aae3fe04 · aae3fe04
Commit aae3fe04 authored Nov 28, 2018 by li hongming
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

softpll_export.h softpll/softpll_export.h +3 -1

spll_external.c softpll/spll_external.c +2 -2

spll_external.h softpll/spll_external.h +4 -4

No files found.
--- a/softpll/softpll_export.h
+++ b/softpll/softpll_export.h
@@ -57,7 +57,7 @@
 #define ALIGN_STATE_WAIT_CLKIN 9
 #define ALIGN_STATE_WAIT_PLOCK 10

-#define SPLL_STATS_VER 3
+#define SPLL_STATS_VER 4

 /* info reported through .stat section */
 /* due to endiannes problem strings has to be 4 bytes alligned */
@@ -78,6 +78,8 @@ struct spll_stats {
 	char build_date[16];
 	char build_time[16];
 	char build_by[32];
+
+	int ext_pps_latency_ps; // added by hm
 };

 extern struct spll_stats stats;

--- a/softpll/spll_external.c
+++ b/softpll/spll_external.c
@@ -20,7 +20,7 @@

 #define EXT_PERIOD_NS 100
 #define EXT_FREQ_HZ 10000000
-#define EXT_PPS_LATENCY_PS 63000 // fixme: make configurable
+//#define EXT_PPS_LATENCY_PS 63000 // fixme: make configurable


 void external_init(volatile struct spll_external_state *s, int ext_ref,
@@ -180,7 +180,7 @@ int external_align_fsm(volatile struct spll_external_state *s)
 					s->align_shift += s->align_step;
 					mpll_set_phase_shift(s->main, s->align_shift);
 				} else if (v == s->align_target) {
-					s->align_shift += EXT_PPS_LATENCY_PS;
+					s->align_shift += stats.ext_pps_latency_ps;
 				mpll_set_phase_shift(s->main, s->align_shift);
 					s->align_state = ALIGN_STATE_COMPENSATE_DELAY;
 				}

--- a/softpll/spll_external.h
+++ b/softpll/spll_external.h
@@ -19,13 +19,13 @@ struct spll_external_state {
 	struct spll_helper_state *helper;
 	struct spll_main_state *main;

-  int enabled;
+	int enabled;

 	int align_state;
 	int align_timer;
-  int align_target;
-  int align_step;
-  int align_shift;
+	int align_target;
+	int align_step;
+	int align_shift;
 };

 void external_init(volatile struct spll_external_state *s, int ext_ref,