Pull in the following upstream commits for both CentOS and Debian:
7824b13db9/
270709323a/
dadd2593c7/
e8dc364f9f/
See the patches themselves for more details.
Closes-Bug: 1983022
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
Change-Id: I20f18b17752588b5b031eed88b5e52fb15c830fa
This change updates the linuxptp package to tag 3.1.1-4, the closest to
CentOS version currently available for Debian. With this update, no
deb_patches are necessary anymore since the same revert was performed
upstream (see
051d5f6833 (9c96da0e9f91d7d8937b69b524702c106258f0d1_1_4)
).
Test Plan:
PASS: Fresh install of Debian build and checked the correct version of
linuxptp package was installed.
Task: 45474
Story: 2009965
Signed-off-by: Douglas Henrique Koerich <douglashenrique.koerich@windriver.com>
Change-Id: Iab53525b9b16e7f11c415bf9284872a404eb60b0
When running the build-image commmand linuxptp gets installed
first which satisfy the time-daemon virtual dependency before
ntp gets installed. As a result the ISO build will fail because
of the conflicted linuxptp package.
Test Plan
Pass: build test
Pass: install image
Pass: boot up on qemu
Story: 2009221
Task: 44053
Signed-off-by: Charles Short <charles.short@windriver.com>
Change-Id: Id18aa5fb23d0fb8a5aa3582aed711dbed1339075
Porting all patches from CentOS.
Using the version 3.1.1-2 to align with CentOS version rather than
the default version 3.1-2.1 of Debian Bullseye.
Test Plan: building, install and booting
Pass: build test
Pass: install image
Pass: boot up on qemu
Story: 2009221
Task: 44053
Signed-off-by: Yue Tao <yue.tao@windriver.com>
Change-Id: I599f9244efe405a8b477d266696f4ac734aef6b5
We use the CentOS 8 version of the source package
and apply the same six patches that we applied to
the previous version, with one caveat. Patch 3
had an additional test in it of the uncalibrated
state, and this test does not exist in the upstream
version of the patch. Now patch 3 is identical
to the upstream version.
All five upstream patches have been refreshed to
what was actually accepted upstream and thus now
contain proper git headers. The logic of those
five patches remain as they were, with the one
exception noted in the previous paragraph.
Patch 6 has also now been given a proper git header.
Change-Id: Ifd44680d2f190dc0c5662bd05bd214fccf50a2fd
Story: 2009130
Task: 43199
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
This commit applies several patches to the linuxptp srpm in order to
address an issue syncing multiple interfaces on a ptp node. The srpm
used is linuxptp-2.0-2.el7.src.rpm.
Patch descriptions:
base/linuxptp/centos/meta_patches:
0001 updates the srpm spec file to apply the patches during build
0002 updates the package versioning to comply with the STX format
base/linuxptp/centos/patches:
Patches 0001-0005 combine to correct a fault present when a ptp node is
configured with multiple clocks in jbod mode which results in the client
port getting stuck in the UNCALIBRATED state and unable to lock to the
Grandmaster clock. The root of the issue lies in the sanity check where
checking timestamps recieved on multiple ports will result in the
sanity_freq_limit threshold constantly being reached and the servo for
that port is repeatedly reset, preventing it from ever syncing.
The changes in patches 0001-0005 have been written by Miroslav Lichvar
on the linuxptp-devel mailing list. They are currently under review and
testing by the upstream linuxptp maintainers prior to merging. I was
able to apply them as-is to linuxptp v2.0. I have chosen to keep them as
individual patches, as that is how they will appear upstream.
Patch 0006 is my work and serves to address an issue in phc2sys
where the local ptp clocks are not synced together properly if the local
time is far behind the reference time. This issue ocurrs when phc2sys
starts and there is no client port currently synced to a grandmaster. In
the original behaviour, phc2sys selects the first configured port and
proceeds to sync all of the other clocks to it by performing the
first_step operation.
Then ptp4l will evenually lock to the Grandmaster clock, and that
single port will have its time updated to the correct value, but
phc2sys has already performed the first_step operation and will not
step the other clocks again.
My solution is to provide an option to disable the selection of a
default port by phc2sys. When no default port is selected, phc2sys waits
for ptp4l to sync to the Grandmaster before bringing the other clocks
into sync with the first_step operation.
This option is configured via the default_sync
parameter or the -D flag. The default_sync parameter is set to on by
default to in order to keep the behaviour the same as upstream linuxptp
but can be configured by users via
system service-parameter-add ptp global default_sync=0
Closes-Bug: 1930607
Signed-off-by: Cole Walker <cole.walker@windriver.com>
Change-Id: I2f660787c6753dcd4fc4c51da7b08ab9e6f197f4