Benoit Rat authored 5 years ago and Adam Wujek committed 5 years ago

- Check if we are in GM mode, if yes :
    - wait GM to be locked
    - Disable WR as kernel clock source
    - Increase retries for NTP
- Retries x time NTP until setting host time:
    - Set date from host to WR
    - Enable (back) WR as kernel clock source

Benoit Rat authored 5 years ago and Adam Wujek committed 5 years ago

By doing this we force to read again the FPGA register inside the loop
     and the compiler can not skip this loop thinking he is reading the
same value (that was not modified by him).

Conflicts:
	userspace/tools/wr_date.c

Benoit Rat authored 5 years ago and Adam Wujek committed 5 years ago

Fix TAI offset into kernel was done withing get function but this has
been removed in commit #091f4c8d. As it is still needed by slave, we
force its use using -n option. This will only fix tai offset into kernel
without applying ToD to WR/FPGA time.

Conflicts:
	userspace/tools/wr_date.c

Benoit Rat authored 5 years ago and Adam Wujek committed 5 years ago

Use gmtime instead of localtime (TAI should never used localtime)
Add verbose option to also display linux time

Benoit Rat authored 5 years ago and Adam Wujek committed 5 years ago

The output will be something like:

wr_date -v diff
TAI(HW)-UTC(SW): +36.602286
UTC(HW)-UTC(SW): -0.397714

Conflicts:
	userspace/tools/wr_date.c

Benoit Rat authored 5 years ago and Adam Wujek committed 5 years ago

In the previous version `wr_date get` would override kernel TAI time
(using local file) and this could cause some problems in case leap
second from /etc/leap-seconds.list was not the same than from PTP/WR
protocol.

Benoit Rat authored 5 years ago and Jean-Claude BAU committed 5 years ago

We have 37s of leap second but we were showing without usec the
following which could be seen as a wrong leap second offset.

WR time (TAI):     2019-03-15 05:40:48.006697
Switch time (UTC): 2019-03-15 05:40:10.975551

localtime has also been replaced by gmtime (TAI should never be
converted using localtime in case TZ variable is set)

Conflicts:
	userspace/tools/wr_mon.c

- Display in wr_mon the current timing mode and the PLL locking state
- Import PPsi changes related to this issue

- Increase up to 18 the number of SFPs and Fibers
- Add config parameter: CONFIG_N_SFP_ENTRIES (Number of SFP entries in
the DB)
- Add config parameter: CONFIG_N_FIBER_ENTRIES (Number of FIBER entries
in the DB)
- This 2 new parameters are used by HAL to parse the DB
- Use the TX SFP wave length as a key to retreive the SFP entry in the
DB

- New delayAsymCoeff and delayAsymmetry calculation
- Restart WR calibration when the PLL unlocks
- [BUG: 2] ptpdump wrongly shows Announce Msg parameters

The main change comes from the protocol detection state.

The logic used to control WR switch leds is removed from HAL and
imported into PPSi. It prevents HAL from reading PPSi shared memory.

Include again the commit:
[BUG: 1575] userspace: add "monitor" port parameter to HAL and snmp
74e16153



This time on top of HA

Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

baujc authored 6 years ago and Adam Wujek committed 5 years ago

The previous version expected that the "source" and "config" keys were
at the beginning of the line but it is not mandatory in the Kconfig
file.

baujc authored 6 years ago and Adam Wujek committed 5 years ago

- Better information display
- Change easily the timing mode

baujc authored 6 years ago and Adam Wujek committed 5 years ago

This feature is very useful when we reboot very often the switch
especially during the development process.

baujc authored 6 years ago and Adam Wujek committed 5 years ago

- Adapt the code to PPSi Kconfig changes
- Display the port link state
- Display the protocol used (Ext or PTP)

baujc authored 6 years ago and Adam Wujek committed 5 years ago

This library is used by wr_mon and wrs_dump_shmem to avoid duplication
of code.

baujc authored 6 years ago and Adam Wujek committed 5 years ago

- Add new option "stat" to display statistic about the evolution between
WR and Unix time
- When we set the WR time with the current UNIX time, the driver
wr_clocksource must be removed first and then reinstalled when the time
is set. If it is not done, the WR and Unix time are not well
synchronized.
- When the WR time is set, the sec and ns and set in one call. We don't
need to call twice the wr_date tool.

Jean-Claude BAU authored 6 years ago and Adam Wujek committed 5 years ago

The parameter was already present in pps.conf but not yet managed by
kconfig and the ppsi.conf generator

Jean-Claude BAU authored 6 years ago and Adam Wujek committed 5 years ago

This new parameter is used to control the configurable parameter
L1SyncOptParamsPortDS.timestampsCorrectedTx when
L1SyncBasicPortDS.optParamsEnabled is set to true.

Jean-Claude BAU authored 6 years ago and Adam Wujek committed 5 years ago

The profile is included in the port instance name. With the new profile
"custom", the port instance name become too big. So only the two first
letters of the profile are now included in the name.