36a7f89078
Integrate a change from upstream linuxptp to downgrade the ptp4l log message to debug when dus forward fails. Update the linuxptp patch series accordingly. If multiple management clients are used in the network and ptp4l responded at least once over UDS, it will try to forward all management responses received from network to the last UDS client. ptp4l doesn't track the messages and doesn't know if they are responses to the UDS client or other clients in the network. If the UDS client is no longer running (receiving messages on its address), ptp4l logs "uds port: management forward failed" error message. With frequent management requests in the network this can lead to flooding of the system log. Downgrade the error message to debug to disable it in the default log level. Test plan: Pass: Verify package build Pass: Verify ptp4l startup and basic operation Pass: Verfiy "uds port" message is printed as at debug level Closes-bug: 2064654 Change-Id: Ic778914d834f0d022d1c9f1df218940962ef93fe Signed-off-by: Cole Walker <cole.walker@windriver.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: Miroslav Lichvar <mlichvar@redhat.com>
|
|
Date: Mon, 31 May 2021 11:07:54 +0200
|
|
Subject: [PATCH 03/59] port: Don't check timestamps from non-slave ports.
|
|
|
|
Don't perform the sanity check on receive timestamps from ports in
|
|
non-slave states to avoid false positives in the jbod mode, where
|
|
the timestamps can be generated by different clocks.
|
|
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Signed-off-by: Miroslav Lichvar <mlichvar@redhat.com>
|
|
[commit e117e37e379556fa23337db2518bb44d8793e039 upstream]
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
port.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/port.c b/port.c
|
|
index fa49663..8cf3f59 100644
|
|
--- a/port.c
|
|
+++ b/port.c
|
|
@@ -2714,7 +2714,10 @@ static enum fsm_event bc_event(struct port *p, int fd_index)
|
|
}
|
|
if (msg_sots_valid(msg)) {
|
|
ts_add(&msg->hwts.ts, -p->rx_timestamp_offset);
|
|
- clock_check_ts(p->clock, tmv_to_nanoseconds(msg->hwts.ts));
|
|
+ if (p->state == PS_SLAVE) {
|
|
+ clock_check_ts(p->clock,
|
|
+ tmv_to_nanoseconds(msg->hwts.ts));
|
|
+ }
|
|
}
|
|
|
|
switch (msg_type(msg)) {
|