Skip to content

Commit 443b08f

Browse files
jcyu-acctonjcyu-accton
committed
Add new Profile ID for supports Wedge800CA platform.
Description: This PR is used to add Profile IDs which will be added to Wedge800CA platform. PROFILE_200G_4_PAM4_RS544_OPTICAL = 61, PROFILE_200G_4_PAM4_RS544_COPPER = 62, PROFILE_400G_4_PAM4_RS544_OPTICAL = 63, PROFILE_400G_4_PAM4_RS544_COPPER = 64, PROFILE_800G_8_PAM4_RS544_OPTICAL = 65, PROFILE_800G_8_PAM4_RS544_COPPER = 66, Note: 1. ProfileID 57 will be added by PR#585(facebook#585). 2. ProfileID 58 and 59 will be added by PR#586(facebook#586). 3. So I add the new ID begin from 60.
1 parent 3910457 commit 443b08f

File tree

4 files changed

+42
-0
lines changed

4 files changed

+42
-0
lines changed

‎fboss/agent/Platform.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,17 @@ int Platform::getLaneCount(cfg::PortProfileID profile) const {
253253
case cfg::PortProfileID::PROFILE_100G_4_NRZ_RS528_COPPER:
254254
case cfg::PortProfileID::PROFILE_100G_4_NRZ_RS528_OPTICAL:
255255
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544X2N_COPPER:
256+
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544_OPTICAL:
257+
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544_COPPER:
256258
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544X2N_OPTICAL:
257259
case cfg::PortProfileID::PROFILE_100G_4_NRZ_CL91_COPPER:
258260
case cfg::PortProfileID::PROFILE_100G_4_NRZ_CL91_OPTICAL:
259261
case cfg::PortProfileID::PROFILE_100G_4_NRZ_NOFEC_COPPER:
260262
case cfg::PortProfileID::PROFILE_100G_4_NRZ_CL91_COPPER_RACK_YV3_T1:
261263
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544X2N_OPTICAL:
262264
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544X2N_COPPER:
265+
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544_OPTICAL:
266+
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544_COPPER:
263267
case cfg::PortProfileID::PROFILE_800G_4_PAM4_RS544X2N_OPTICAL:
264268
return 4;
265269

@@ -268,6 +272,8 @@ int Platform::getLaneCount(cfg::PortProfileID profile) const {
268272
case cfg::PortProfileID::PROFILE_400G_8_PAM4_RS544X2N_COPPER:
269273
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544X2N_OPTICAL:
270274
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544X2N_COPPER:
275+
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544_OPTICAL:
276+
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544_COPPER:
271277
return 8;
272278

273279
case cfg::PortProfileID::PROFILE_DEFAULT:

‎fboss/agent/switch_config.thrift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,12 @@ enum PortProfileID {
181181
PROFILE_200G_2_PAM4_RS544_COPPER = 54,
182182
PROFILE_100G_2_PAM4_RS544_COPPER = 55,
183183
PROFILE_100G_1_PAM4_RS544_COPPER = 56,
184+
PROFILE_200G_4_PAM4_RS544_OPTICAL = 60,
185+
PROFILE_200G_4_PAM4_RS544_COPPER = 61,
186+
PROFILE_400G_4_PAM4_RS544_OPTICAL = 62,
187+
PROFILE_400G_4_PAM4_RS544_COPPER = 63,
188+
PROFILE_800G_8_PAM4_RS544_OPTICAL = 64,
189+
PROFILE_800G_8_PAM4_RS544_COPPER = 65,
184190
}
185191

186192
enum Scope {

‎fboss/agent/test/utils/PortTestUtils.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ cfg::PortSpeed getSpeed(cfg::PortProfileID profile) {
8181
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544X2N_OPTICAL:
8282
case cfg::PortProfileID::PROFILE_200G_2_PAM4_RS544_COPPER:
8383
case cfg::PortProfileID::PROFILE_200G_1_PAM4_RS544X2N_OPTICAL:
84+
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544_OPTICAL:
85+
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544_COPPER:
8486
return cfg::PortSpeed::TWOHUNDREDG;
8587

8688
case cfg::PortProfileID::PROFILE_400G_8_PAM4_RS544X2N:
@@ -89,11 +91,15 @@ cfg::PortSpeed getSpeed(cfg::PortProfileID profile) {
8991
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544X2N_OPTICAL:
9092
case cfg::PortProfileID::PROFILE_400G_2_PAM4_RS544X2N_OPTICAL:
9193
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544X2N_COPPER:
94+
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544_OPTICAL:
95+
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544_COPPER:
9296
return cfg::PortSpeed::FOURHUNDREDG;
9397

9498
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544X2N_OPTICAL:
9599
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544X2N_COPPER:
96100
case cfg::PortProfileID::PROFILE_800G_4_PAM4_RS544X2N_OPTICAL:
101+
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544_OPTICAL:
102+
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544_COPPER:
97103
return cfg::PortSpeed::EIGHTHUNDREDG;
98104

99105
case cfg::PortProfileID::PROFILE_DEFAULT:
@@ -119,6 +125,7 @@ TransmitterTechnology getMediaType(cfg::PortProfileID profile) {
119125
case cfg::PortProfileID::PROFILE_100G_4_NRZ_CL91_COPPER:
120126
case cfg::PortProfileID::PROFILE_100G_4_NRZ_NOFEC_COPPER:
121127
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544X2N_COPPER:
128+
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544_COPPER:
122129
case cfg::PortProfileID::PROFILE_200G_2_PAM4_RS544_COPPER:
123130
case cfg::PortProfileID::PROFILE_100G_4_NRZ_CL91_COPPER_RACK_YV3_T1:
124131
case cfg::PortProfileID::PROFILE_25G_1_NRZ_NOFEC_COPPER_RACK_YV3_T1:
@@ -127,9 +134,11 @@ TransmitterTechnology getMediaType(cfg::PortProfileID profile) {
127134
case cfg::PortProfileID::PROFILE_106POINT25G_1_PAM4_RS544_COPPER:
128135
case cfg::PortProfileID::PROFILE_50G_1_PAM4_RS544_COPPER:
129136
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544X2N_COPPER:
137+
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544_COPPER:
130138
case cfg::PortProfileID::PROFILE_100G_2_PAM4_RS544X2N_COPPER:
131139
case cfg::PortProfileID::PROFILE_100G_1_PAM4_NOFEC_COPPER:
132140
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544X2N_COPPER:
141+
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544_COPPER:
133142
return TransmitterTechnology::COPPER;
134143

135144
case cfg::PortProfileID::PROFILE_10G_1_NRZ_NOFEC_OPTICAL:
@@ -142,9 +151,12 @@ TransmitterTechnology getMediaType(cfg::PortProfileID profile) {
142151
case cfg::PortProfileID::PROFILE_100G_4_NRZ_RS528_OPTICAL:
143152
case cfg::PortProfileID::PROFILE_100G_4_NRZ_CL91_OPTICAL:
144153
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544X2N_OPTICAL:
154+
case cfg::PortProfileID::PROFILE_200G_4_PAM4_RS544_OPTICAL:
145155
case cfg::PortProfileID::PROFILE_400G_8_PAM4_RS544X2N_OPTICAL:
146156
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544X2N_OPTICAL:
157+
case cfg::PortProfileID::PROFILE_400G_4_PAM4_RS544_OPTICAL:
147158
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544X2N_OPTICAL:
159+
case cfg::PortProfileID::PROFILE_800G_8_PAM4_RS544_OPTICAL:
148160
case cfg::PortProfileID::PROFILE_106POINT25G_1_PAM4_RS544_OPTICAL:
149161
case cfg::PortProfileID::PROFILE_100G_1_PAM4_RS544_OPTICAL:
150162
case cfg::PortProfileID::PROFILE_50G_1_PAM4_RS544_OPTICAL:

‎fboss/lib/platform_mapping_v2/helpers.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,26 @@ def profile_to_port_speed(profile: PortProfileID) -> List[PortSpeed]:
6565
if profile in [
6666
PortProfileID.PROFILE_200G_4_PAM4_RS544X2N_OPTICAL,
6767
PortProfileID.PROFILE_200G_4_PAM4_RS544X2N_COPPER,
68+
PortProfileID.PROFILE_200G_4_PAM4_RS544_OPTICAL,
69+
PortProfileID.PROFILE_200G_4_PAM4_RS544_COPPER,
6870
PortProfileID.PROFILE_200G_2_PAM4_RS544_COPPER,
6971
PortProfileID.PROFILE_200G_1_PAM4_RS544X2N_OPTICAL,
7072
]:
7173
return [PortSpeed.TWOHUNDREDG]
7274
if profile in [
7375
PortProfileID.PROFILE_400G_4_PAM4_RS544X2N_OPTICAL,
7476
PortProfileID.PROFILE_400G_4_PAM4_RS544X2N_COPPER,
77+
PortProfileID.PROFILE_400G_4_PAM4_RS544_COPPER,
78+
PortProfileID.PROFILE_400G_4_PAM4_RS544_OPTICAL,
7579
PortProfileID.PROFILE_400G_8_PAM4_RS544X2N_COPPER,
7680
PortProfileID.PROFILE_400G_2_PAM4_RS544X2N_OPTICAL,
7781
]:
7882
return [PortSpeed.FOURHUNDREDG]
7983
if profile in [
8084
PortProfileID.PROFILE_800G_8_PAM4_RS544X2N_OPTICAL,
8185
PortProfileID.PROFILE_800G_8_PAM4_RS544X2N_COPPER,
86+
PortProfileID.PROFILE_800G_8_PAM4_RS544_OPTICAL,
87+
PortProfileID.PROFILE_800G_8_PAM4_RS544_COPPER,
8288
PortProfileID.PROFILE_800G_4_PAM4_RS544X2N_OPTICAL,
8389
]:
8490
return [PortSpeed.EIGHTHUNDREDG]
@@ -140,15 +146,21 @@ def num_lanes_from_profile(profile: PortProfileID) -> int:
140146
PortProfileID.PROFILE_100G_4_NRZ_RS528_OPTICAL,
141147
PortProfileID.PROFILE_200G_4_PAM4_RS544X2N_OPTICAL,
142148
PortProfileID.PROFILE_200G_4_PAM4_RS544X2N_COPPER,
149+
PortProfileID.PROFILE_200G_4_PAM4_RS544_OPTICAL,
150+
PortProfileID.PROFILE_200G_4_PAM4_RS544_COPPER,
143151
PortProfileID.PROFILE_400G_4_PAM4_RS544X2N_OPTICAL,
144152
PortProfileID.PROFILE_400G_4_PAM4_RS544X2N_COPPER,
153+
PortProfileID.PROFILE_400G_4_PAM4_RS544_OPTICAL,
154+
PortProfileID.PROFILE_400G_4_PAM4_RS544_COPPER,
145155
PortProfileID.PROFILE_800G_4_PAM4_RS544X2N_OPTICAL,
146156
]:
147157
return 4
148158
if profile in [
149159
PortProfileID.PROFILE_400G_8_PAM4_RS544X2N_COPPER,
150160
PortProfileID.PROFILE_800G_8_PAM4_RS544X2N_OPTICAL,
151161
PortProfileID.PROFILE_800G_8_PAM4_RS544X2N_COPPER,
162+
PortProfileID.PROFILE_800G_8_PAM4_RS544_OPTICAL,
163+
PortProfileID.PROFILE_800G_8_PAM4_RS544_COPPER,
152164
]:
153165
return 8
154166
if profile in [PortProfileID.PROFILE_DEFAULT]:
@@ -785,8 +797,11 @@ def transmitter_tech_from_profile(
785797
if profile in [
786798
PortProfileID.PROFILE_53POINT125G_1_PAM4_RS545_OPTICAL,
787799
PortProfileID.PROFILE_200G_4_PAM4_RS544X2N_OPTICAL,
800+
PortProfileID.PROFILE_200G_4_PAM4_RS544_OPTICAL,
788801
PortProfileID.PROFILE_400G_4_PAM4_RS544X2N_OPTICAL,
802+
PortProfileID.PROFILE_400G_4_PAM4_RS544_OPTICAL,
789803
PortProfileID.PROFILE_800G_8_PAM4_RS544X2N_OPTICAL,
804+
PortProfileID.PROFILE_800G_8_PAM4_RS544_OPTICAL,
790805
PortProfileID.PROFILE_106POINT25G_1_PAM4_RS544_OPTICAL,
791806
PortProfileID.PROFILE_100G_4_NRZ_RS528_OPTICAL,
792807
PortProfileID.PROFILE_100G_1_PAM4_RS544_OPTICAL,
@@ -815,9 +830,12 @@ def transmitter_tech_from_profile(
815830
PortProfileID.PROFILE_100G_4_NRZ_NOFEC_COPPER,
816831
PortProfileID.PROFILE_200G_2_PAM4_RS544_COPPER,
817832
PortProfileID.PROFILE_400G_4_PAM4_RS544X2N_COPPER,
833+
PortProfileID.PROFILE_400G_4_PAM4_RS544_COPPER,
834+
PortProfileID.PROFILE_200G_4_PAM4_RS544_COPPER,
818835
PortProfileID.PROFILE_400G_8_PAM4_RS544X2N_COPPER,
819836
PortProfileID.PROFILE_100G_1_PAM4_NOFEC_COPPER,
820837
PortProfileID.PROFILE_800G_8_PAM4_RS544X2N_COPPER,
838+
PortProfileID.PROFILE_800G_8_PAM4_RS544_COPPER,
821839
]:
822840
return [TransmitterTechnology.COPPER]
823841
if profile in [PortProfileID.PROFILE_DEFAULT]:

0 commit comments

Comments
 (0)