Commit 350a3162 authored by Maciej Lipinski's avatar Maciej Lipinski Committed by Grzegorz Daniluk

[DOC] Update VLAN_modes table and VLAN description;

- behavior for different VLAN modes was incorrect (in table and text)
- updates per changes in v6.0 were needed.
parent 3a10505b
doc/VLAN_modes.png

37.6 KB | W: | H:

doc/VLAN_modes.png

66.1 KB | W: | H:

doc/VLAN_modes.png
doc/VLAN_modes.png
doc/VLAN_modes.png
doc/VLAN_modes.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -1700,13 +1700,14 @@ VLANs are handled at two levels:
i.e. translate into @i{Traffic Class} different priority than
the one received in the VLAN-tag
@item remove VLAN-tag of given VID(s) from egress frames
@item override VID in the VLAN-tag of a priority-tagged frame (VID=0x0)
@end itemize
@item Per-VID by configuring the RTU. It allows to:
@itemize
@item limit the ports to which frames with a given VID are forwarded
@item limit the ports from which frames with given VID are accepted
@footnote{Should, but does not now. There is a bug in HDL.}
% @item limit the ports from which frames with given VID are accepted
% @footnote{Should, but does not now. There is a bug in HDL.}
@item override priority (@i{Traffic Class}) for a given VID
@item drop frames with a given VID
@end itemize
......@@ -1730,11 +1731,12 @@ VLAN-tag in the received frame.
@item @i{no VLAN-tag}: are admitted, tagged with the values of VID and
priority that are configured in @t{pvid} and @t{pprio}
respectively
@item @i{priority tag}: are admitted, their tag is unchanged, the value
of VID provided to the RTU is overridden with the one
configured in @t{pvid}. If @t{pprio} is not -1, the
value of priority provided to RTU is overridden with
the configured @t{pprio}
@item @i{priority tag}: are admitted, the value of VID in their VLAN-tag is
overridden with the value configured in n @t{pvid}. This
new value of VID is provided to the RTU. If @t{pprio} is
not -1, the value of priority provided to RTU is
overridden with the configured @t{pprio}, the value of
priority in the VLAN-tag is unchanged.
@item @i{VLAN tag}: are discarded
@item @i{null tag}: are discarded
......@@ -1745,7 +1747,8 @@ VLAN-tag in the received frame.
@item @i{priority tag}: are discarded
@item @i{VLAN tag}: are admitted; if @t{pprio} is not -1, the value of
priority provided to RTU is overridden with
the configured @t{pprio}
the configured @t{pprio}, the value of
priority in the VLAN-tag is unchanged.
@item @i{null tag}: are discarded
@end itemize
......@@ -1767,14 +1770,15 @@ VLAN-tag in the received frame.
@itemize
@item @i{no VLAN-tag}: are admitted. No other configuration is used even
if set.
@item @i{priority tag}: are admitted. Their tag is unchanged, the value
of VID provided to the RTU is overridden with the
configured in @t{pvid}. If @t{pprio} is not -1, the
value of priority provided to RTU is overridden with
the configured @t{pprio}
@b{Note:} For version v5.0 providing a VID for this mode
is not supported in the dot-config
@item @i{priority tag}: are admitted. The value of VID in their VLAN-tag is
overridden with the value configured in n @t{pvid}. This
new value of VID is provided to the RTU. If @t{pprio} is
not -1, the value of priority provided to RTU is
overridden with the configured @t{pprio}, the value of
priority in the VLAN-tag is unchanged.
@b{Note:} From version v6.0, providing a VID for this mode
is supported in the dot-config, "Raw ports configuration"
needs to be enabled.
@item @i{VLAN tag}: are admitted; if @t{pprio} is not -1, the value of
priority provided to RTU is overridden with
the configured @t{pprio}
......@@ -1786,19 +1790,29 @@ Modes and their behaviour are summarized in the table below:
@center @image{VLAN_modes, 14cm,, VLAN_modes}
From the firmware v5.0, it is possible to configure VLANs in the
From the firmware v5.0, it is possible to configure VLANs in the
@t{dot-config} file (for an example configuration please see
@ref{Example VLAN configuration by dot-config}).
@ref{Example VLAN configuration by dot-config}). Not all possible configuration
are allowed.
From the firmware v6.0, all possible configuration can be set via dot-config,
for more exotic configurations, "raw ports configuration" must be enabled.
As an alternative it is possible to use @i{wrs_vlans} tool
described in @ref{wrs_vlans} together with a custom config file for @i{PPSi}.
described in @ref{wrs_vlans} together with a custom config file for @i{PPSi} -
this method is error-prone.
Another alternative working on pre-v5.0 to set VLANs is to use the web
interface. However, as it is in v5.0, the web-interface is not capable to store
VLANs configuration into a @t{dot-config}.
To have synchronization working with VLANs, the preferred way is to provide proper VIDs to
configuration options like @t{CONFIG_VLANS_PORT@i{xx}_VID}. As an alternative you can
@b{For VLAN configuration, it is highly recommended to use dot-config
generated by @t{wrs_menuconfig} command} (PPSi configuration is generated from
the @t{dot-config}).
To have synchronization working with VLANs, the preferred way is to provide proper
PTP VIDs in configuratin options @t{CONFIG_VLANS_PORT@i{xx}_PTP_VID}. As an alternative you can
write a custom @i{PPSi} configuration file with VLANs specified per-port.
You can simply copy the file generated in the WRS filesystem
(@i{/etc/ppsi.conf}) to a central @t{tftp}/@t{http}/@t{ftp} server where
......@@ -1899,13 +1913,19 @@ CONFIG_VLANS_PORT01_MODE_ACCESS=y
CONFIG_VLANS_PORT01_UNTAG_ALL=y
CONFIG_VLANS_PORT01_PRIO=4
CONFIG_VLANS_PORT01_VID="1"
CONFIG_VLANS_PORT01_PTP_VID=""
CONFIG_VLANS_PORT02_MODE_TRUNK=y
CONFIG_VLANS_PORT02_UNTAG_NONE=y
CONFIG_VLANS_PORT02_PRIO=-1
CONFIG_VLANS_PORT02_VID="2"
CONFIG_VLANS_PORT02_VID=""
CONFIG_VLANS_PORT02_PTP_VID="2"
CONFIG_VLANS_PORT03_MODE_ACCESS=y
CONFIG_VLANS_PORT03_UNTAG_ALL=y
CONFIG_VLANS_PORT03_PRIO=7
CONFIG_VLANS_PORT03_VID="2"
CONFIG_VLANS_PORT03_PTP_VID=""
CONFIG_VLANS_ENABLE_SET1=y
CONFIG_VLANS_VLAN0001="fid=1,prio=4,drop=n,ports=1"
......@@ -1943,30 +1963,36 @@ Set VID configuration by using the @t{wrs_vlans} tool:
For details about @t{wrs_vlans} please refer to the @ref{wrs_vlans}.
@i{PPSi} configuration that sould be placed into @t{ppsi.conf}:
@i{PPSi} configuration that should be placed into @t{ppsi.conf}:
@smallexample
port wri1-raw
proto raw
iface wri1
role slave
extension whiterabbit
desiredState slave
profile wr
vlan 1
port wri2-raw
proto raw
iface wri2
role master
extension whiterabbit
desiredState master
profile wr
vlan 2
port wri3-raw
proto raw
iface wri3
role master
extension whiterabbit
desiredState master
profile wr
vlan 2
@end smallexample
NOTE: The @t{ppsi.conf} in /etc/ folder is automatically generated from the
@t{dot-config} file on startup, thus you will loose your changes if you
update directly @t{ppsi.conf} in /etc/. To use custom @t{ppsi.conf}, you
need to specify its path in dot-config using the parameter:
CONFIG_PTP_CUSTOM.
@c ==========================================================================
@node Front panel's LEDs
@section Front panel's LEDs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment