From 4bfad29b3c78aa0701a86fdbb86b69d26b299086 Mon Sep 17 00:00:00 2001 From: shlomibitton <60430976+shlomibitton@users.noreply.github.com> Date: Thu, 18 Feb 2021 17:44:03 +0200 Subject: [PATCH] Fix for Mellanox-SN4600C-D112C8 SKU (#6817) - Why I did it Mellanox-SN4600C-D112C8 SKU is not configured properly. It should have 112 50G interfaces and 8 100G interfaces as described on this PR. - How I did it Modify sai_profile, port_config.ini and hwsku.json for DPB. - How to verify it Apply this HwSKU to a MSN4600C Mellanox platform. Signed-off-by: Shlomi Bitton --- .../Mellanox-SN4600C-D112C8/hwsku.json | 80 +++++++++++++++---- .../Mellanox-SN4600C-D112C8/port_config.ini | 48 +++++++---- .../sai_4600c_112x50g_8x100g.xml | 48 +++++++---- 3 files changed, 128 insertions(+), 48 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/hwsku.json b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/hwsku.json index 2e095568b91c..03af6221121b 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/hwsku.json +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/hwsku.json @@ -19,7 +19,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet24": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet26": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet32": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -40,7 +43,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet56": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet58": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet64": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -61,7 +67,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet88": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet90": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet96": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -82,7 +91,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet120": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet122": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet128": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -103,7 +115,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet152": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet154": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet160": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -124,7 +139,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet184": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet186": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet192": { "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" @@ -139,7 +157,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet216": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet218": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet224": { "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" @@ -154,7 +175,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet248": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet250": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet256": { "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" @@ -169,7 +193,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet280": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet282": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet288": { "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" @@ -184,7 +211,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet312": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet314": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet320": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -205,7 +235,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet344": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet346": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet352": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -226,7 +259,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet376": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet378": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet384": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -247,7 +283,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet408": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet410": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet416": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -268,7 +307,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet440": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet442": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet448": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -289,7 +331,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet472": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet474": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet480": { "default_brkout_mode": "2x50G[40G,25G,10G,1G]" @@ -310,7 +355,10 @@ "default_brkout_mode": "2x50G[40G,25G,10G,1G]" }, "Ethernet504": { - "default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]" + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" + }, + "Ethernet506": { + "default_brkout_mode": "2x50G[40G,25G,10G,1G]" } } } \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini index eb4cdc35637b..27d933d886fa 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/port_config.ini @@ -5,101 +5,117 @@ Ethernet8 8,9 etp2a 2 50000 none Ethernet10 10,11 etp2b 2 50000 none Ethernet16 16,17 etp3a 3 50000 none Ethernet18 18,19 etp3b 3 50000 none -Ethernet24 24,25,26,27 etp4 4 100000 rs +Ethernet24 24,25 etp4a 4 50000 none +Ethernet26 26,27 etp4b 4 50000 none Ethernet32 32,33 etp5a 5 50000 none Ethernet34 34,35 etp5b 5 50000 none Ethernet40 40,41 etp6a 6 50000 none Ethernet42 42,43 etp6b 6 50000 none Ethernet48 48,49 etp7a 7 50000 none Ethernet50 50,51 etp7b 7 50000 none -Ethernet56 56,57,58,59 etp8 8 100000 rs +Ethernet56 56,57 etp8a 8 50000 none +Ethernet58 58,59 etp8b 8 50000 none Ethernet64 64,65 etp9a 9 50000 none Ethernet66 66,67 etp9b 9 50000 none Ethernet72 72,73 etp10a 10 50000 none Ethernet74 74,75 etp10b 10 50000 none Ethernet80 80,81 etp11a 11 50000 none Ethernet82 82,83 etp11b 11 50000 none -Ethernet88 88,89,90,91 etp12 12 100000 rs +Ethernet88 88,89 etp12a 12 50000 none +Ethernet90 90,91 etp12b 12 50000 none Ethernet96 96,97 etp13a 13 50000 none Ethernet98 98,99 etp13b 13 50000 none Ethernet104 104,105 etp14a 14 50000 none Ethernet106 106,107 etp14b 14 50000 none Ethernet112 112,113 etp15a 15 50000 none Ethernet114 114,115 etp15b 15 50000 none -Ethernet120 120,121,122,123 etp16 16 100000 rs +Ethernet120 120,121 etp16a 16 50000 none +Ethernet122 122,123 etp16b 16 50000 none Ethernet128 128,129 etp17a 17 50000 none Ethernet130 130,131 etp17b 17 50000 none Ethernet136 136,137 etp18a 18 50000 none Ethernet138 138,139 etp18b 18 50000 none Ethernet144 144,145 etp19a 19 50000 none Ethernet146 146,147 etp19b 19 50000 none -Ethernet152 152,153,154,155 etp20 20 100000 rs +Ethernet152 152,153 etp20a 20 50000 none +Ethernet154 154,155 etp20b 20 50000 none Ethernet160 160,161 etp21a 21 50000 none Ethernet162 162,163 etp21b 21 50000 none Ethernet168 168,169 etp22a 22 50000 none Ethernet170 170,171 etp22b 22 50000 none Ethernet176 176,177 etp23a 23 50000 none Ethernet178 178,179 etp23b 23 50000 none -Ethernet184 184,185,186,187 etp24 24 100000 rs +Ethernet184 184,185 etp24a 24 50000 none +Ethernet186 186,187 etp24b 24 50000 none Ethernet192 192,193,194,195 etp25 25 100000 rs Ethernet200 200,201,202,203 etp26 26 100000 rs Ethernet208 208,209 etp27a 27 50000 none Ethernet210 210,211 etp27b 27 50000 none -Ethernet216 216,217,218,219 etp28 28 100000 rs +Ethernet216 216,217 etp28a 28 50000 none +Ethernet218 218,219 etp28b 28 50000 none Ethernet224 224,225,226,227 etp29 29 100000 rs Ethernet232 232,233,234,235 etp30 30 100000 rs Ethernet240 240,241 etp31a 31 50000 none Ethernet242 242,243 etp31b 31 50000 none -Ethernet248 248,249,250,251 etp32 32 100000 rs +Ethernet248 248,249 etp32a 32 50000 none +Ethernet250 250,251 etp32b 32 50000 none Ethernet256 256,257,258,259 etp33 33 100000 rs Ethernet264 264,265,266,267 etp34 34 100000 rs Ethernet272 272,273 etp35a 35 50000 none Ethernet274 274,275 etp35b 35 50000 none -Ethernet280 280,281,282,283 etp36 36 100000 rs +Ethernet280 280,281 etp36a 36 50000 none +Ethernet282 282,283 etp36b 36 50000 none Ethernet288 288,289,290,291 etp37 37 100000 rs Ethernet296 296,297,298,299 etp38 38 100000 rs Ethernet304 304,305 etp39a 39 50000 none Ethernet306 306,307 etp39b 39 50000 none -Ethernet312 312,313,314,315 etp40 40 100000 rs +Ethernet312 312,313 etp40a 40 50000 none +Ethernet314 314,315 etp40b 40 50000 none Ethernet320 320,321 etp41a 41 50000 none Ethernet322 322,323 etp41b 41 50000 none Ethernet328 328,329 etp42a 42 50000 none Ethernet330 330,331 etp42b 42 50000 none Ethernet336 336,337 etp43a 43 50000 none Ethernet338 338,339 etp43b 43 50000 none -Ethernet344 344,345,346,347 etp44 44 100000 rs +Ethernet344 344,345 etp44a 44 50000 none +Ethernet346 346,347 etp44b 44 50000 none Ethernet352 352,353 etp45a 45 50000 none Ethernet354 354,355 etp45b 45 50000 none Ethernet360 360,361 etp46a 46 50000 none Ethernet362 362,363 etp46b 46 50000 none Ethernet368 368,369 etp47a 47 50000 none Ethernet370 370,371 etp47b 47 50000 none -Ethernet376 376,377,378,379 etp48 48 100000 rs +Ethernet376 376,377 etp48a 48 50000 none +Ethernet378 378,379 etp48b 48 50000 none Ethernet384 384,385 etp49a 49 50000 none Ethernet386 386,387 etp49b 49 50000 none Ethernet392 392,393 etp50a 50 50000 none Ethernet394 394,395 etp50b 50 50000 none Ethernet400 400,401 etp51a 51 50000 none Ethernet402 402,403 etp51b 51 50000 none -Ethernet408 408,409,410,411 etp52 52 100000 rs +Ethernet408 408,409 etp52a 52 50000 none +Ethernet410 410,411 etp52b 52 50000 none Ethernet416 416,417 etp53a 53 50000 none Ethernet418 418,419 etp53b 53 50000 none Ethernet424 424,425 etp54a 54 50000 none Ethernet426 426,427 etp54b 54 50000 none Ethernet432 432,433 etp55a 55 50000 none Ethernet434 434,435 etp55b 55 50000 none -Ethernet440 440,441,442,443 etp56 56 100000 rs +Ethernet440 440,441 etp56a 56 50000 none +Ethernet442 442,443 etp56b 56 50000 none Ethernet448 448,449 etp57a 57 50000 none Ethernet450 450,451 etp57b 57 50000 none Ethernet456 456,457 etp58a 58 50000 none Ethernet458 458,459 etp58b 58 50000 none Ethernet464 464,465 etp59a 59 50000 none Ethernet466 466,467 etp59b 59 50000 none -Ethernet472 472,473,474,475 etp60 60 100000 rs +Ethernet472 472,473 etp60a 60 50000 none +Ethernet474 474,475 etp60b 60 50000 none Ethernet480 480,481 etp61a 61 50000 none Ethernet482 482,483 etp61b 61 50000 none Ethernet488 488,489 etp62a 62 50000 none Ethernet490 490,491 etp62b 62 50000 none Ethernet496 496,497 etp63a 63 50000 none Ethernet498 498,499 etp63b 63 50000 none -Ethernet504 504,505,506,507 etp64 64 100000 rs +Ethernet504 504,505 etp64a 64 50000 none +Ethernet506 506,507 etp64b 64 50000 none diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml index 199c251fbee2..2016d0bdf297 100644 --- a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml +++ b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai_4600c_112x50g_8x100g.xml @@ -43,10 +43,11 @@ 111 + 2 4 3 3 - 1536 + 384 97 @@ -74,10 +75,11 @@ 103 + 2 4 7 3 - 1536 + 384 121 @@ -105,10 +107,11 @@ 127 + 2 4 11 3 - 1536 + 384 113 @@ -136,10 +139,11 @@ 119 + 2 4 15 3 - 1536 + 384 89 @@ -167,10 +171,11 @@ 95 + 2 4 19 3 - 1536 + 384 81 @@ -198,10 +203,11 @@ 87 + 2 4 23 3 - 1536 + 384 73 @@ -227,10 +233,11 @@ 79 + 2 4 27 3 - 1536 + 384 65 @@ -256,10 +263,11 @@ 71 + 2 4 31 3 - 1536 + 384 5 @@ -285,10 +293,11 @@ 3 + 2 4 35 3 - 1536 + 384 13 @@ -314,10 +323,11 @@ 11 + 2 4 39 3 - 1536 + 384 21 @@ -345,10 +355,11 @@ 19 + 2 4 43 3 - 1536 + 384 29 @@ -376,10 +387,11 @@ 27 + 2 4 47 3 - 1536 + 384 53 @@ -407,10 +419,11 @@ 51 + 2 4 51 3 - 1536 + 384 61 @@ -438,10 +451,11 @@ 59 + 2 4 55 3 - 1536 + 384 37 @@ -469,10 +483,11 @@ 35 + 2 4 59 3 - 1536 + 384 45 @@ -500,10 +515,11 @@ 43 + 2 4 63 3 - 1536 + 384