Merge branch 'v3_8'

Xilinx-CNS · Oct 2, 2024 · 6fa514d · 6fa514d
2 parents 59c949b + 33d94bd
commit 6fa514d
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,9 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 (c) Copyright 2012-2024 Advanced Micro Devices, Inc.
 
-## [Unreleased]
-
-## [3.8.0.1003] - 2024-09-30 [Feature Release]
+## [3.8.0.1004] - 2024-10-03 [Feature Release]
 
 ### Added
 

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ subject to limitations, `chronyd`. The daemon works on Linux systems for 3.0
 kernels and later.
 
 See [the changelog](CHANGELOG.md) for recent additions to sfptpd.  The current
-stable branch is [v3_7](https://github.com/Xilinx-CNS/sfptpd/tree/v3_7). 
+stable branch is [v3_8](https://github.com/Xilinx-CNS/sfptpd/tree/v3_8).
 
 For a **quick start** (operating PTP on bond0, domain 100), see
 [one line docker example](/INSTALL.md#running-a-pre-built-container-image).

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,7 +1,7 @@
 AMD Solarflare Enhanced PTP Daemon
 ==================================
 
-Version: v3.8.0.1003
+Version: v3.8.0.1004
 
 These release notes relate to official supported binary releases of sfptpd.
 Please see [the changelog](CHANGELOG.md) for a list of changes since earlier

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-sfptpd (3.8.0.1000) UNRELEASED; urgency=medium
+sfptpd (3.8.0.1004) UNRELEASED; urgency=medium
 
   * Upstream's Debian package for sfptpd; see CHANGELOG.md for real changelog.
 
- -- AMD NIC Support <support-nic@amd.com>  Mon,  4 Mar 2024 11:00:00 +0000
+ -- AMD NIC Support <support-nic@amd.com>  Thu,  3 Oct 2024 11:00:00 +0000
diff --git a/debian/rules b/debian/rules
@@ -25,3 +25,7 @@ override_dh_installsystemd:
 
 override_dh_installinit:
 	dh_installinit --no-enable --no-start
+
+# Avoid compressing example configurations so they can be used easily.
+override_dh_compress:
+	dh_compress -X.cfg
diff --git a/scripts/rpm/el6/sfptpd.spec b/scripts/rpm/el6/sfptpd.spec
@@ -108,5 +108,5 @@ touch %{buildroot}%{_localstatedir}/lib/%{name}/{config,interfaces,sync-instance
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1003-1
+* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1004-1
 - see CHANGELOG.md in source archive for changelog
diff --git a/scripts/rpm/el7/sfptpd.spec b/scripts/rpm/el7/sfptpd.spec
@@ -109,5 +109,5 @@ make fast_test
 %exclude %{_libexecdir}/%{name}/*.py[co]
 
 %changelog
-* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1003-1
+* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1004-1
 - see CHANGELOG.md in source archive for changelog
diff --git a/scripts/rpm/el8/sfptpd.spec b/scripts/rpm/el8/sfptpd.spec
@@ -109,5 +109,5 @@ make fast_test
 %{_libexecdir}/%{name}/chrony_clockcontrol.py
 
 %changelog
-* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1003-1
+* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1004-1
 - see CHANGELOG.md in source archive for changelog
diff --git a/scripts/rpm/el9/sfptpd.spec b/scripts/rpm/el9/sfptpd.spec
@@ -117,5 +117,5 @@ make fast_test
 %{_libexecdir}/%{name}/chrony_clockcontrol.py
 
 %changelog
-* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1003-1
+* Fri Sep 20 2024 AMD NIC Support <support-nic@amd.com> - 3.8.0.1004-1
 - see CHANGELOG.md in source archive for changelog
diff --git a/src/sfptpd_clock.c b/src/sfptpd_clock.c
@@ -2155,7 +2155,8 @@ int sfptpd_clock_set_time(struct sfptpd_clock *clock_to,
 	int rc;
 
 	if (clock_to == clock_from ||
-	    clock_to->initial_correction_applied)
+	    (is_initial_correction &&
+	     clock_to->initial_correction_applied))
 		return 0;
 
 	clock_lock();

diff --git a/src/sfptpd_servo.c b/src/sfptpd_servo.c
@@ -439,8 +439,9 @@ static int do_servo_synchronize(struct sfptpd_engine *engine, struct sfptpd_serv
 				/* set the NIC clock to system clock */
 				WARNING("%s: correcting master clock %s to system time\n", servo->servo_name,
 					sfptpd_clock_get_long_name(servo->master));
-				sfptpd_clock_correct_new(servo->master);
-				/* After we set the LRC's time to system time, return early so that we don't propagate the error */
+				sfptpd_clock_set_time(servo->master, sfptpd_clock_get_system_clock(), NULL, false);
+				/* After we set the LRC's time to system time,
+				   return early so that we don't propagate the error */
 				return EAGAIN;
 			}
 		}
@@ -470,7 +471,7 @@ static int do_servo_synchronize(struct sfptpd_engine *engine, struct sfptpd_serv
                         /* set the NIC clock to system clock */
                         WARNING("%s: correcting slave clock %s to system time\n", servo->servo_name,
                                 sfptpd_clock_get_long_name(servo->slave));
-                        sfptpd_clock_correct_new(servo->slave);
+			sfptpd_clock_set_time(servo->slave, sfptpd_clock_get_system_clock(), NULL, false);
                         /* After we set the slave clock's time to system time, 
                          * return early so that we don't propagate the error */
                         return EAGAIN;
@@ -513,7 +514,7 @@ static int do_servo_synchronize(struct sfptpd_engine *engine, struct sfptpd_serv
 	if ((servo->clock_ctrl == SFPTPD_CLOCK_CTRL_SLEW_AND_STEP) ||
 	    ((servo->clock_ctrl == SFPTPD_CLOCK_CTRL_STEP_AT_STARTUP || 
                 servo->clock_ctrl == SFPTPD_CLOCK_CTRL_STEP_ON_FIRST_LOCK) && !servo->active) || 
-	    ((servo->clock_ctrl == SFPTPD_CLOCK_CTRL_STEP_ON_FIRST_LOCK) && 
+	    ((servo->clock_ctrl == SFPTPD_CLOCK_CTRL_STEP_ON_FIRST_LOCK) &&
                 !servo->stepped_after_lrc_locked && sfptpd_clock_get_been_locked(servo->master)) || 
             ((servo->clock_ctrl == SFPTPD_CLOCK_CTRL_STEP_FORWARD) && (diff_ns < 0))) {
 		if ((diff_ns <= -servo->step_threshold) ||