Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Switch - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
86
Issues
86
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Switch - Software
Commits
ea14e362
Commit
ea14e362
authored
Feb 24, 2016
by
Adam Wujek
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
doc: rename network interfaces from wrX to wriX+1
Signed-off-by:
Adam Wujek
<
adam.wujek@cern.ch
>
parent
3ebcbe77
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
59 additions
and
59 deletions
+59
-59
snmp-pain.in
doc/snmp-pain.in
+1
-1
wrs-developer-manual.in
doc/wrs-developer-manual.in
+3
-3
wrs-todo.in
doc/wrs-todo.in
+1
-1
wrs-user-manual.in
doc/wrs-user-manual.in
+53
-53
snmp_objects.tex
doc/wrs_failures/snmp_objects.tex
+1
-1
No files found.
doc/snmp-pain.in
View file @
ea14e362
...
...
@@ -520,7 +520,7 @@ interface is a line. This approach allows the same MIB to work for
every possible configuration. For WR port statistics we chose a
different approach: the counters themselves are somehow dynamic (they
may change across versions, while the gateware develops) while the
interfaces are restricted to be in the set @t
{
wr
0
}
--@t
{
wr17
}
.
interfaces are restricted to be in the set @t
{
wr
i1
}
--@t
{
wri18
}
.
So our pStats table is reversed from the common use of @sc
{
snmp
}
tables.
As a side effect this allows the WR switch to return the name of each
...
...
doc/wrs-developer-manual.in
View file @
ea14e362
...
...
@@ -1927,7 +1927,7 @@ The binary image includes 4 files, stored as an @sc{sdb} filesystem:
The MAC address for the management Ethernet port (RJ45, 100Mb/s).
@item wr
0
.ethaddr
@item wr
i1
.ethaddr
The MAC address for the first fiber port (SFP, 1Gb/s). Other ports
are assigned sequential addresses starting from this one.
...
...
@@ -2068,7 +2068,7 @@ in the boot scripts, as we now extract the mac addresses from sdb.
bb> sdb ls /dev/dataflash0.hwinfo
46696c6544617461:2e202020 @ 00000000-0000083f .
46696c6544617461:7363625f @ 00000240-00000243 scb_version
46696c6544617461:7772302e @ 00000220-00000231 wr
0
.ethaddr
46696c6544617461:7772302e @ 00000220-00000231 wr
i1
.ethaddr
46696c6544617461:6d616e75 @ 00000260-0000026f manufacturer
46696c6544617461:68775f69 @ 00000420-0000083f hw_info
46696c6544617461:65746830 @ 00000200-00000211 eth0.ethaddr
...
...
@@ -2078,7 +2078,7 @@ in the boot scripts, as we now extract the mac addresses from sdb.
bb> sdb cat /dev/dataflash0.hwinfo hw_info
fpga: LX240T
scb_serial: 12345
bb> sdb set /dev/dataflash0.hwinfo wraddr wr
0
.ethaddr
bb> sdb set /dev/dataflash0.hwinfo wraddr wr
i1
.ethaddr
bb> echo $wraddr
22:33:44:55:66:77
...
...
doc/wrs-todo.in
View file @
ea14e362
...
...
@@ -256,7 +256,7 @@ implementation.
@item WR GrandMaster Switch should be holy provided it has an
external reference. Currently if we have a GrandMaster Switch and we
connect a Free-running Master to it's Slave port (wr
0
) then it becomes
connect a Free-running Master to it's Slave port (wr
i1
) then it becomes
Slave to the Free-running Master and jumps it's WR time. All the
mechanism is in place, this should be trivial to fix.
...
...
doc/wrs-user-manual.in
View file @
ea14e362
...
...
@@ -588,10 +588,10 @@ value is changed by the web interface, proper action is taken.
Please note that unknown facility names will generate a runtime error
on the switch.
@item CONFIG
_
PORT0
0
_
PARAMS
@itemx CONFIG
_
PORT0
1
_
PARAMS
@item CONFIG
_
PORT0
1
_
PARAMS
@itemx CONFIG
_
PORT0
2
_
PARAMS
@itemx ...
@itemx CONFIG
_
PORT1
7
_
PARAMS
@itemx CONFIG
_
PORT1
8
_
PARAMS
These configuration items are used to set up port parameters;
this includes the delays, the PTP role, PTP protocol type
...
...
@@ -635,7 +635,7 @@ value is changed by the web interface, proper action is taken.
By default, PPSi configuration file is assembled based on role and
protocol parameters stored in @t
{
PORTxx
_
PARAMS
}
. @t
{
TIME
_
BC
}
selected
by @i
{
Kconfig
}
defaults role of port @t
{
wr
0
}
to slave, other ports
by @i
{
Kconfig
}
defaults role of port @t
{
wr
i1
}
to slave, other ports
to master. For @t
{
TIME
_
GM
}
and @t
{
TIME
_
FM
}
all ports are mandated to
master.
Parameters @t
{
clock-class
}
and @t
{
clock-accuracy
}
can be changed
...
...
@@ -743,12 +743,12 @@ description.
This is, for explanation's sake, an example of such items:
@smallexample
CONFIG
_
PORT09
_
PARAMS="name=wr9,proto=raw,tx=226214,rx=226758,role=slave,fiber=2"
CONFIG
_
PORT09
_
PARAMS="name=wr
i
9,proto=raw,tx=226214,rx=226758,role=slave,fiber=2"
CONFIG
_
SFP00
_
PARAMS="pn=AXGE-1254-0531,tx=0,rx=0,wl
_
txrx=1310+1490"
CONFIG
_
FIBER02
_
PARAMS="alpha
_
1310
_
1490=2.6787e-04"
@end smallexample
When making timing calculation for port @t
{
wr9
}
, assuming the
When making timing calculation for port @t
{
wr
i
9
}
, assuming the
auto-detected @sc
{
sfp
}
model is``AXGE-1254-0531'', the software
uses configuration in the following way:
...
...
@@ -1149,9 +1149,7 @@ The following tools and scripts are provided:
A tool to switch the TX
(
laser
)
of a port on and off by use of the @t
{
TX
disable
}
pin on the SFP. Usage ``@t
{
wrs
_
port
_
tx
_
control <port
_
no> on
}
''
switches the TX on, and ``@t
{
wrs
_
port
_
tx
_
control <port
_
no> off
}
''
switches the TX off. The port number @t
{
<port
_
no>
}
ranges from
0
to the
maximum number of ports on the device minus one, and is currently
limited to
17
.
switches the TX off. The port number @t
{
<port
_
no>
}
ranges from
1
to
18
.
@item wr
_
date
...
...
@@ -1189,8 +1187,10 @@ The following tools and scripts are provided:
@item apply
_
dot
-
config
The script is used to apply @t
{
dot
-
config
}
settings to the
current configuration files. It is run at boot time before
any service is started. The @t
{
dot
-
config
}
mechanism is
documented in @ref
{
Configuration of the Device
}
.
any service is started and by web interface to apply changes in
the local dot
-
config.
The @t
{
dot
-
config
}
mechanism is documented in @ref
{
Configuration of the
Device
}
.
@item assembly
_
ppsi
_
conf.sh
The script is used to assembly ppsi configuration file based on
...
...
@@ -1572,8 +1572,8 @@ WR-SWITCH-MIB::wrsPtpRTT.1 = Counter64: 943893
WR-SWITCH-MIB::wrsPtpLinkLength.1 = Gauge32: 91
WR-SWITCH-MIB::wrsPtpServoUpdates.1 = Counter32: 33
[...]
WR-SWITCH-MIB::wrsPortStatusPortName.1 = STRING: wr
0
WR-SWITCH-MIB::wrsPortStatusPortName.2 = STRING: wr
1
WR-SWITCH-MIB::wrsPortStatusPortName.1 = STRING: wr
i1
WR-SWITCH-MIB::wrsPortStatusPortName.2 = STRING: wr
i2
[...]
WR-SWITCH-MIB::wrsPortStatusLink.1 = INTEGER: up(2)
WR-SWITCH-MIB::wrsPortStatusLink.2 = INTEGER: up(2)
...
...
@@ -1587,8 +1587,8 @@ WR-SWITCH-MIB::wrsPortStatusSfpVN.2 = STRING: Axcen Photonics
WR-SWITCH-MIB::wrsPortStatusSfpPN.1 = STRING: AXGE-3454-0531
WR-SWITCH-MIB::wrsPortStatusSfpPN.2 = STRING: AXGE-3454-0531
[...]
WR-SWITCH-MIB::wrsPstatsHCPortName.1 = STRING: wr
0
WR-SWITCH-MIB::wrsPstatsHCPortName.2 = STRING: wr
1
WR-SWITCH-MIB::wrsPstatsHCPortName.1 = STRING: wr
i1
WR-SWITCH-MIB::wrsPstatsHCPortName.2 = STRING: wr
i2
[...]
WR-SWITCH-MIB::wrsPstatsHCTXFrames.1 = Counter64: 232
WR-SWITCH-MIB::wrsPstatsHCTXFrames.2 = Counter64: 543
...
...
@@ -1639,29 +1639,29 @@ Output is in text form and looks like:
@smallexample
SNMP table: WR
-
SWITCH
-
MIB::wrsPstatsHCTable
wrsPstatsHCPortName wrsPstatsHCTXUnderrun wrsPstatsHCRXOverrun
wrsPstatsHCRXInvalidCode
wr
0
0
0
0
wr
1
0
0
0
wr
2
0
0
0
wr
3
0
0
0
wr
4
0
0
0
wr
5
0
0
0
wr
6
0
0
0
wr
7
0
0
0
wr
8
0
0
0
wr
9
0
0
0
wr
10
0
0
0
wr
11
0
0
0
wr
12
0
0
0
wr
13
0
0
0
wr
14
0
0
0
wr
15
0
0
0
wr
16
0
0
0
wr
17
0
0
0
wrsPstatsHCPortName wrsPstatsHCTXUnderrun wrsPstatsHCRXOverrun
wri
1
0
0
wri
2
0
0
wri
3
0
0
wri
4
0
0
wri
5
0
0
wri
6
0
0
wri
7
0
0
wri
8
0
0
wri
9
0
0
wri
10
0
0
wri
11
0
0
wri
12
0
0
wri
13
0
0
wri
14
0
0
wri
15
0
0
wri
16
0
0
wri
17
0
0
wri
18
0
0
SNMP table WR
-
SWITCH
-
MIB::wrsPstatsHCTable, part
2
wrsPstatsHCRX
SyncLost wrsPstatsHCRXPauseFrames wrsPstatsHCRXPfilterDropped
wrsPstatsHCRX
InvalidCode wrsPstatsHCRXSyncLost wrsPstatsHCRXPauseFrames
0
0
0
0
0
0
0
0
0
...
...
doc/wrs_failures/snmp_objects.tex
View file @
ea14e362
...
...
@@ -273,7 +273,7 @@
messages to determine the WR port on which the problem is reported. In
case of Syslog, you should see a message similar to this one:
\\
\texttt
{
Unknown SFP vn="AVAGO" pn="ABCU-5710RZ" vs="AN1151PD8A" on port
wr
1
}
wr
i2
}
\item
If the reported port is intended to be used to connect a device that
does not require WR synchronization (e.g. using a copper SFP module),
then you should verify whether the role in the timing configuration for
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment