Skip to content

Commit 0451043

Browse files
tshalvipull[bot]
tshalvi
authored and
pull[bot]
committed
[Mellanox] Adding a new field to CONFIG DB: "subport" (#18204)
- Why I did it The field 'subport' represents the index of the split port within a physical port. For example, if a port is split into 4, the subport of the first logical port is 1, the subport of the second logical port is 2, and so on. In xcvrd, the CMIS manager uses the subport to calculate the lane mask, which is used to control the data path per lane. In Nvidia platform, the subport is missing and is always set to 0. According to the xcvrd code, when subport=0, it will always correspond to the first logical port. Therefore, if we shut down any logical port that is not the first one, we will see the operational status of the first logical port also becomes down. This PR aims to add the subport field to CONFIG DB and prevent such scenarios. This is applicable only for static default breakout mode. For DPB, subport calculation will happen on the fly (changes are not in Sonic yet). (Subport HLD: HLD of subport: [link to the HLD document]) - How I did it I have added the 'subport' field to all relevant Nvidia hwsku.json files (minigraph generation is based on them). Additionally, I introduced the new 'subport' field to portconfig.py, so that sonic-cfggen will be able to generate the minigraph with it. In this file, I also fixed an error that caused all attributes from hwsku.json to be applied only to the first logical ports associated with a physical port. Furthermore, I updated hwsku_json_checker to include the new field and applied a fix to the sample_hwsku.json file. sample_hwsku.json is the file that sonic-config-engine's unit tests rely on for its tests. Previously, it only included attributes for the first logical port of a split physical port. For example, if Ethernet4, a 4-lane port, was split into 2 ports, then sample_hwsku.json included only the entry for Ethernet4, with no entry for Ethernet6. This misalignment with the structure of other hwsku.json files has been corrected as well. - How to verify it Ensure that each logical port has the correct value of 'subport' in CONFIG DB, and that shutting down a logical port affects only that port and not other ports in the split.
1 parent d63ddc3 commit 0451043

File tree

8 files changed

+873
-357
lines changed

8 files changed

+873
-357
lines changed

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-C128/hwsku.json

+256-128
Large diffs are not rendered by default.

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/hwsku.json

+64-32
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,132 @@
11
{
22
"interfaces": {
33
"Ethernet0": {
4-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
4+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
5+
"subport": "1"
56
},
67
"Ethernet8": {
7-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
8+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
9+
"subport": "1"
810
},
911
"Ethernet16": {
10-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
12+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
13+
"subport": "1"
1114
},
1215
"Ethernet24": {
13-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
16+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
17+
"subport": "1"
1418
},
1519
"Ethernet32": {
16-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
20+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
21+
"subport": "1"
1722
},
1823
"Ethernet40": {
19-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
24+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
25+
"subport": "1"
2026
},
2127
"Ethernet48": {
22-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
28+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
29+
"subport": "1"
2330
},
2431
"Ethernet56": {
25-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
32+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
33+
"subport": "1"
2634
},
2735
"Ethernet64": {
28-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
36+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
37+
"subport": "1"
2938
},
3039
"Ethernet72": {
31-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
40+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
41+
"subport": "1"
3242
},
3343
"Ethernet80": {
34-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
44+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
45+
"subport": "1"
3546
},
3647
"Ethernet88": {
37-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
48+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
49+
"subport": "1"
3850
},
3951
"Ethernet96": {
40-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
52+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
53+
"subport": "1"
4154
},
4255
"Ethernet104": {
43-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
56+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
57+
"subport": "1"
4458
},
4559
"Ethernet112": {
46-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
60+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
61+
"subport": "1"
4762
},
4863
"Ethernet120": {
49-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
64+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
65+
"subport": "1"
5066
},
5167
"Ethernet128": {
52-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
68+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
69+
"subport": "1"
5370
},
5471
"Ethernet136": {
55-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
72+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
73+
"subport": "1"
5674
},
5775
"Ethernet144": {
58-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
76+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
77+
"subport": "1"
5978
},
6079
"Ethernet152": {
61-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
80+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
81+
"subport": "1"
6282
},
6383
"Ethernet160": {
64-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
84+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
85+
"subport": "1"
6586
},
6687
"Ethernet168": {
67-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
88+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
89+
"subport": "1"
6890
},
6991
"Ethernet176": {
70-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
92+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
93+
"subport": "1"
7194
},
7295
"Ethernet184": {
73-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
96+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
97+
"subport": "1"
7498
},
7599
"Ethernet192": {
76-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
100+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
101+
"subport": "1"
77102
},
78103
"Ethernet200": {
79-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
104+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
105+
"subport": "1"
80106
},
81107
"Ethernet208": {
82-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
108+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
109+
"subport": "1"
83110
},
84111
"Ethernet216": {
85-
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]"
112+
"default_brkout_mode": "1x400G[200G,100G,50G,40G,25G,10G,1G]",
113+
"subport": "1"
86114
},
87115
"Ethernet224": {
88-
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
116+
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
117+
"subport": "1"
89118
},
90119
"Ethernet232": {
91-
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
120+
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
121+
"subport": "1"
92122
},
93123
"Ethernet240": {
94-
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
124+
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
125+
"subport": "1"
95126
},
96127
"Ethernet248": {
97-
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]"
128+
"default_brkout_mode": "1x200G[400G,100G,50G,40G,25G,10G,1G]",
129+
"subport": "1"
98130
}
99131
}
100132
}

0 commit comments

Comments
 (0)