.gitignore

@@ -1 +1 @@
-SOURCES/synce4l-1.0.0.tar.gz
+SOURCES/synce4l-9564b5.tar.gz

.synce4l.metadata

@@ -1 +1 @@
-657eba71a2d740660aa32a03c8d1a160ea70d8e8 SOURCES/synce4l-1.0.0.tar.gz
+0ac4868f7b3121b7f8cb58ef5560c4b807a36edd SOURCES/synce4l-9564b5.tar.gz

SOURCES/synce4l-32bit.patch

@@ -1,50 +0,0 @@
-commit 11cc3508d4b7594e2a429000d162b3582d242c20
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Mon Nov 6 14:10:42 2023 +0100
-
-    Fix printf formats for 32-bit archs
-    
-    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
-
-diff --git a/config.c b/config.c
-index 56fcbbd..723ff84 100644
---- a/config.c
-+++ b/config.c
-@@ -21,6 +21,7 @@
-  */
- #include <ctype.h>
- #include <float.h>
-+#include <inttypes.h>
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -767,7 +768,7 @@ config_get_u64(struct config *cfg, const char *section, const char *option)
- 		pr_err("bug: config option %s type mismatch!", option);
- 		exit(-1);
- 	}
--	pr_debug("config item %s.%s is %lu (0x%lx)", section, option,
-+	pr_debug("config item %s.%s is %"PRIu64" (0x%"PRIx64")", section, option,
- 		 ci->val.u64, ci->val.u64);
- 	return ci->val.u64;
- }
-diff --git a/nl_dpll.c b/nl_dpll.c
-index f343de6..4dee01b 100644
---- a/nl_dpll.c
-+++ b/nl_dpll.c
-@@ -8,6 +8,7 @@
- #include <netlink/genl/genl.h>
- #include <netlink/genl/ctrl.h>
- #include <linux/rtnetlink.h>
-+#include <inttypes.h>
- #include <errno.h>
- #include "nl_dpll.h"
- #include "print.h"
-@@ -118,7 +119,7 @@ int nl_dpll_device_id_get(struct nl_sock *sk, struct sk_arg *arg,
- 		pr_err("%s: failed to send request", __func__);
- 		goto msg_free;
- 	}
--	pr_debug("DEVICE_ID_GET request sent dpll id: %lu %s, ret:%d",
-+	pr_debug("DEVICE_ID_GET request sent dpll id: %"PRIu64" %s, ret:%d",
- 		 clock_id, module_name, ret);
- 
- 	arg->err = 0;

SOURCES/synce4l-ql.patch

@@ -1,297 +0,0 @@
-commit a59358afe10326096c0e4330d705457a65176bb8
-Author: Yochai Hagvi <yochai.hagvi@intel.com>
-Date:   Thu Nov 30 13:06:01 2023 +0200
-
-    synce4l: fix flows moving from best port to SMA
-    
-    When synce4l best source is changed from port and SMA, due to SMA QL
-    update, some flows found broken.
-    
-    on choose_best_source, when best source is changed, ibest_source should
-    be NULL since dev_update_ql uses the best_port for configuring
-    
-    on dev_step_line_input, when rebuild_prio is set, this case should be
-    hit
-    
-    (ML: backported to 1.0.0)
-    
-    Signed-off-by: Yochai Hagvi <yochai.hagvi@intel.com>
-
-diff --git a/synce_dev.c b/synce_dev.c
-index cd5c787..70936a6 100644
---- a/synce_dev.c
-+++ b/synce_dev.c
-@@ -525,6 +525,7 @@ static void choose_best_source(struct synce_dev *dev)
- 				dev->name);
- 		} else {
- 			dev->ext_src_is_best = ext_src_is_best;
-+			dev->best_source = NULL;
- 			/* if input source is changing
- 			 * current input is invalid, send DNU and wait
- 			 * for EEC being locked in further dev_step
-@@ -555,14 +556,17 @@ static int dev_step_line_input(struct synce_dev *dev)
- 
- 	if (rx_ql_changed(dev)) {
- 		choose_best_source(dev);
--	} else if (dev->best_source && dev->best_source->type == PORT) {
--		if (synce_port_rx_ql_failed(dev->best_source->port)) {
--			synce_port_invalidate_rx_ql(dev->best_source->port);
--			force_all_eecs_detach(dev);
--			dev_update_ql(dev);
--			dev->best_source = NULL;
--			choose_best_source(dev);
--		}
-+	} else if (dev->best_source && dev->best_source->type == PORT &&
-+		   synce_port_rx_ql_failed(dev->best_source->port)) {
-+		synce_port_invalidate_rx_ql(dev->best_source->port);
-+		force_all_eecs_detach(dev);
-+		dev_update_ql(dev);
-+		dev->best_source = NULL;
-+		choose_best_source(dev);
-+	} else if (dev->rebuild_prio) {
-+		choose_best_source(dev);
-+		dev_update_ql(dev);
-+		dev->rebuild_prio = 0;
- 	}
- 
- 	return ret;
-@@ -697,6 +701,7 @@ int synce_dev_init(struct synce_dev *dev, struct config *cfg)
- 	dev->recover_time = config_get_int(cfg, dev->name, "recover_time");
- 	dev->best_source = NULL;
- 	dev->ext_src_is_best = false;
-+	dev->rebuild_prio = 0;
- 	eec_get_state_cmd = config_get_string(cfg, dev->name, "eec_get_state_cmd");
- 	ess.holdover = config_get_string(cfg, dev->name, "eec_holdover_value");
- 	ess.locked_ho = config_get_string(cfg, dev->name, "eec_locked_ho_value");
-
-commit 08914289b154ef4467929a84f1b2bf72591e8857
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Mon Jan 8 16:56:38 2024 +0100
-
-    Update port TX QL when external source locks
-    
-    With multiple external sources, the transmitted QL was wrong if the best
-    source was not selected. When an external source locks, update the
-    forced QL of all ports to transmit the correct QL.
-    
-    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
-
-diff --git a/synce_dev.c b/synce_dev.c
-index 70936a6..b8bfd0f 100644
---- a/synce_dev.c
-+++ b/synce_dev.c
-@@ -664,6 +664,10 @@ static int dev_step_dpll(struct synce_dev *dev)
- 		dev->best_source = active;
- 		pr_info("EEC_LOCKED/EEC_LOCKED_HO_ACQ on %s of %s",
- 			dev->best_source->ext_src->name, dev->name);
-+		LIST_FOREACH(c, &dev->clock_sources, list) {
-+			if (c->type == PORT)
-+				set_port_ql_from_ext_src(dev, c->port, active->ext_src);
-+		}
- 		dev_update_ql(dev);
- 	} else if (active->type == PORT) {
- 		dev->ext_src_is_best = 0;
-
-commit 0d6452efc885ec30547124b4c5570f4e6039ad69
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Wed Jan 17 14:15:16 2024 +0100
-
-    Add functions for clearing priority of individual pins
-    
-    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
-
-diff --git a/dpll_mon.c b/dpll_mon.c
-index 0f0648c..14e5354 100644
---- a/dpll_mon.c
-+++ b/dpll_mon.c
-@@ -972,7 +972,7 @@ int set_prio(struct dpll_mon *dm, uint32_t pin_id, uint32_t prio)
- 				    dm->dpll_id, prio);
- }
- 
--static int dpll_mon_pin_prio_clear(struct dpll_mon *dm, struct dpll_mon_pin *pin)
-+int dpll_mon_pin_prio_clear(struct dpll_mon *dm, struct dpll_mon_pin *pin)
- {
- 	struct dpll_mon_pin *parent;
- 	struct parent_pin *pp;
-diff --git a/dpll_mon.h b/dpll_mon.h
-index ec6e8b4..481b5e3 100644
---- a/dpll_mon.h
-+++ b/dpll_mon.h
-@@ -119,6 +119,15 @@ int dpll_mon_pin_is_active(struct dpll_mon *dm, struct dpll_mon_pin *pin);
- int dpll_mon_pin_prio_set(struct dpll_mon *dm, struct dpll_mon_pin *pin,
- 			  uint32_t prio);
- 
-+/**
-+ * Request to reset the priority of a pin to dnu_prio.
-+ *
-+ * @param dm		Instance of dpll mon which owns the pin.
-+ * @param pin		Valid pointer to a pin.
-+ * @return		0 - success, negative - failed to send request
-+ */
-+int dpll_mon_pin_prio_clear(struct dpll_mon *dm, struct dpll_mon_pin *pin);
-+
- /**
-  * Request to set Do Not Use priority on all valid pins for all the pins
-  * controlled by the dpll_mon's dpll.
-diff --git a/synce_clock_source.c b/synce_clock_source.c
-index 16ba091..50b21b8 100644
---- a/synce_clock_source.c
-+++ b/synce_clock_source.c
-@@ -220,3 +220,18 @@ int synce_clock_source_prio_set(struct dpll_mon *dpll_mon,
- 					   prio);
- 	return synce_ext_src_prio_set(dpll_mon, clk_src->ext_src, prio);
- }
-+
-+int synce_clock_source_prio_clear(struct dpll_mon *dpll_mon,
-+				  struct synce_clock_source *clk_src)
-+{
-+	if (!clk_src) {
-+		pr_err("%s clock_source is NULL", __func__);
-+		return -ENODEV;
-+	}
-+	pr_debug("%s: clear prio on %s", __func__,
-+		 clk_src->type == PORT ? clk_src->port->name :
-+		 clk_src->ext_src->name);
-+	if (clk_src->type == PORT)
-+		return synce_port_prio_clear(dpll_mon, clk_src->port);
-+	return synce_ext_src_prio_clear(dpll_mon, clk_src->ext_src);
-+}
-diff --git a/synce_clock_source.h b/synce_clock_source.h
-index 80c1327..96e6d26 100644
---- a/synce_clock_source.h
-+++ b/synce_clock_source.h
-@@ -132,4 +132,14 @@ int synce_clock_source_prio_set(struct dpll_mon *dpll_mon,
- 				struct synce_clock_source *clk_src,
- 				uint32_t prio);
- 
-+/**
-+ * request to set priority of a clock source pin on a dpll to dnu_prio
-+ *
-+ * @param dpll_mon	Pointer to dpll_mon class
-+ * @param clk_src	Configured instance
-+ * @return		0 - success, error code - failure
-+ */
-+int synce_clock_source_prio_clear(struct dpll_mon *dpll_mon,
-+				  struct synce_clock_source *clk_src);
-+
- #endif /* HAVE_SYNCE_CLOCK_SOURCE_H */
-diff --git a/synce_ext_src.c b/synce_ext_src.c
-index 7d0debd..d5c94f5 100644
---- a/synce_ext_src.c
-+++ b/synce_ext_src.c
-@@ -204,3 +204,9 @@ int synce_ext_src_prio_set(struct dpll_mon *dpll_mon,
- {
- 	return dpll_mon_pin_prio_set(dpll_mon, ext_src->pin, prio);
- }
-+
-+int synce_ext_src_prio_clear(struct dpll_mon *dpll_mon,
-+			     struct synce_ext_src *ext_src)
-+{
-+	return dpll_mon_pin_prio_clear(dpll_mon, ext_src->pin);
-+}
-diff --git a/synce_ext_src.h b/synce_ext_src.h
-index 79e6773..972c254 100644
---- a/synce_ext_src.h
-+++ b/synce_ext_src.h
-@@ -128,4 +128,14 @@ int synce_ext_src_is_active(struct dpll_mon *dpll_mon,
- int synce_ext_src_prio_set(struct dpll_mon *dpll_mon,
- 			   struct synce_ext_src *ext_src, uint32_t prio);
- 
-+/**
-+ * request to set priority of a external source associated pin to dnu_prio
-+ *
-+ * @param dpll_mon	Pointer to dpll_mon class
-+ * @param ext_src	Configured instance
-+ * @return		0 - success, error code - failure
-+ */
-+int synce_ext_src_prio_clear(struct dpll_mon *dpll_mon,
-+			     struct synce_ext_src *ext_src);
-+
- #endif /* HAVE_SYNCE_EXT_SRC_H */
-diff --git a/synce_port.c b/synce_port.c
-index 93bcee0..93a9f9f 100644
---- a/synce_port.c
-+++ b/synce_port.c
-@@ -473,3 +473,8 @@ int synce_port_prio_set(struct dpll_mon *dpll_mon, struct synce_port *port,
- {
- 	return dpll_mon_pin_prio_set(dpll_mon, port->pin, prio);
- }
-+
-+int synce_port_prio_clear(struct dpll_mon *dpll_mon, struct synce_port *port)
-+{
-+	return dpll_mon_pin_prio_clear(dpll_mon, port->pin);
-+}
-diff --git a/synce_port.h b/synce_port.h
-index 6f08976..ce07101 100644
---- a/synce_port.h
-+++ b/synce_port.h
-@@ -192,4 +192,13 @@ int synce_port_is_active(struct dpll_mon *dpll_mon, struct synce_port *port);
- int synce_port_prio_set(struct dpll_mon *dpll_mon, struct synce_port *port,
- 			uint32_t prio);
- 
-+/**
-+ * request to set priority of a port pin on a dpll to dnu_prio
-+ *
-+ * @param dpll_mon	Pointer to dpll_mon class
-+ * @param port		Configured instance
-+ * @return		0 - success, error code - failure
-+ */
-+int synce_port_prio_clear(struct dpll_mon *dpll_mon, struct synce_port *port);
-+
- #endif /* HAVE_SYNCE_PORT_H */
-
-commit 977f85ac74720996733c9ecce3cd2cd545a357de
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Wed Jan 17 14:16:07 2024 +0100
-
-    Avoid disconnecting input when rebuilding priority
-    
-    When rebuilding the input priority (e.g. after a change in the received
-    QL), avoid temporarily clearing the priority (setting to DNU) of inputs
-    that will still be usable for synchronization.
-    
-    This avoids an unnecessary disconnect of the currently locked input
-    causing a change in the transmitted QL and possibly an infinite loop in
-    the selection of inputs if the downstream SyncE clock is selecting this
-    clock as its input.
-    
-    Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
-
-diff --git a/synce_dev.c b/synce_dev.c
-index b8bfd0f..7800508 100644
---- a/synce_dev.c
-+++ b/synce_dev.c
-@@ -577,13 +577,14 @@ int rebuild_inputs_prio(struct synce_dev *dev)
- 	struct synce_clock_source *tmp, *tmp_best, **arr, *best, *prev_tmp = NULL;
- 	int i = 0, prio_count;
- 
--	if (dpll_mon_pins_prio_dnu_set(dev->dpll_mon)) {
--		pr_err("failed to set DNU priorities on %s", dev->name);
--		return -EIO;
--	}
- 	best = find_dev_best_clock_source(dev);
--	if (!best)
-+	if (!best) {
-+		if (dpll_mon_pins_prio_dnu_set(dev->dpll_mon)) {
-+			pr_err("failed to set DNU priorities on %s", dev->name);
-+			return -EIO;
-+		}
- 		return 0;
-+	}
- 	arr = calloc(dev->num_clock_sources, sizeof(*arr));
- 	if (!arr)
- 		return -ENOMEM;
-@@ -620,6 +621,13 @@ int rebuild_inputs_prio(struct synce_dev *dev)
- 	}
- 	prio_count = i;
- 	pr_debug("considered valid clock sources num: %d on %s", i, dev->name);
-+	LIST_FOREACH(tmp, &dev->clock_sources, list) {
-+		for (i = 0; i < prio_count; i++)
-+			if (tmp == arr[i])
-+				break;
-+		if (i == prio_count)
-+			synce_clock_source_prio_clear(dev->dpll_mon, tmp);
-+	}
- 	for (i = 0; i < prio_count; i++)
- 		synce_clock_source_prio_set(dev->dpll_mon, arr[i], i);
- 	free(arr);

SOURCES/synce4l-uninit-warning.patch

@@ -1,37 +0,0 @@
-commit 2ae971b87f05c03bd07d0ce41db59cc522625482
-Author: Miroslav Lichvar <mlichvar@redhat.com>
-Date:   Wed Nov 8 15:15:28 2023 +0100
-
-    Avoid -Wmaybe-uninitialized warning
-    
-    This fixes false positives reported by an older gcc:
-    
-    In file included from dpll_mon.c:17:
-    dpll_mon.c: In function 'dpll_mon_pin_update':
-    print.h:54:17: error: 'pin_state' may be used uninitialized in this function [-Werror=maybe-uninitialized]
-       54 |                 print(l, x);                            \
-          |                 ^~~~~
-    dpll_mon.c:334:33: note: 'pin_state' was declared here
-      334 |         uint32_t parent_pin_id, pin_state;
-          |                                 ^~~~~~~~~
-    print.h:54:17: error: 'parent_pin_id' may be used uninitialized in this
-    function [-Werror=maybe-uninitialized]
-       54 |                 print(l, x);                            \
-          |                 ^~~~~
-    dpll_mon.c:334:18: note: 'parent_pin_id' was declared here
-      334 |         uint32_t parent_pin_id, pin_state;
-          |                  ^~~~~~~~~~~~~
-
-diff --git a/dpll_mon.c b/dpll_mon.c
-index 3cc26cc..0f0648c 100644
---- a/dpll_mon.c
-+++ b/dpll_mon.c
-@@ -331,7 +331,7 @@ static void update_muxed_pin(struct dpll_mon *dm, uint32_t pin_id,
- 			     struct nlattr *a, int exist, int notify)
- {
- 	int parent_pin_id_valid = 0, pin_state_valid = 0, rem;
--	uint32_t parent_pin_id, pin_state;
-+	uint32_t parent_pin_id = 0, pin_state = 0;
- 	struct dpll_mon_pin *pin, *parent;
- 	struct nlattr *an;
- 

SOURCES/synce4l.conf

@@ -0,0 +1,27 @@
+[global]
+logging_level              6
+use_syslog                 1
+verbose                    0
+message_tag                [synce4l]
+
+[<synce1>]
+input_mode                 line
+network_option             1
+external_input_QL          11
+external_input_ext_QL      33
+extended_tlv               1
+recover_time               20
+eec_get_state_cmd          cat /sys/class/net/eth0/device/cgu_state
+eec_holdover_value         4
+eec_locked_ho_value        3
+eec_locked_value           2
+eec_freerun_value          1
+eec_invalid_value          0
+
+[eth0]
+tx_heartbeat_msec          1000
+rx_heartbeat_msec          500
+recover_clock_enable_cmd   echo 1 0 > /sys/class/net/eth0/device/phy/synce
+recover_clock_disable_cmd  echo 0 0 > /sys/class/net/eth0/device/phy/synce
+allowed_qls                3,4,7
+allowed_ext_qls            20,21

SPECS/synce4l.spec

@@ -1,22 +1,19 @@
+%global gitver 9564b5589d72ed3571a1f2130204aea60683bd78
+%global gitrel %(c=%{gitver}; echo ${c:0:6})
+%global gitdate 20221122
+
 Name:		synce4l
-Version:	1.0.0
+Version:	0
-Release:	1%{?dist}
+Release:	4.%{gitdate}git%{gitrel}%{?dist}
 Summary:	SyncE implementation for Linux
 
 License:	GPL-2.0-or-later
 URL:		https://github.com/intel/synce4l
-Source0:	https://github.com/intel/synce4l/archive/%{version}/synce4l-%{version}.tar.gz
+Source0:	https://github.com/intel/synce4l/archive/%{gitrel}/synce4l-%{gitrel}.tar.gz
 Source1:	synce4l.service
-
+Source2:	synce4l.conf
-# Fix building on 32-bit archs
-Patch1:		synce4l-32bit.patch
-# Fix false compiler warning
-Patch2:		synce4l-uninit-warning.patch
-# Fix various issues in handling of changes in received/transmitted QL
-Patch3:		synce4l-ql.patch
 
 BuildRequires:	gcc make systemd
-BuildRequires:	libnl3-devel
 
 %{?systemd_requires}
 
@@ -28,14 +25,7 @@ supported hardware by processing Ethernet Synchronization Messaging Channel
 (NIC).
 
 %prep
-%autosetup
+%setup -q -n synce4l-%{gitver}
-
-sed \
-	-e 's|^\(logging_level	*\)[0-7]|\16|' \
-	-e 's|^\(use_syslog	*\)[01]|\11|' \
-	-e 's|^\(verbose	*\)[01]|\10|' \
-	< configs/synce4l_dpll.cfg > synce4l.conf
-touch -r configs/synce4l_dpll.cfg synce4l.conf
 
 %build
 %{make_build} \
@@ -48,7 +38,7 @@ touch -r configs/synce4l_dpll.cfg synce4l.conf
 
 mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir},%{_unitdir},%{_mandir}/man5}
 install -m 644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 -p synce4l.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 
 echo '.so man8/synce4l.8' > $RPM_BUILD_ROOT%{_mandir}/man5/synce4l.conf.5
 
@@ -74,11 +64,8 @@ echo '.so man8/synce4l.8' > $RPM_BUILD_ROOT%{_mandir}/man5/synce4l.conf.5
 %{_mandir}/man8/*.8*
 
 %changelog
-* Mon Feb 19 2024 Miroslav Lichvar <mlichvar@redhat.com> 1.0.0-1
-- update to 1.0.0 (RHEL-10089 RHEL-1645 RHEL-17948 RHEL-17949)
-
 * Tue Jan 03 2023 Miroslav Lichvar <mlichvar@redhat.com> 0-4.20221122git9564b5
-- update to 20221122git9564b5 (#2143264)
+- update to 20221122git9564b5 (#2019751)
 
 * Wed Nov 16 2022 Miroslav Lichvar <mlichvar@redhat.com> 0-3.20221114gitca51d5
 - update to 20221114gitca51d5 (#2141038)