Skip to content

P
PPSi
Commit c1e3299a authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

white rabbit: fix generation of pps out 

This centralizes a "software" enable timing output, that calls the
"hardware" one (previous code) while keeping track of the status.

With non-wr the pps output is always enabled if the offset from
master is less than 1s.
Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent c2930876
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 15 deletions
arch-wrpc/wrpc-spll.c
View file @ c1e3299a
...@@ -91,7 +91,7 @@ int wr_locking_disable(struct pp_instance *ppi) ...@@ -91,7 +91,7 @@ int wr_locking_disable(struct pp_instance *ppi)
int wr_enable_ptracker(struct pp_instance *ppi) int wr_enable_ptracker(struct pp_instance *ppi)
__attribute__((alias("wrpc_spll_enable_ptracker"))); __attribute__((alias("wrpc_spll_enable_ptracker")));
int wr_enable_timing_output(struct pp_instance *ppi, int enable) int __wr_enable_timing_output(struct pp_instance *ppi, int enable)
__attribute__((alias("wrpc_enable_timing_output"))); __attribute__((alias("wrpc_enable_timing_output")));
int wr_adjust_in_progress() int wr_adjust_in_progress()
......
proto-ext-whiterabbit/hooks.c
View file @ c1e3299a
...@@ -15,6 +15,7 @@ static int wr_init(struct pp_instance *ppi, unsigned char *pkt, int plen) ...@@ -15,6 +15,7 @@ static int wr_init(struct pp_instance *ppi, unsigned char *pkt, int plen)
wp->parentWrConfig = NON_WR; wp->parentWrConfig = NON_WR;
wp->parentWrModeOn = 0; wp->parentWrModeOn = 0;
wp->calibrated = !WR_DEFAULT_PHY_CALIBRATION_REQUIRED; wp->calibrated = !WR_DEFAULT_PHY_CALIBRATION_REQUIRED;
wr_enable_timing_output(ppi, 0);
return 0; return 0;
} }
...@@ -120,22 +121,20 @@ static int wr_handle_resp(struct pp_instance *ppi) ...@@ -120,22 +121,20 @@ static int wr_handle_resp(struct pp_instance *ppi)
* we'll have the Unix time instead, marked by "correct" * we'll have the Unix time instead, marked by "correct"
*/ */
if (!WR_DSPOR(ppi)->wrModeOn) { if (!WR_DSPOR(ppi)->wrModeOn) {
Boolean pps_out;
if (!ppi->t2.correct || !ppi->t3.correct) { if (!ppi->t2.correct || !ppi->t3.correct) {
pp_diag(ppi, servo, 1, pp_diag(ppi, servo, 1,
"T2 or T3 incorrect, discarding tuple\n"); "T2 or T3 incorrect, discarding tuple\n");
return 0; return 0;
} }
pp_servo_got_resp(ppi); pp_servo_got_resp(ppi);
/* pps always on; until we have a configurable threshold */ /*
if (ofm /* ->seconds || ... */) * pps always on if offset less than 1 second,
pps_out = 1; * until ve have a configurable threshold */
if (ofm->seconds)
/* Only act on changes, so hackers can force it on manually */ wr_enable_timing_output(ppi, 0);
if (pps_out != WR_DSPOR(ppi)->ppsOutputOn) else
wr_enable_timing_output(ppi, pps_out); wr_enable_timing_output(ppi, 1);
WR_DSPOR(ppi)->ppsOutputOn = pps_out;
} }
wr_servo_got_delay(ppi, hdr->correctionfield.lsb); wr_servo_got_delay(ppi, hdr->correctionfield.lsb);
wr_servo_update(ppi); wr_servo_update(ppi);
......
proto-ext-whiterabbit/wr-api.h
View file @ c1e3299a
...@@ -106,7 +106,9 @@ int wr_read_calibration_data(struct pp_instance *ppi, ...@@ -106,7 +106,9 @@ int wr_read_calibration_data(struct pp_instance *ppi,
int wr_enable_ptracker(struct pp_instance *ppi); int wr_enable_ptracker(struct pp_instance *ppi);
/* The former is called by ppsi, the latter is the internal hw detail */
int wr_enable_timing_output(struct pp_instance *ppi, int enable); int wr_enable_timing_output(struct pp_instance *ppi, int enable);
int __wr_enable_timing_output(struct pp_instance *ppi, int enable);
int wr_adjust_in_progress(void); int wr_adjust_in_progress(void);
int wr_adjust_counters(int64_t adjust_sec, int32_t adjust_nsec); int wr_adjust_counters(int64_t adjust_sec, int32_t adjust_nsec);
......
proto-ext-whiterabbit/wr-servo.c
View file @ c1e3299a
...@@ -32,6 +32,15 @@ void wr_servo_enable_tracking(int enable) ...@@ -32,6 +32,15 @@ void wr_servo_enable_tracking(int enable)
tracking_enabled = enable; tracking_enabled = enable;
} }
int wr_enable_timing_output(struct pp_instance *ppi, int enable)
{
/* Only act on changes, so hackers can force it on manually */
if (enable != WR_DSPOR(ppi)->ppsOutputOn)
__wr_enable_timing_output(ppi, enable);
WR_DSPOR(ppi)->ppsOutputOn = enable;
return 0;
}
/* my own timestamp arithmetic functions */ /* my own timestamp arithmetic functions */
static void dump_timestamp(struct pp_instance *ppi, char *what, TimeInternal ts) static void dump_timestamp(struct pp_instance *ppi, char *what, TimeInternal ts)
...@@ -141,11 +150,8 @@ static int got_sync = 0; ...@@ -141,11 +150,8 @@ static int got_sync = 0;
void wr_servo_reset() void wr_servo_reset()
{ {
// shw_pps_gen_enable_output(0); /* fixme: unportable */
cur_servo_state.valid = 0; cur_servo_state.valid = 0;
servo_state_valid = 0; servo_state_valid = 0;
// ptpd_netif_enable_timing_output(0);
} }
int wr_servo_init(struct pp_instance *ppi) int wr_servo_init(struct pp_instance *ppi)
......
time-wrs/wrs-time.c
View file @ c1e3299a
...@@ -151,7 +151,7 @@ int wr_locking_disable(struct pp_instance *ppi) ...@@ -151,7 +151,7 @@ int wr_locking_disable(struct pp_instance *ppi)
int wr_enable_ptracker(struct pp_instance *ppi) int wr_enable_ptracker(struct pp_instance *ppi)
__attribute__((alias("wrs_enable_ptracker"))); __attribute__((alias("wrs_enable_ptracker")));
int wr_enable_timing_output(struct pp_instance *ppi, int enable) int __wr_enable_timing_output(struct pp_instance *ppi, int enable)
__attribute__((alias("wrs_enable_timing_output"))); __attribute__((alias("wrs_enable_timing_output")));
int wr_adjust_in_progress() int wr_adjust_in_progress()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment