Skip to content

Commit 708990b

Browse files
aireillyaireilly
committed
put back PTP YAML CRs for 4.14+
1 parent c6a7b65 commit 708990b

6 files changed

+464
-6
lines changed

‎modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock-dual-nic.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ See "Configuring the PTP fast event notifications publisher" for more informatio
4646
====
4747
[source,yaml]
4848
----
49-
include::snippets/ztp_PtpConfigDualCardGmWpc.yaml[]
49+
include::snippets/ptp_PtpConfigDualCardGmWpc.yaml[]
5050
----
5151
====
5252
+

‎modules/nw-ptp-configuring-linuxptp-services-as-grandmaster-clock.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Save the YAML in the `grandmaster-clock-ptp-config.yaml` file:
4141
====
4242
[source,yaml]
4343
----
44-
include::snippets/ztp_PtpConfigGmWpc.yaml[]
44+
include::snippets/ptp_PtpConfigGmWpc.yaml[]
4545
----
4646
====
4747
+

‎snippets/ptp_PtpConfigDualCardGmWpc.yaml

Lines changed: 236 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,236 @@
1+
# In this example two cards $iface_nic1 and $iface_nic2 are connected via
2+
# SMA1 ports by a cable and $iface_nic2 receives 1PPS signals from $iface_nic1
3+
apiVersion: ptp.openshift.io/v1
4+
kind: PtpConfig
5+
metadata:
6+
name: grandmaster
7+
namespace: openshift-ptp
8+
annotations: {}
9+
spec:
10+
profile:
11+
- name: "grandmaster"
12+
ptp4lOpts: "-2 --summary_interval -4"
13+
phc2sysOpts: -r -u 0 -m -w -N 8 -R 16 -s $iface_nic1 -n 24
14+
ptpSchedulingPolicy: SCHED_FIFO
15+
ptpSchedulingPriority: 10
16+
ptpSettings:
17+
logReduce: "true"
18+
plugins:
19+
e810:
20+
enableDefaultConfig: false
21+
settings:
22+
LocalMaxHoldoverOffSet: 1500
23+
LocalHoldoverTimeout: 14400
24+
MaxInSpecOffset: 100
25+
pins: $e810_pins
26+
# "$iface_nic1":
27+
# "U.FL2": "0 2"
28+
# "U.FL1": "0 1"
29+
# "SMA2": "0 2"
30+
# "SMA1": "2 1"
31+
# "$iface_nic2":
32+
# "U.FL2": "0 2"
33+
# "U.FL1": "0 1"
34+
# "SMA2": "0 2"
35+
# "SMA1": "1 1"
36+
ublxCmds:
37+
- args: #ubxtool -P 29.20 -z CFG-HW-ANT_CFG_VOLTCTRL,1
38+
- "-P"
39+
- "29.20"
40+
- "-z"
41+
- "CFG-HW-ANT_CFG_VOLTCTRL,1"
42+
reportOutput: false
43+
- args: #ubxtool -P 29.20 -e GPS
44+
- "-P"
45+
- "29.20"
46+
- "-e"
47+
- "GPS"
48+
reportOutput: false
49+
- args: #ubxtool -P 29.20 -d Galileo
50+
- "-P"
51+
- "29.20"
52+
- "-d"
53+
- "Galileo"
54+
reportOutput: false
55+
- args: #ubxtool -P 29.20 -d GLONASS
56+
- "-P"
57+
- "29.20"
58+
- "-d"
59+
- "GLONASS"
60+
reportOutput: false
61+
- args: #ubxtool -P 29.20 -d BeiDou
62+
- "-P"
63+
- "29.20"
64+
- "-d"
65+
- "BeiDou"
66+
reportOutput: false
67+
- args: #ubxtool -P 29.20 -d SBAS
68+
- "-P"
69+
- "29.20"
70+
- "-d"
71+
- "SBAS"
72+
reportOutput: false
73+
- args: #ubxtool -P 29.20 -t -w 5 -v 1 -e SURVEYIN,600,50000
74+
- "-P"
75+
- "29.20"
76+
- "-t"
77+
- "-w"
78+
- "5"
79+
- "-v"
80+
- "1"
81+
- "-e"
82+
- "SURVEYIN,600,50000"
83+
reportOutput: true
84+
- args: #ubxtool -P 29.20 -p MON-HW
85+
- "-P"
86+
- "29.20"
87+
- "-p"
88+
- "MON-HW"
89+
reportOutput: true
90+
- args: #ubxtool -P 29.20 -p CFG-MSG,1,38,248
91+
- "-P"
92+
- "29.20"
93+
- "-p"
94+
- "CFG-MSG,1,38,248"
95+
reportOutput: true
96+
ts2phcOpts: " "
97+
ts2phcConf: |
98+
[nmea]
99+
ts2phc.master 1
100+
[global]
101+
use_syslog 0
102+
verbose 1
103+
logging_level 7
104+
ts2phc.pulsewidth 100000000
105+
#cat /dev/GNSS to find available serial port
106+
#example value of gnss_serialport is /dev/ttyGNSS_1700_0
107+
ts2phc.nmea_serialport $gnss_serialport
108+
[$iface_nic1]
109+
ts2phc.extts_polarity rising
110+
ts2phc.extts_correction 0
111+
[$iface_nic2]
112+
ts2phc.master 0
113+
ts2phc.extts_polarity rising
114+
#this is a measured value in nanoseconds to compensate for SMA cable delay
115+
ts2phc.extts_correction -10
116+
ptp4lConf: |
117+
[$iface_nic1]
118+
masterOnly 1
119+
[$iface_nic1_1]
120+
masterOnly 1
121+
[$iface_nic1_2]
122+
masterOnly 1
123+
[$iface_nic1_3]
124+
masterOnly 1
125+
[$iface_nic2]
126+
masterOnly 1
127+
[$iface_nic2_1]
128+
masterOnly 1
129+
[$iface_nic2_2]
130+
masterOnly 1
131+
[$iface_nic2_3]
132+
masterOnly 1
133+
[global]
134+
#
135+
# Default Data Set
136+
#
137+
twoStepFlag 1
138+
priority1 128
139+
priority2 128
140+
domainNumber 24
141+
#utc_offset 37
142+
clockClass 6
143+
clockAccuracy 0x27
144+
offsetScaledLogVariance 0xFFFF
145+
free_running 0
146+
freq_est_interval 1
147+
dscp_event 0
148+
dscp_general 0
149+
dataset_comparison G.8275.x
150+
G.8275.defaultDS.localPriority 128
151+
#
152+
# Port Data Set
153+
#
154+
logAnnounceInterval -3
155+
logSyncInterval -4
156+
logMinDelayReqInterval -4
157+
logMinPdelayReqInterval 0
158+
announceReceiptTimeout 3
159+
syncReceiptTimeout 0
160+
delayAsymmetry 0
161+
fault_reset_interval -4
162+
neighborPropDelayThresh 20000000
163+
masterOnly 0
164+
G.8275.portDS.localPriority 128
165+
#
166+
# Run time options
167+
#
168+
assume_two_step 0
169+
logging_level 6
170+
path_trace_enabled 0
171+
follow_up_info 0
172+
hybrid_e2e 0
173+
inhibit_multicast_service 0
174+
net_sync_monitor 0
175+
tc_spanning_tree 0
176+
tx_timestamp_timeout 50
177+
unicast_listen 0
178+
unicast_master_table 0
179+
unicast_req_duration 3600
180+
use_syslog 1
181+
verbose 0
182+
summary_interval -4
183+
kernel_leap 1
184+
check_fup_sync 0
185+
clock_class_threshold 7
186+
#
187+
# Servo Options
188+
#
189+
pi_proportional_const 0.0
190+
pi_integral_const 0.0
191+
pi_proportional_scale 0.0
192+
pi_proportional_exponent -0.3
193+
pi_proportional_norm_max 0.7
194+
pi_integral_scale 0.0
195+
pi_integral_exponent 0.4
196+
pi_integral_norm_max 0.3
197+
step_threshold 2.0
198+
first_step_threshold 0.00002
199+
clock_servo pi
200+
sanity_freq_limit 200000000
201+
ntpshm_segment 0
202+
#
203+
# Transport options
204+
#
205+
transportSpecific 0x0
206+
ptp_dst_mac 01:1B:19:00:00:00
207+
p2p_dst_mac 01:80:C2:00:00:0E
208+
udp_ttl 1
209+
udp6_scope 0x0E
210+
uds_address /var/run/ptp4l
211+
#
212+
# Default interface options
213+
#
214+
clock_type BC
215+
network_transport L2
216+
delay_mechanism E2E
217+
time_stamping hardware
218+
tsproc_mode filter
219+
delay_filter moving_median
220+
delay_filter_length 10
221+
egressLatency 0
222+
ingressLatency 0
223+
boundary_clock_jbod 1
224+
#
225+
# Clock description
226+
#
227+
productDescription ;;
228+
revisionData ;;
229+
manufacturerIdentity 00:00:00
230+
userDescription ;
231+
timeSource 0x20
232+
recommend:
233+
- profile: "grandmaster"
234+
priority: 4
235+
match:
236+
- nodeLabel: "node-role.kubernetes.io/$mcp"

0 commit comments

Comments
 (0)