From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1eHvOh-00029d-Az for ptxdist@pengutronix.de; Thu, 23 Nov 2017 18:34:47 +0100 Received: from mgr by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1eHvOg-0005mA-R7 for ptxdist@pengutronix.de; Thu, 23 Nov 2017 18:34:46 +0100 Date: Thu, 23 Nov 2017 18:34:46 +0100 From: Michael Grzeschik Message-ID: <20171123173446.76bef53sceytaaep@pengutronix.de> References: <20171122121359.9020-1-m.grzeschik@pengutronix.de> MIME-Version: 1.0 In-Reply-To: <20171122121359.9020-1-m.grzeschik@pengutronix.de> Subject: Re: [ptxdist] [PATCH v3] linuxptp: Update package and configs List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: multipart/mixed; boundary="===============1772045781==" Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de --===============1772045781== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="faalvi3hehotstho" Content-Disposition: inline --faalvi3hehotstho Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 22, 2017 at 01:13:59PM +0100, Michael Grzeschik wrote: > Usualy we can not ensure only to use transparent clock switches. > Therefor we setup the fix option -P to the commandline to enable > the P2P mechanism in ptp4l. >=20 > The following options are highly depending on the usecase > so we remove them for the defaults. >=20 > path_trace_enabled > follow_up_info > tx_timestamp_timeout >=20 > With all other options were simple defaults the whole > config can be removed. >=20 > We also add some service files to start the ptp4l service on > dev eth0. In case the ptp4l daemon is configured > we add the option to install the phc2sys daemon to adjust the > system time by the ptp master. >=20 > Signed-off-by: Michael Grzeschik > --- > v1 -> v2: - removed install stage for gPTP.conf from rules file > - limited to run ptp4l only on eth0 for the default setup case >=20 > v2 -> v3: - removed second -r option in phc2sys rule > - changed systemd rule for ptp4l to static configuration >=20 > projectroot/etc/gPTP.conf | 28 ----------------= ------ > projectroot/usr/lib/systemd/system/phc2sys.service | 10 ++++++++ > projectroot/usr/lib/systemd/system/ptp4l.service | 12 ++++++++++ > rules/linuxptp.in | 12 ++++++++++ > rules/linuxptp.make | 20 +++++++++++++--- > 5 files changed, 51 insertions(+), 31 deletions(-) > delete mode 100644 projectroot/etc/gPTP.conf > create mode 100644 projectroot/usr/lib/systemd/system/phc2sys.service > create mode 100644 projectroot/usr/lib/systemd/system/ptp4l.service >=20 > diff --git a/projectroot/etc/gPTP.conf b/projectroot/etc/gPTP.conf > deleted file mode 100644 > index 5bbbaf288..000000000 > --- a/projectroot/etc/gPTP.conf > +++ /dev/null > @@ -1,28 +0,0 @@ > -[global] > -# > -# Run time options > -# > -assume_two_step 1 > -logging_level 6 > -path_trace_enabled 1 > -follow_up_info 1 > -tx_timestamp_timeout 40 > -use_syslog 1 > -verbose 0 > -summary_interval 0 > -# > -# Transport options > -# > -transportSpecific 0x1 > -ptp_dst_mac 01:80:C2:00:00:0E > -p2p_dst_mac 01:80:C2:00:00:0E > -uds_address /var/run/ptp4l > -# > -# Default interface options > -# > -network_transport L2 > -delay_mechanism P2P > -time_stamping hardware > - > -[eth0] > - > diff --git a/projectroot/usr/lib/systemd/system/phc2sys.service b/project= root/usr/lib/systemd/system/phc2sys.service > new file mode 100644 > index 000000000..992a95484 > --- /dev/null > +++ b/projectroot/usr/lib/systemd/system/phc2sys.service > @@ -0,0 +1,10 @@ > +[Unit] > +Description=3DPrecision Time Protocol system clock synchronization > +Wants=3Dptp4l@.service > + > +[Service] > +ExecStart=3D/usr/sbin/phc2sys -a -r > +Restart=3Dalways > + > +[Install] > +WantedBy=3Dmulti-user.target > diff --git a/projectroot/usr/lib/systemd/system/ptp4l.service b/projectro= ot/usr/lib/systemd/system/ptp4l.service > new file mode 100644 > index 000000000..90d09e56d > --- /dev/null > +++ b/projectroot/usr/lib/systemd/system/ptp4l.service > @@ -0,0 +1,12 @@ > +[Unit] > +Description=3DPrecision Time Protocol (PTP) service > +BindsTo =3D sys-subsystem-net-devices-eth0.device > +After =3D sys-subsystem-net-devices-eth0.device > + > +[Service] > +Type=3Dsimple > +ExecStart=3D/usr/sbin/ptp4l -P -i eth0 > +Restart=3Dalways > + > +[Install] > +WantedBy=3Dmulti-user.target > diff --git a/rules/linuxptp.in b/rules/linuxptp.in > index 641d844c7..5418d2ad0 100644 > --- a/rules/linuxptp.in > +++ b/rules/linuxptp.in > @@ -7,3 +7,15 @@ config LINUXPTP > The Linux PTP project implements the Precision Time protocol (PTP), > standardized as IEEE1588. > =20 > +if LINUXPTP > + > +config LINUXPTP_SYSTEMD_SERVICE > + bool "install ptp4l and phc2sys systemd service files" > + default y > + > +config LINUXPTP_PHC2SYS_SYSTEMD_SERVICE > + bool "Enable phc2sys systemd service file" > + default y > + depends on LINUXPTP_SYSTEMD_SERVICE > + > +endif > diff --git a/rules/linuxptp.make b/rules/linuxptp.make > index 59cbb5123..9d3163d56 100644 > --- a/rules/linuxptp.make > +++ b/rules/linuxptp.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LINUXPTP) +=3D linuxptp > # > # Paths and names > # > -LINUXPTP_VERSION :=3D 1.6 > -LINUXPTP_MD5 :=3D 6aa15d83f5a35f1fd076ba9adc4e7285 > +LINUXPTP_VERSION :=3D 1.8 > +LINUXPTP_MD5 :=3D 5688cdfe57932273e1dbf35b3b97b9a0 > LINUXPTP :=3D linuxptp-$(LINUXPTP_VERSION) > LINUXPTP_SUFFIX :=3D tgz > LINUXPTP_URL :=3D $(call ptx/mirror, SF, linuxptp/$(LINUXPTP).$(LINUXPT= P_SUFFIX)) > @@ -64,7 +64,21 @@ $(STATEDIR)/linuxptp.targetinstall: > @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/phc2sys) > @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/pmc) > @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/hwstamp_ctl) > - @$(call install_alternative, linuxptp, 0, 0, 0644, /etc/gPTP.conf) > + @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/phc_ctl) > + @$(call install_copy, linuxptp, 0, 0, 0755, -, /usr/sbin/timemaster) > + > +ifdef PTXCONF_LINUXPTP_SYSTEMD_SERVICE > + @$(call install_alternative, linuxptp, 0, 0, 0644, /usr/lib/systemd/sys= tem/ptp4l.service) > + @$(call install_alternative, linuxptp, 0, 0, 0644, /usr/lib/systemd/sys= tem/phc2sys.service) > + > + @$(call install_link, linuxptp, ../ptp4lservice, \ Gnaa, I somehow missed the . in here! Will fix in v4 if needed. > + /usr/lib/systemd/system/multi-user.target.wants/ptp4l.service) > + > +ifdef PTXCONF_LINUXPTP_PHC2SYS_SYSTEMD_SERVICE > + @$(call install_link, linuxptp, ../phc2sys.service, \ > + /usr/lib/systemd/system/multi-user.target.wants/phc2sys.service) > +endif > +endif > =20 > @$(call install_finish, linuxptp) > =20 > --=20 > 2.11.0 >=20 >=20 > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de --=20 Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | --faalvi3hehotstho Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEElXvEUs6VPX6mDPT8C+njFXoeLGQFAloXBrMACgkQC+njFXoe LGT0exAAnN/S7JT7ga92ZluOavalIauED70woKh15MjPkL5npOjWX1NaeQZF/W99 hCoEJxfT6Tq4s/kZ3MYJvUB2D6xhFKmuJ6qba7iqWJNpTWKuwrd2BZ5LpZjHSbJE v7gfOkbH8TuJAxJ1M2BUuY/VlLorvz0OGJT0iIrHbGA7V6uM0xFTvyaBV+G2wdmX x/kmgP4wjZCuRlVBUz33aemHHmJCUSqInP6YTdtbldktIUYuyEhQDYZuCMiE2wwe W5Tol4TaVpi7Lfd+tAcJNTVbSqGk1VqNaCdpzxxrDPRX/YBeRgV8pagIe/G5wFF+ o2Ev++dvX11qe+y1tSmHf5dHbl1OkDJdU5vwzDyahDfTc+mRYankp7xp6Z4sHC2i pMtH5mw50DexjAFpBN8RQun1zENrYCuZ9cMh7fwKTvcTFVJU46VHHQ4OpvRTCDle cR4T4Klcm0i6Z/nlMUAJ5chT+Vf4PlEu9JGVlU+UrnqQxdO6Wvjql/i4wFzKBK/W wf6EL7J98TkdxFsElaQbmFU7OKQ8LxCWq2FtdVuUERwRgv3TUEwz0T23FJaTAO/R F+cuVsyV9rqiAhZWisnoqZm/wTfKkABGvI+yHNzBaxRwXBovHdY2jzWvkQLylg13 +eLYMqjYVpgD4ha/YlhJkst/Wy82NAzxVV/gQbNk64snCUjCTZg= =jVuB -----END PGP SIGNATURE----- --faalvi3hehotstho-- --===============1772045781== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KcHR4ZGlzdCBt YWlsaW5nIGxpc3QKcHR4ZGlzdEBwZW5ndXRyb25peC5kZQ== --===============1772045781==--