From b8ba51f4a924fbe5f0f68d11104c86f30a222dca Mon Sep 17 00:00:00 2001 From: Vadym Hlushko Date: Tue, 24 Nov 2020 08:44:05 +0000 Subject: [PATCH 1/3] [DPB] added capability files for SN2100 platform Signed-off-by: Vadym Hlushko --- .../ACS-MSN2100/hwsku.json | 52 +++++++++ .../x86_64-mlnx_msn2100-r0/platform.json | 100 ++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json create mode 100644 device/mellanox/x86_64-mlnx_msn2100-r0/platform.json diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json new file mode 100644 index 000000000000..bef5d2c7a6d4 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json @@ -0,0 +1,52 @@ +{ + "interfaces": { + "Ethernet0": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet4": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet8": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet12": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet16": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet20": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet24": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet28": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet32": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet36": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet40": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet44": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet48": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet52": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet56": { + "default_brkout_mode": "1x100G[40G]" + }, + "Ethernet60": { + "default_brkout_mode": "1x100G[40G]" + } + } +} \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json new file mode 100644 index 000000000000..654397577267 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json @@ -0,0 +1,100 @@ +{ + "interfaces": { + "Ethernet0": { + "index": "1,1,1,1", + "lanes": "0,1,2,3", + "alias_at_lanes": "etp1a, etp1b, etp1c, etp1d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet4": { + "index": "2,2,2,2", + "lanes": "4,5,6,7", + "alias_at_lanes": "etp2a, etp2b, etp2c, etp2d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet8": { + "index": "3,3,3,3", + "lanes": "8,9,10,11", + "alias_at_lanes": "etp3a, etp3b, etp3c, etp3d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet12": { + "index": "4,4,4,4", + "lanes": "12,13,14,15", + "alias_at_lanes": "etp4a, etp4b, etp4c, etp4d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet16": { + "index": "5,5,5,5", + "lanes": "16,17,18,19", + "alias_at_lanes": "etp5a, etp5b, etp5c, etp5d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet20": { + "index": "6,6,6,6", + "lanes": "20,21,22,23", + "alias_at_lanes": "etp6a, etp6b, etp6c, etp6d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet24": { + "index": "7,7,7,7", + "lanes": "24,25,26,27", + "alias_at_lanes": "etp7a, etp7b, etp7c, etp7d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet28": { + "index": "8,8,8,8", + "lanes": "28,29,30,31", + "alias_at_lanes": "etp8a, etp8b, etp8c, etp8d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet32": { + "index": "9,9,9,9", + "lanes": "32,33,34,35", + "alias_at_lanes": "etp9a, etp9b, etp9c, etp9d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet36": { + "index": "10,10,10,10", + "lanes": "36,37,38,39", + "alias_at_lanes": "etp10a, etp10b, etp10c, etp10d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet40": { + "index": "11,11,11,11", + "lanes": "40,41,42,43", + "alias_at_lanes": "etp11a, etp11b, etp11c, etp11d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet44": { + "index": "12,12,12,12", + "lanes": "44,45,46,47", + "alias_at_lanes": "etp12a, etp12b, etp12c, etp12d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet48": { + "index": "13,13,13,13", + "lanes": "48,49,50,51", + "alias_at_lanes": "etp13a, etp13b, etp13c, etp13d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet52": { + "index": "14,14,14,14", + "lanes": "52,53,54,55", + "alias_at_lanes": "etp14a, etp14b, etp14c, etp14d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet56": { + "index": "15,15,15,15", + "lanes": "56,57,58,59", + "alias_at_lanes": "etp15a, etp15b, etp15c, etp15d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + }, + "Ethernet60": { + "index": "16,16,16,16", + "lanes": "60,61,62,63", + "alias_at_lanes": "etp16a, etp16b, etp16c, etp16d", + "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + } + } +} From 4fca82562b1dae7a64c026175dd1f28e3da68a93 Mon Sep 17 00:00:00 2001 From: Vadym Hlushko Date: Tue, 15 Dec 2020 08:45:27 +0000 Subject: [PATCH 2/3] [DPB] fixed wrong split mode: 2x25G --> 2x50G Signed-off-by: Vadym Hlushko --- .../x86_64-mlnx_msn2100-r0/platform.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json index 654397577267..4dfc22aa64b6 100644 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json @@ -4,97 +4,97 @@ "index": "1,1,1,1", "lanes": "0,1,2,3", "alias_at_lanes": "etp1a, etp1b, etp1c, etp1d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet4": { "index": "2,2,2,2", "lanes": "4,5,6,7", "alias_at_lanes": "etp2a, etp2b, etp2c, etp2d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet8": { "index": "3,3,3,3", "lanes": "8,9,10,11", "alias_at_lanes": "etp3a, etp3b, etp3c, etp3d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet12": { "index": "4,4,4,4", "lanes": "12,13,14,15", "alias_at_lanes": "etp4a, etp4b, etp4c, etp4d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet16": { "index": "5,5,5,5", "lanes": "16,17,18,19", "alias_at_lanes": "etp5a, etp5b, etp5c, etp5d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet20": { "index": "6,6,6,6", "lanes": "20,21,22,23", "alias_at_lanes": "etp6a, etp6b, etp6c, etp6d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet24": { "index": "7,7,7,7", "lanes": "24,25,26,27", "alias_at_lanes": "etp7a, etp7b, etp7c, etp7d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet28": { "index": "8,8,8,8", "lanes": "28,29,30,31", "alias_at_lanes": "etp8a, etp8b, etp8c, etp8d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet32": { "index": "9,9,9,9", "lanes": "32,33,34,35", "alias_at_lanes": "etp9a, etp9b, etp9c, etp9d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet36": { "index": "10,10,10,10", "lanes": "36,37,38,39", "alias_at_lanes": "etp10a, etp10b, etp10c, etp10d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet40": { "index": "11,11,11,11", "lanes": "40,41,42,43", "alias_at_lanes": "etp11a, etp11b, etp11c, etp11d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet44": { "index": "12,12,12,12", "lanes": "44,45,46,47", "alias_at_lanes": "etp12a, etp12b, etp12c, etp12d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet48": { "index": "13,13,13,13", "lanes": "48,49,50,51", "alias_at_lanes": "etp13a, etp13b, etp13c, etp13d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet52": { "index": "14,14,14,14", "lanes": "52,53,54,55", "alias_at_lanes": "etp14a, etp14b, etp14c, etp14d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet56": { "index": "15,15,15,15", "lanes": "56,57,58,59", "alias_at_lanes": "etp15a, etp15b, etp15c, etp15d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" }, "Ethernet60": { "index": "16,16,16,16", "lanes": "60,61,62,63", "alias_at_lanes": "etp16a, etp16b, etp16c, etp16d", - "breakout_modes": "1x100G[40G],2x25G,4x25G[10G]" + "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" } } } From a2314580d37b5f0b6de8ec0f9968ae46c3a99fa4 Mon Sep 17 00:00:00 2001 From: Vadym Hlushko Date: Tue, 22 Dec 2020 14:22:29 +0000 Subject: [PATCH 3/3] [DPB] extended set of speeds for split modes Signed-off-by: Vadym Hlushko --- .../ACS-MSN2100/hwsku.json | 64 +++++++++---------- .../x86_64-mlnx_msn2100-r0/platform.json | 32 +++++----- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json index bef5d2c7a6d4..d77e2974f645 100644 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/hwsku.json @@ -1,52 +1,52 @@ { "interfaces": { "Ethernet0": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet4": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet8": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet12": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet16": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet20": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet24": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet28": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet32": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet36": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet40": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet44": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet48": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet52": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet56": { - "default_brkout_mode": "1x100G[40G]" - }, + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" + }, "Ethernet60": { - "default_brkout_mode": "1x100G[40G]" + "default_brkout_mode": "1x100G[50G,40G,25G,10G]" } } -} \ No newline at end of file +} diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json index 4dfc22aa64b6..aa08998861fb 100644 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/platform.json @@ -4,97 +4,97 @@ "index": "1,1,1,1", "lanes": "0,1,2,3", "alias_at_lanes": "etp1a, etp1b, etp1c, etp1d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet4": { "index": "2,2,2,2", "lanes": "4,5,6,7", "alias_at_lanes": "etp2a, etp2b, etp2c, etp2d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet8": { "index": "3,3,3,3", "lanes": "8,9,10,11", "alias_at_lanes": "etp3a, etp3b, etp3c, etp3d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet12": { "index": "4,4,4,4", "lanes": "12,13,14,15", "alias_at_lanes": "etp4a, etp4b, etp4c, etp4d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet16": { "index": "5,5,5,5", "lanes": "16,17,18,19", "alias_at_lanes": "etp5a, etp5b, etp5c, etp5d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet20": { "index": "6,6,6,6", "lanes": "20,21,22,23", "alias_at_lanes": "etp6a, etp6b, etp6c, etp6d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet24": { "index": "7,7,7,7", "lanes": "24,25,26,27", "alias_at_lanes": "etp7a, etp7b, etp7c, etp7d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet28": { "index": "8,8,8,8", "lanes": "28,29,30,31", "alias_at_lanes": "etp8a, etp8b, etp8c, etp8d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet32": { "index": "9,9,9,9", "lanes": "32,33,34,35", "alias_at_lanes": "etp9a, etp9b, etp9c, etp9d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet36": { "index": "10,10,10,10", "lanes": "36,37,38,39", "alias_at_lanes": "etp10a, etp10b, etp10c, etp10d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet40": { "index": "11,11,11,11", "lanes": "40,41,42,43", "alias_at_lanes": "etp11a, etp11b, etp11c, etp11d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet44": { "index": "12,12,12,12", "lanes": "44,45,46,47", "alias_at_lanes": "etp12a, etp12b, etp12c, etp12d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet48": { "index": "13,13,13,13", "lanes": "48,49,50,51", "alias_at_lanes": "etp13a, etp13b, etp13c, etp13d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet52": { "index": "14,14,14,14", "lanes": "52,53,54,55", "alias_at_lanes": "etp14a, etp14b, etp14c, etp14d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet56": { "index": "15,15,15,15", "lanes": "56,57,58,59", "alias_at_lanes": "etp15a, etp15b, etp15c, etp15d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" }, "Ethernet60": { "index": "16,16,16,16", "lanes": "60,61,62,63", "alias_at_lanes": "etp16a, etp16b, etp16c, etp16d", - "breakout_modes": "1x100G[40G],2x50G,4x25G[10G]" + "breakout_modes": "1x100G[50G,40G,25G,10G],2x50G[40G,25G,10G],4x25G[10G]" } } }