Skip to content

[Nexthop][m4062nhp] Add 4x200G-FR4 speed combination so qsfp_service can program FR4_2x400G optics #1526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zackary-nexthop wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −2
Open

[Nexthop][m4062nhp] Add 4x200G-FR4 speed combination so qsfp_service can program FR4_2x400G optics #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fboss/qsfp_service/if/transceiver.thrift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ enum MediaInterfaceCode {
DR4_800G_GEARBOX = 35,
// 8x800G over DR4: 4 banks, each a 2x800G-DR4
DR4_8x800G = 36,
FR2_200G = 37,
}

// The extended specification compliance code of the transceiver module.
Expand Down Expand Up @@ -316,6 +317,7 @@ enum SMFMediaInterfaceCode {
ZR_OROADM_FLEXO_4E_DO_400G = 0x64,
ZR_OPENZRP_OFEC_400G = 0x36,
FR4_800G = 0x79,
FR2_200G = 0xC0,
FR2_400G = 0xC2,
FR1_200G = 0xC4,
ZR_VENDOR_CUSTOM = 0xF7,
Expand Down
10 changes: 10 additions & 0 deletions fboss/qsfp_service/module/properties/TransceiverPropertiesDefault.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,22 @@ constexpr auto kDefaultTransceiverPropertiesJson = R"({
"ports": [
{"speed": 800000, "hostLanes": {"start": 0, "count": 8}, "mediaLanes": {"start": 0, "count": 8}, "mediaLaneCode": {"smfCode": 0xC1}, "mediaInterfaceCode": 15}
]
},
{
"combinationName": "4x200G-FR4",
"ports": [
{"speed": 200000, "hostLanes": {"start": 0, "count": 2}, "mediaLanes": {"start": 0, "count": 2}, "mediaLaneCode": {"smfCode": 0xC0}, "mediaInterfaceCode": 37},
{"speed": 200000, "hostLanes": {"start": 2, "count": 2}, "mediaLanes": {"start": 2, "count": 2}, "mediaLaneCode": {"smfCode": 0xC0}, "mediaInterfaceCode": 37},
{"speed": 200000, "hostLanes": {"start": 4, "count": 2}, "mediaLanes": {"start": 4, "count": 2}, "mediaLaneCode": {"smfCode": 0xC0}, "mediaInterfaceCode": 37},
{"speed": 200000, "hostLanes": {"start": 6, "count": 2}, "mediaLanes": {"start": 6, "count": 2}, "mediaLaneCode": {"smfCode": 0xC0}, "mediaInterfaceCode": 37}
]
}
],
"speedChangeTransitions": [
["2x400G-FR4", "2x200G-FR4"],
["2x400G-FR4", "400G-FR4+200G-FR4"],
["2x400G-FR4", "200G-FR4+400G-FR4"],
["2x400G-FR4", "4x200G-FR4"],
]
},
"13": {
Expand Down
6 changes: 4 additions & 2 deletions fboss/qsfp_service/test/hw_test/HwTransceiverUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,13 +506,15 @@ void HwTransceiverUtils::verify200gProfile(
*mediaId.media()->smfCode() == SMFMediaInterfaceCode::LR4_200G ||
*mediaId.media()->smfCode() == SMFMediaInterfaceCode::DR2_200G ||
*mediaId.media()->smfCode() == SMFMediaInterfaceCode::DR1_200G ||
*mediaId.media()->smfCode() == SMFMediaInterfaceCode::FR1_200G);
*mediaId.media()->smfCode() == SMFMediaInterfaceCode::FR1_200G ||
*mediaId.media()->smfCode() == SMFMediaInterfaceCode::FR2_200G);
EXPECT_TRUE(
*mediaId.code() == MediaInterfaceCode::FR4_200G ||
*mediaId.code() == MediaInterfaceCode::LR4_200G ||
*mediaId.code() == MediaInterfaceCode::DR2_200G ||
*mediaId.code() == MediaInterfaceCode::DR1_200G ||
*mediaId.code() == MediaInterfaceCode::FR1_200G);
*mediaId.code() == MediaInterfaceCode::FR1_200G ||
*mediaId.code() == MediaInterfaceCode::FR2_200G);
}
}

Expand Down
Loading