From d2e62af85d85b85f1eaf2090768b3f50fa4738ef Mon Sep 17 00:00:00 2001 From: Alexander Allen Date: Sun, 20 Jun 2021 12:35:44 -0400 Subject: [PATCH] [device][mellanox] Fix supported breakout modes on MSN4410 (#7853) - Why I did it The default breakout mode according to hwsku.json for the MSN4410 is 1x400G and this is not a supported breakout mode according to its platform.json This causes a conflict on boot of this platform and no containers on the switch will init successfully. - How I did it Referenced the platform specification files and updated platform.json - How to verify it Install master version of SONiC on MSN4410 Boot switch and verify swss is successfully running using docker ps --- .../x86_64-mlnx_msn4410-r0/platform.json | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json b/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json index c4836d4b23..61df8efaed 100644 --- a/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn4410-r0/platform.json @@ -627,72 +627,72 @@ "index": "25,25,25,25,25,25,25,25", "lanes": "192,193,194,195,196,197,198,199", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp25"], - "2x50G[40G,25G,10G,1G]": ["etp25a", "etp25b"], - "4x25G[10G,1G]": ["etp25a", "etp25b", "etp25c", "etp25d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp25"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp25a", "etp25b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp25a", "etp25b", "etp25c", "etp25d"] } }, "Ethernet200": { "index": "26,26,26,26,26,26,26,26", "lanes": "200,201,202,203,204,205,206,207", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp26"], - "2x50G[40G,25G,10G,1G]": ["etp26a", "etp26b"], - "4x25G[10G,1G]": ["etp26a", "etp26b", "etp26c", "etp26d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp26"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp26a", "etp26b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp26a", "etp26b", "etp26c", "etp26d"] } }, "Ethernet208": { "index": "27,27,27,27,27,27,27,27", "lanes": "208,209,210,211,212,213,214,215", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp27"], - "2x50G[40G,25G,10G,1G]": ["etp27a", "etp27b"], - "4x25G[10G,1G]": ["etp27a", "etp27b", "etp27c", "etp27d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp27"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp27a", "etp27b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp27a", "etp27b", "etp27c", "etp27d"] } }, "Ethernet216": { "index": "28,28,28,28,28,28,28,28", "lanes": "216,217,218,219,220,221,222,223", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp28"], - "2x50G[40G,25G,10G,1G]": ["etp28a", "etp28b"], - "4x25G[10G,1G]": ["etp28a", "etp28b", "etp28c", "etp28d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp28"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp28a", "etp28b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp28a", "etp28b", "etp28c", "etp28d"] } }, "Ethernet224": { "index": "29,29,29,29,29,29,29,29", "lanes": "224,225,226,227,228,229,230,231", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp29"], - "2x50G[40G,25G,10G,1G]": ["etp29a", "etp29b"], - "4x25G[10G,1G]": ["etp29a", "etp29b", "etp29c", "etp29d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp29"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp29a", "etp29b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp29a", "etp29b", "etp29c", "etp29d"] } }, "Ethernet232": { "index": "30,30,30,30,30,30,30,30", "lanes": "232,233,234,235,236,237,238,239", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp30"], - "2x50G[40G,25G,10G,1G]": ["etp30a", "etp30b"], - "4x25G[10G,1G]": ["etp30a", "etp30b", "etp30c", "etp30d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp30"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp30a", "etp30b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp30a", "etp30b", "etp30c", "etp30d"] } }, "Ethernet240": { "index": "31,31,31,31,31,31,31,31", "lanes": "240,241,242,243,244,245,246,247", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp31"], - "2x50G[40G,25G,10G,1G]": ["etp31a", "etp31b"], - "4x25G[10G,1G]": ["etp31a", "etp31b", "etp31c", "etp31d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp31"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp31a", "etp31b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp31a", "etp31b", "etp31c", "etp31d"] } }, "Ethernet248": { "index": "32,32,32,32,32,32,32,32", "lanes": "248,249,250,251,252,253,254,255", "breakout_modes": { - "1x100G[50G,40G,25G,10G,1G]": ["etp32"], - "2x50G[40G,25G,10G,1G]": ["etp32a", "etp32b"], - "4x25G[10G,1G]": ["etp32a", "etp32b", "etp32c", "etp32d"] + "1x400G[200G,100G,50G,40G,25G,10G,1G]": ["etp32"], + "2x200G[100G,50G,40G,25G,10G,1G]": ["etp32a", "etp32b"], + "4x100G[50G,40G,25G,10G,1G]": ["etp32a", "etp32b", "etp32c", "etp32d"] } } }