Skip to content

W
White Rabbit Switch - Software
Commit c2172b7c authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

Kconfig: remove VLANS_PORTXX_VID_PTP 

Use VLANS_PORTXX_VID instead of VLANS_PORTXX_VID and VLANS_PORTXX_VID_PTP
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 60b14e88
Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 295 deletions
Kconfig_vlans.in
View file @ c2172b7c
...@@ -64,6 +64,8 @@ choice VLANS_PORT01_MODE ...@@ -64,6 +64,8 @@ choice VLANS_PORT01_MODE
configured in PORT_VID. If PRIO_VAL is not -1, configured in PORT_VID. If PRIO_VAL is not -1,
the value of priority provided to RTU is the value of priority provided to RTU is
overridden with the configured PRIO_VAL overridden with the configured PRIO_VAL
NOTE: providing a VID for this mode is not
supported in the dot-config
* VLAN tag : are admitted; if PRIO_VAL is not -1, the value of * VLAN tag : are admitted; if PRIO_VAL is not -1, the value of
priority provided to RTU is overridden with priority provided to RTU is overridden with
the configured PRIO_VAL the configured PRIO_VAL
...@@ -120,22 +122,20 @@ config VLANS_PORT01_PRIO ...@@ -120,22 +122,20 @@ config VLANS_PORT01_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT01_VID config VLANS_PORT01_VID
int "Port 1 VID" string "Port 1 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT01_MODE_ACCESS || VLANS_PORT01_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT01_VID_PTP
string "Port 1 VIDs for PTP"
default "0" if VLANS_PORT01_MODE_ACCESS || VLANS_PORT01_MODE_TRUNK
default "" if VLANS_PORT01_MODE_UNQUALIFIED
depends on VLANS_PORT01_MODE_ACCESS || VLANS_PORT01_MODE_TRUNK \
|| VLANS_PORT01_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 2" comment "Port 2"
...@@ -196,22 +196,20 @@ config VLANS_PORT02_PRIO ...@@ -196,22 +196,20 @@ config VLANS_PORT02_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT02_VID config VLANS_PORT02_VID
int "Port 2 VID" string "Port 2 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT02_MODE_ACCESS || VLANS_PORT02_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT02_VID_PTP
string "Port 2 VIDs for PTP"
default "0" if VLANS_PORT02_MODE_ACCESS || VLANS_PORT02_MODE_TRUNK
default "" if VLANS_PORT02_MODE_UNQUALIFIED
depends on VLANS_PORT02_MODE_ACCESS || VLANS_PORT02_MODE_TRUNK \
|| VLANS_PORT02_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 3" comment "Port 3"
...@@ -272,22 +270,20 @@ config VLANS_PORT03_PRIO ...@@ -272,22 +270,20 @@ config VLANS_PORT03_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT03_VID config VLANS_PORT03_VID
int "Port 3 VID" string "Port 3 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT03_MODE_ACCESS || VLANS_PORT03_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT03_VID_PTP
string "Port 3 VIDs for PTP"
default "0" if VLANS_PORT03_MODE_ACCESS || VLANS_PORT03_MODE_TRUNK
default "" if VLANS_PORT03_MODE_UNQUALIFIED
depends on VLANS_PORT03_MODE_ACCESS || VLANS_PORT03_MODE_TRUNK \
|| VLANS_PORT03_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 4" comment "Port 4"
...@@ -348,22 +344,20 @@ config VLANS_PORT04_PRIO ...@@ -348,22 +344,20 @@ config VLANS_PORT04_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT04_VID config VLANS_PORT04_VID
int "Port 4 VID" string "Port 4 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT04_MODE_ACCESS || VLANS_PORT04_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT04_VID_PTP
string "Port 4 VIDs for PTP"
default "0" if VLANS_PORT04_MODE_ACCESS || VLANS_PORT04_MODE_TRUNK
default "" if VLANS_PORT04_MODE_UNQUALIFIED
depends on VLANS_PORT04_MODE_ACCESS || VLANS_PORT04_MODE_TRUNK \
|| VLANS_PORT04_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 5" comment "Port 5"
...@@ -424,22 +418,20 @@ config VLANS_PORT05_PRIO ...@@ -424,22 +418,20 @@ config VLANS_PORT05_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT05_VID config VLANS_PORT05_VID
int "Port 5 VID" string "Port 5 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT05_MODE_ACCESS || VLANS_PORT05_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT05_VID_PTP
string "Port 5 VIDs for PTP"
default "0" if VLANS_PORT05_MODE_ACCESS || VLANS_PORT05_MODE_TRUNK
default "" if VLANS_PORT05_MODE_UNQUALIFIED
depends on VLANS_PORT05_MODE_ACCESS || VLANS_PORT05_MODE_TRUNK \
|| VLANS_PORT05_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 6" comment "Port 6"
...@@ -500,22 +492,20 @@ config VLANS_PORT06_PRIO ...@@ -500,22 +492,20 @@ config VLANS_PORT06_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT06_VID config VLANS_PORT06_VID
int "Port 6 VID" string "Port 6 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT06_MODE_ACCESS || VLANS_PORT06_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT06_VID_PTP
string "Port 6 VIDs for PTP"
default "0" if VLANS_PORT06_MODE_ACCESS || VLANS_PORT06_MODE_TRUNK
default "" if VLANS_PORT06_MODE_UNQUALIFIED
depends on VLANS_PORT06_MODE_ACCESS || VLANS_PORT06_MODE_TRUNK \
|| VLANS_PORT06_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 7" comment "Port 7"
...@@ -576,22 +566,20 @@ config VLANS_PORT07_PRIO ...@@ -576,22 +566,20 @@ config VLANS_PORT07_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT07_VID config VLANS_PORT07_VID
int "Port 7 VID" string "Port 7 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT07_MODE_ACCESS || VLANS_PORT07_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT07_VID_PTP
string "Port 7 VIDs for PTP"
default "0" if VLANS_PORT07_MODE_ACCESS || VLANS_PORT07_MODE_TRUNK
default "" if VLANS_PORT07_MODE_UNQUALIFIED
depends on VLANS_PORT07_MODE_ACCESS || VLANS_PORT07_MODE_TRUNK \
|| VLANS_PORT07_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 8" comment "Port 8"
...@@ -652,22 +640,20 @@ config VLANS_PORT08_PRIO ...@@ -652,22 +640,20 @@ config VLANS_PORT08_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT08_VID config VLANS_PORT08_VID
int "Port 8 VID" string "Port 8 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT08_MODE_ACCESS || VLANS_PORT08_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT08_VID_PTP
string "Port 8 VIDs for PTP"
default "0" if VLANS_PORT08_MODE_ACCESS || VLANS_PORT08_MODE_TRUNK
default "" if VLANS_PORT08_MODE_UNQUALIFIED
depends on VLANS_PORT08_MODE_ACCESS || VLANS_PORT08_MODE_TRUNK \
|| VLANS_PORT08_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 9" comment "Port 9"
...@@ -728,22 +714,20 @@ config VLANS_PORT09_PRIO ...@@ -728,22 +714,20 @@ config VLANS_PORT09_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT09_VID config VLANS_PORT09_VID
int "Port 9 VID" string "Port 9 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT09_MODE_ACCESS || VLANS_PORT09_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT09_VID_PTP
string "Port 9 VIDs for PTP"
default "0" if VLANS_PORT09_MODE_ACCESS || VLANS_PORT09_MODE_TRUNK
default "" if VLANS_PORT09_MODE_UNQUALIFIED
depends on VLANS_PORT09_MODE_ACCESS || VLANS_PORT09_MODE_TRUNK \
|| VLANS_PORT09_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 10" comment "Port 10"
...@@ -804,22 +788,20 @@ config VLANS_PORT10_PRIO ...@@ -804,22 +788,20 @@ config VLANS_PORT10_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT10_VID config VLANS_PORT10_VID
int "Port 10 VID" string "Port 10 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT10_MODE_ACCESS || VLANS_PORT10_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT10_VID_PTP
string "Port 10 VIDs for PTP"
default "0" if VLANS_PORT10_MODE_ACCESS || VLANS_PORT10_MODE_TRUNK
default "" if VLANS_PORT10_MODE_UNQUALIFIED
depends on VLANS_PORT10_MODE_ACCESS || VLANS_PORT10_MODE_TRUNK \
|| VLANS_PORT10_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 11" comment "Port 11"
...@@ -880,22 +862,20 @@ config VLANS_PORT11_PRIO ...@@ -880,22 +862,20 @@ config VLANS_PORT11_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT11_VID config VLANS_PORT11_VID
int "Port 11 VID" string "Port 11 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT11_MODE_ACCESS || VLANS_PORT11_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT11_VID_PTP
string "Port 11 VIDs for PTP"
default "0" if VLANS_PORT11_MODE_ACCESS || VLANS_PORT11_MODE_TRUNK
default "" if VLANS_PORT11_MODE_UNQUALIFIED
depends on VLANS_PORT11_MODE_ACCESS || VLANS_PORT11_MODE_TRUNK \
|| VLANS_PORT11_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 12" comment "Port 12"
...@@ -956,22 +936,20 @@ config VLANS_PORT12_PRIO ...@@ -956,22 +936,20 @@ config VLANS_PORT12_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT12_VID config VLANS_PORT12_VID
int "Port 12 VID" string "Port 12 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT12_MODE_ACCESS || VLANS_PORT12_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT12_VID_PTP
string "Port 12 VIDs for PTP"
default "0" if VLANS_PORT12_MODE_ACCESS || VLANS_PORT12_MODE_TRUNK
default "" if VLANS_PORT12_MODE_UNQUALIFIED
depends on VLANS_PORT12_MODE_ACCESS || VLANS_PORT12_MODE_TRUNK \
|| VLANS_PORT12_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 13" comment "Port 13"
...@@ -1032,22 +1010,20 @@ config VLANS_PORT13_PRIO ...@@ -1032,22 +1010,20 @@ config VLANS_PORT13_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT13_VID config VLANS_PORT13_VID
int "Port 13 VID" string "Port 13 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT13_MODE_ACCESS || VLANS_PORT13_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT13_VID_PTP
string "Port 13 VIDs for PTP"
default "0" if VLANS_PORT13_MODE_ACCESS || VLANS_PORT13_MODE_TRUNK
default "" if VLANS_PORT13_MODE_UNQUALIFIED
depends on VLANS_PORT13_MODE_ACCESS || VLANS_PORT13_MODE_TRUNK \
|| VLANS_PORT13_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 14" comment "Port 14"
...@@ -1108,22 +1084,20 @@ config VLANS_PORT14_PRIO ...@@ -1108,22 +1084,20 @@ config VLANS_PORT14_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT14_VID config VLANS_PORT14_VID
int "Port 14 VID" string "Port 14 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT14_MODE_ACCESS || VLANS_PORT14_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT14_VID_PTP
string "Port 14 VIDs for PTP"
default "0" if VLANS_PORT14_MODE_ACCESS || VLANS_PORT14_MODE_TRUNK
default "" if VLANS_PORT14_MODE_UNQUALIFIED
depends on VLANS_PORT14_MODE_ACCESS || VLANS_PORT14_MODE_TRUNK \
|| VLANS_PORT14_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 15" comment "Port 15"
...@@ -1184,22 +1158,20 @@ config VLANS_PORT15_PRIO ...@@ -1184,22 +1158,20 @@ config VLANS_PORT15_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT15_VID config VLANS_PORT15_VID
int "Port 15 VID" string "Port 15 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT15_MODE_ACCESS || VLANS_PORT15_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT15_VID_PTP
string "Port 15 VIDs for PTP"
default "0" if VLANS_PORT15_MODE_ACCESS || VLANS_PORT15_MODE_TRUNK
default "" if VLANS_PORT15_MODE_UNQUALIFIED
depends on VLANS_PORT15_MODE_ACCESS || VLANS_PORT15_MODE_TRUNK \
|| VLANS_PORT15_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 16" comment "Port 16"
...@@ -1260,22 +1232,20 @@ config VLANS_PORT16_PRIO ...@@ -1260,22 +1232,20 @@ config VLANS_PORT16_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT16_VID config VLANS_PORT16_VID
int "Port 16 VID" string "Port 16 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT16_MODE_ACCESS || VLANS_PORT16_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT16_VID_PTP
string "Port 16 VIDs for PTP"
default "0" if VLANS_PORT16_MODE_ACCESS || VLANS_PORT16_MODE_TRUNK
default "" if VLANS_PORT16_MODE_UNQUALIFIED
depends on VLANS_PORT16_MODE_ACCESS || VLANS_PORT16_MODE_TRUNK \
|| VLANS_PORT16_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 17" comment "Port 17"
...@@ -1336,22 +1306,20 @@ config VLANS_PORT17_PRIO ...@@ -1336,22 +1306,20 @@ config VLANS_PORT17_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT17_VID config VLANS_PORT17_VID
int "Port 17 VID" string "Port 17 VID"
default 0 default ""
range 0 4094
depends on VLANS_PORT17_MODE_ACCESS || VLANS_PORT17_MODE_UNQUALIFIED
help
VID value used when tagging frames or to override VID passed to RTU
config VLANS_PORT17_VID_PTP
string "Port 17 VIDs for PTP"
default "0" if VLANS_PORT17_MODE_ACCESS || VLANS_PORT17_MODE_TRUNK
default "" if VLANS_PORT17_MODE_UNQUALIFIED
depends on VLANS_PORT17_MODE_ACCESS || VLANS_PORT17_MODE_TRUNK \
|| VLANS_PORT17_MODE_UNQUALIFIED
help help
Semicolon separated list describing which vlans shall be assigned to This value based on the port's mode is used as:
a PTP instance on a particular port --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
--MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
synchronization; semicolon separated list is allowed
--MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed
--MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
synchronization; semicolon separated list is allowed;
The range of a valid VID is 0 to 4094
comment "Port 18" comment "Port 18"
...@@ -1412,22 +1380,20 @@ config VLANS_PORT18_PRIO ...@@ -1412,22 +1380,20 @@ config VLANS_PORT18_PRIO
-1 disables the priority overwrite. Valid values are from -1 to 7. -1 disables the priority overwrite. Valid values are from -1 to 7.
config VLANS_PORT18_VID config VLANS_PORT18_VID
int "Port 18 VID" string "Port 18 VID"
default 0 default ""
range 0 4094 help
depends on VLANS_PORT18_MODE_ACCESS || VLANS_PORT18_MODE_UNQUALIFIED This value based on the port's mode is used as:
help --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify
VID value used when tagging frames or to override VID passed to RTU the PPSI which VLAN shall it use for synchronization; only one VLAN
number shall be used in this mode
config VLANS_PORT18_VID_PTP --MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for
string "Port 18 VIDs for PTP" synchronization; semicolon separated list is allowed
default "0" if VLANS_PORT18_MODE_ACCESS || VLANS_PORT18_MODE_TRUNK --MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for
default "" if VLANS_PORT18_MODE_UNQUALIFIED synchronization; semicolon separated list is allowed
depends on VLANS_PORT18_MODE_ACCESS || VLANS_PORT18_MODE_TRUNK \ --MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for
|| VLANS_PORT18_MODE_UNQUALIFIED synchronization; semicolon separated list is allowed;
help The range of a valid VID is 0 to 4094
Semicolon separated list describing which vlans shall be assigned to
a PTP instance on a particular port
# Ports configuration # Ports configuration
endmenu endmenu
......
userspace/host_tools/gen_vlan_kconf.sh
View file @ c2172b7c
...@@ -75,6 +75,8 @@ for port_i in {1..18}; do ...@@ -75,6 +75,8 @@ for port_i in {1..18}; do
echo " configured in PORT_VID. If PRIO_VAL is not -1," echo " configured in PORT_VID. If PRIO_VAL is not -1,"
echo " the value of priority provided to RTU is" echo " the value of priority provided to RTU is"
echo " overridden with the configured PRIO_VAL" echo " overridden with the configured PRIO_VAL"
echo " NOTE: providing a VID for this mode is not"
echo " supported in the dot-config"
echo " * VLAN tag : are admitted; if PRIO_VAL is not -1, the value of" echo " * VLAN tag : are admitted; if PRIO_VAL is not -1, the value of"
echo " priority provided to RTU is overridden with" echo " priority provided to RTU is overridden with"
echo " the configured PRIO_VAL" echo " the configured PRIO_VAL"
...@@ -134,22 +136,20 @@ for port_i in {1..18}; do ...@@ -134,22 +136,20 @@ for port_i in {1..18}; do
echo " -1 disables the priority overwrite. Valid values are from -1 to 7." echo " -1 disables the priority overwrite. Valid values are from -1 to 7."
echo "" echo ""
echo "config VLANS_PORT"$port_0i"_VID" echo "config VLANS_PORT"$port_0i"_VID"
echo " int \"Port "$port_i" VID\"" echo " string \"Port "$port_i" VID\""
echo " default 0" echo " default \"\""
echo " range 0 4094"
echo " depends on VLANS_PORT"$port_0i"_MODE_ACCESS || VLANS_PORT"$port_0i"_MODE_UNQUALIFIED"
echo " help" echo " help"
echo " VID value used when tagging frames or to override VID passed to RTU" echo " This value based on the port's mode is used as:"
echo "" echo " --MODE_ACCESS - (mandatory) use as VID for tagging incoming frames and notify"
echo "config VLANS_PORT"$port_0i"_VID_PTP" echo " the PPSI which VLAN shall it use for synchronization; only one VLAN"
echo " string \"Port "$port_i" VIDs for PTP\"" echo " number shall be used in this mode"
echo " default \"0\" if VLANS_PORT"$port_0i"_MODE_ACCESS || VLANS_PORT"$port_0i"_MODE_TRUNK" echo " --MODE_TRUNK - (optional) notify the PPSI which VLAN shall it use for"
echo " default \"\" if VLANS_PORT"$port_0i"_MODE_UNQUALIFIED" echo " synchronization; semicolon separated list is allowed"
echo " depends on VLANS_PORT"$port_0i"_MODE_ACCESS || VLANS_PORT"$port_0i"_MODE_TRUNK \\" echo " --MODE_DISABLED - (optional) notify the PPSI which VLANs shall it use for"
echo " || VLANS_PORT"$port_0i"_MODE_UNQUALIFIED" echo " synchronization; semicolon separated list is allowed"
echo " help" echo " --MODE_UNQUALIFIED - (optional) notify the PPSI which VLANs shall it use for"
echo " Semicolon separated list describing which vlans shall be assigned to" echo " synchronization; semicolon separated list is allowed;"
echo " a PTP instance on a particular port" echo " The range of a valid VID is 0 to 4094"
echo "" echo ""
done done
......
userspace/rootfs_override/wr/bin/assembly_ppsi_conf.sh
View file @ c2172b7c
...@@ -79,16 +79,23 @@ for i_zero in {01..18};do ...@@ -79,16 +79,23 @@ for i_zero in {01..18};do
unset port_mode_access; unset port_mode_access;
unset port_mode_trunk; unset port_mode_trunk;
unset port_mode_unqualified; unset port_mode_unqualified;
unset port_mode_disabled;
# check port mode # check port mode
port_mode_access=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_ACCESS") port_mode_access=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_ACCESS")
port_mode_trunk=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_TRUNK") port_mode_trunk=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_TRUNK")
port_mode_unqualified=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_UNQUALIFIED") port_mode_unqualified=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_UNQUALIFIED")
port_mode_disabled=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_MODE_DISABLED")
# check port mode # check port mode
if [ "$port_mode_access" = "y" ] \ if [ "$port_mode_access" = "y" ]; then
|| [ "$port_mode_trunk" = "y" ] \ ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_VID")
echo "vlan $ppsi_vlans" >> $OUTPUT_FILE
fi
if [ "$port_mode_trunk" = "y" ] \
|| [ "$port_mode_disabled" = "y" ] \
|| [ "$port_mode_unqualified" = "y" ]; then || [ "$port_mode_unqualified" = "y" ]; then
ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_VID_PTP") ppsi_vlans=$(eval "echo \$CONFIG_VLANS_PORT"$i_zero"_VID")
if [ -n "$ppsi_vlans" ]; then if [ -n "$ppsi_vlans" ]; then
mod_vlans=${ppsi_vlans//;/,} mod_vlans=${ppsi_vlans//;/,}
echo "vlan $mod_vlans" >> $OUTPUT_FILE echo "vlan $mod_vlans" >> $OUTPUT_FILE
......
userspace/tools/wrs_vlans.c
View file @ c2172b7c
...@@ -1032,12 +1032,14 @@ static int read_dot_config(char *dot_config_file) ...@@ -1032,12 +1032,14 @@ static int read_dot_config(char *dot_config_file)
printf("Found %s=%s\n", buff, val_ch); printf("Found %s=%s\n", buff, val_ch);
set_p_prio(port - 1, val_ch); set_p_prio(port - 1, val_ch);
} }
sprintf(buff, "VLANS_PORT%02d_VID", port); if (mode == QMODE_ACCESS) {
val_ch = libwr_cfg_get(buff); sprintf(buff, "VLANS_PORT%02d_VID", port);
if (val_ch) { val_ch = libwr_cfg_get(buff);
if (wrs_msg_level >= LOG_DEBUG) if (val_ch) {
printf("Found %s=%s\n", buff, val_ch); if (wrs_msg_level >= LOG_DEBUG)
set_p_vid(port - 1, val_ch); printf("Found %s=%s\n", buff, val_ch);
set_p_vid(port - 1, val_ch);
}
} }
} }
......
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