-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
50G support for Arista 7060 #1580
Merged
Merged
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5bf7abd
50G SKU for Arista 7060
prsunny 790341d
MMU configs updated based on port mapping
prsunny 81fe990
Update portmap for qos.json
prsunny b6935c9
Addressed review comments, deleted t1.j2
prsunny a591f64
Merge remote-tracking branch 'upstream/master'
prsunny a9df326
Sync pg values for 50G profile
prsunny 27fed0f
Updated speed to port_config.ini
prsunny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers.json.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
{%- set default_topo = 't0' %} | ||
{%- include 'buffers_config.j2' %} |
61 changes: 61 additions & 0 deletions
61
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
{%- set default_cable = '5m' %} | ||
|
||
{%- macro generate_port_lists(PORT_ALL) %} | ||
{# Generate list of ports #} | ||
{%- for port_idx in range(0,6) %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %} | ||
{%- endfor %} | ||
{%- for port_idx in range(10,22) %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %} | ||
{%- endfor %} | ||
{%- for port_idx in range(24,32) %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{%- endif %} | ||
{%- endfor %} | ||
{%- for port_idx in range(6,10) %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %} | ||
{%- endfor %} | ||
{%- for port_idx in range(22,24) %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- endif %} | ||
{%- endfor %} | ||
{%- endmacro %} | ||
|
||
{%- macro generate_buffer_pool_and_profiles() %} | ||
"BUFFER_POOL": { | ||
"ingress_lossless_pool": { | ||
"size": "11213696", | ||
"type": "ingress", | ||
"mode": "dynamic", | ||
"xoff": "3855488" | ||
}, | ||
"egress_lossy_pool": { | ||
"size": "9532224", | ||
"type": "egress", | ||
"mode": "dynamic" | ||
}, | ||
"egress_lossless_pool": { | ||
"size": "15982720", | ||
"type": "egress", | ||
"mode": "static" | ||
} | ||
}, | ||
"BUFFER_PROFILE": { | ||
"ingress_lossy_profile": { | ||
"pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
"size":"0", | ||
"dynamic_th":"3" | ||
}, | ||
"egress_lossless_profile": { | ||
"pool":"[BUFFER_POOL|egress_lossless_pool]", | ||
"size":"1518", | ||
"static_th":"3995680" | ||
}, | ||
"egress_lossy_profile": { | ||
"pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
"size":"1518", | ||
"dynamic_th":"3" | ||
} | ||
}, | ||
{%- endmacro %} |
47 changes: 47 additions & 0 deletions
47
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t1.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,47 @@ | ||
|
||
{%- set default_cable = '40m' %} | ||
|
||
{%- macro generate_port_lists(PORT_ALL) %} | ||
{# Generate list of ports #} | ||
{%- for port_idx in range(0,128,4) %} | ||
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %} | ||
{%- endfor %} | ||
{%- endmacro %} | ||
|
||
{%- macro generate_buffer_pool_and_profiles() %} | ||
"BUFFER_POOL": { | ||
"ingress_lossless_pool": { | ||
"size": "10443264", | ||
"type": "ingress", | ||
"mode": "dynamic", | ||
"xoff": "4625920" | ||
}, | ||
"egress_lossy_pool": { | ||
"size": "8877440", | ||
"type": "egress", | ||
"mode": "dynamic" | ||
}, | ||
"egress_lossless_pool": { | ||
"size": "15982720", | ||
"type": "egress", | ||
"mode": "static" | ||
} | ||
}, | ||
"BUFFER_PROFILE": { | ||
"ingress_lossy_profile": { | ||
"pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
"size":"0", | ||
"dynamic_th":"3" | ||
}, | ||
"egress_lossless_profile": { | ||
"pool":"[BUFFER_POOL|egress_lossless_pool]", | ||
"size":"1518", | ||
"static_th":"3995680" | ||
}, | ||
"egress_lossy_profile": { | ||
"pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
"size":"1518", | ||
"dynamic_th":"3" | ||
} | ||
}, | ||
{%- endmacro %} |
17 changes: 17 additions & 0 deletions
17
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/pg_profile_lookup.ini
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# PG lossless profiles. | ||
# speed cable size xon xoff threshold xon_offset | ||
10000 5m 1248 2288 35776 -4 2288 | ||
25000 5m 1248 2288 53248 -4 2288 | ||
40000 5m 1248 2288 66560 -4 2288 | ||
50000 5m 1248 2288 90272 -4 2288 | ||
100000 5m 1248 2288 165568 -4 2288 | ||
10000 40m 1248 2288 37024 -4 2288 | ||
25000 40m 1248 2288 53248 -4 2288 | ||
40000 40m 1248 2288 71552 -4 2288 | ||
50000 40m 1248 2288 96096 -4 2288 | ||
100000 40m 1248 2288 177632 -4 2288 | ||
10000 300m 1248 2288 46176 -4 2288 | ||
25000 300m 1248 2288 79040 -4 2288 | ||
40000 300m 1248 2288 108160 -4 2288 | ||
50000 300m 1248 2288 141856 -4 2288 | ||
100000 300m 1248 2288 268736 -4 2288 |
57 changes: 57 additions & 0 deletions
57
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/port_config.ini
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
# name lanes alias index | ||
Ethernet0 33,34 Ethernet1/1 1 | ||
Ethernet2 35,36 Ethernet1/3 1 | ||
Ethernet4 37,38 Ethernet2/1 2 | ||
Ethernet6 39,40 Ethernet2/3 2 | ||
Ethernet8 41,42 Ethernet3/1 3 | ||
Ethernet10 43,44 Ethernet3/3 3 | ||
Ethernet12 45,46 Ethernet4/1 4 | ||
Ethernet14 47,48 Ethernet4/3 4 | ||
Ethernet16 49,50 Ethernet5/1 5 | ||
Ethernet18 51,52 Ethernet5/3 5 | ||
Ethernet20 53,54 Ethernet6/1 6 | ||
Ethernet22 55,56 Ethernet6/3 6 | ||
Ethernet24 57,58,59,60 Ethernet7/1 7 | ||
Ethernet28 61,62,63,64 Ethernet8/1 8 | ||
Ethernet32 65,66,67,68 Ethernet9/1 9 | ||
Ethernet36 69,70,71,72 Ethernet10/1 10 | ||
Ethernet40 73,74 Ethernet11/1 11 | ||
Ethernet42 75,76 Ethernet11/3 11 | ||
Ethernet44 77,78 Ethernet12/1 12 | ||
Ethernet46 79,80 Ethernet12/3 12 | ||
Ethernet48 81,82 Ethernet13/1 13 | ||
Ethernet50 83,84 Ethernet13/3 13 | ||
Ethernet52 85,86 Ethernet14/1 14 | ||
Ethernet54 87,88 Ethernet14/3 14 | ||
Ethernet56 89,90 Ethernet15/1 15 | ||
Ethernet58 91,92 Ethernet15/3 15 | ||
Ethernet60 93,94 Ethernet16/1 16 | ||
Ethernet62 95,96 Ethernet16/3 16 | ||
Ethernet64 97,98 Ethernet17/1 17 | ||
Ethernet66 99,100 Ethernet17/3 17 | ||
Ethernet68 101,102 Ethernet18/1 18 | ||
Ethernet70 103,104 Ethernet18/3 18 | ||
Ethernet72 105,106 Ethernet19/1 19 | ||
Ethernet74 107,108 Ethernet19/3 19 | ||
Ethernet76 109,110 Ethernet20/1 20 | ||
Ethernet78 111,112 Ethernet20/3 20 | ||
Ethernet80 113,114 Ethernet21/1 21 | ||
Ethernet82 115,116 Ethernet21/3 21 | ||
Ethernet84 117,118 Ethernet22/1 22 | ||
Ethernet86 119,120 Ethernet22/3 22 | ||
Ethernet88 121,122,123,124 Ethernet23/1 23 | ||
Ethernet92 125,126,127,128 Ethernet24/1 24 | ||
Ethernet96 1,2,3,4 Ethernet25/1 25 | ||
Ethernet100 5,6,7,8 Ethernet26/1 26 | ||
Ethernet104 9,10 Ethernet27/1 27 | ||
Ethernet106 11,12 Ethernet27/3 27 | ||
Ethernet108 13,14 Ethernet28/1 28 | ||
Ethernet110 15,16 Ethernet28/3 28 | ||
Ethernet112 17,18 Ethernet29/1 29 | ||
Ethernet114 19,20 Ethernet29/3 29 | ||
Ethernet116 21,22 Ethernet30/1 30 | ||
Ethernet118 23,24 Ethernet30/3 30 | ||
Ethernet120 25,26 Ethernet31/1 31 | ||
Ethernet122 27,28 Ethernet31/3 31 | ||
Ethernet124 29,30 Ethernet32/1 32 | ||
Ethernet126 31,32 Ethernet32/3 32 |
167 changes: 167 additions & 0 deletions
167
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/qos.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,167 @@ | ||
{ | ||
"TC_TO_PRIORITY_GROUP_MAP": { | ||
"AZURE": { | ||
"0": "0", | ||
"1": "1", | ||
"2": "2", | ||
"3": "3", | ||
"4": "4", | ||
"5": "5", | ||
"6": "6", | ||
"7": "7" | ||
} | ||
}, | ||
"MAP_PFC_PRIORITY_TO_QUEUE": { | ||
"AZURE": { | ||
"0": "0", | ||
"1": "1", | ||
"2": "2", | ||
"3": "3", | ||
"4": "4", | ||
"5": "5", | ||
"6": "6", | ||
"7": "7" | ||
} | ||
}, | ||
"TC_TO_QUEUE_MAP": { | ||
"AZURE": { | ||
"0": "0", | ||
"1": "1", | ||
"2": "2", | ||
"3": "3", | ||
"4": "4", | ||
"5": "5", | ||
"6": "6", | ||
"7": "7" | ||
} | ||
}, | ||
"DSCP_TO_TC_MAP": { | ||
"AZURE": { | ||
"0":"0", | ||
"1":"0", | ||
"2":"0", | ||
"3":"3", | ||
"4":"4", | ||
"5":"0", | ||
"6":"0", | ||
"7":"0", | ||
"8":"1", | ||
"9":"0", | ||
"10":"0", | ||
"11":"0", | ||
"12":"0", | ||
"13":"0", | ||
"14":"0", | ||
"15":"0", | ||
"16":"0", | ||
"17":"0", | ||
"18":"0", | ||
"19":"0", | ||
"20":"0", | ||
"21":"0", | ||
"22":"0", | ||
"23":"0", | ||
"24":"0", | ||
"25":"0", | ||
"26":"0", | ||
"27":"0", | ||
"28":"0", | ||
"29":"0", | ||
"30":"0", | ||
"31":"0", | ||
"32":"0", | ||
"33":"0", | ||
"34":"0", | ||
"35":"0", | ||
"36":"0", | ||
"37":"0", | ||
"38":"0", | ||
"39":"0", | ||
"40":"0", | ||
"41":"0", | ||
"42":"0", | ||
"43":"0", | ||
"44":"0", | ||
"45":"0", | ||
"46":"0", | ||
"47":"0", | ||
"48":"0", | ||
"49":"0", | ||
"50":"0", | ||
"51":"0", | ||
"52":"0", | ||
"53":"0", | ||
"54":"0", | ||
"55":"0", | ||
"56":"0", | ||
"57":"0", | ||
"58":"0", | ||
"59":"0", | ||
"60":"0", | ||
"61":"0", | ||
"62":"0", | ||
"63":"0" | ||
} | ||
}, | ||
"SCHEDULER": { | ||
"scheduler.0" : { | ||
"type":"DWRR", | ||
"weight": "25" | ||
}, | ||
"scheduler.1" : { | ||
"type":"DWRR", | ||
"weight": "30" | ||
}, | ||
"scheduler.2" : { | ||
"type":"DWRR", | ||
"weight": "20" | ||
} | ||
}, | ||
"PORT_QOS_MAP": { | ||
"Ethernet0,Ethernet2,Ethernet4,Ethernet6,Ethernet8,Ethernet10,Ethernet12,Ethernet14,Ethernet16,Ethernet18,Ethernet20,Ethernet22,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet42,Ethernet44,Ethernet46,Ethernet48,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet58,Ethernet60,Ethernet62,Ethernet64,Ethernet66,Ethernet68,Ethernet70,Ethernet72,Ethernet74,Ethernet76,Ethernet78,Ethernet80,Ethernet82,Ethernet84,Ethernet86,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet106,Ethernet108,Ethernet110,Ethernet112,Ethernet114,Ethernet116,Ethernet118,Ethernet120,Ethernet122,Ethernet124,Ethernet126": { | ||
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", | ||
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", | ||
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]", | ||
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]", | ||
"pfc_enable": "3,4" | ||
} | ||
}, | ||
"WRED_PROFILE": { | ||
"AZURE_LOSSY" : { | ||
"wred_green_enable":"true", | ||
"wred_yellow_enable":"true", | ||
"ecn":"ecn_all", | ||
"red_max_threshold":"512000", | ||
"red_min_threshold":"512000", | ||
"yellow_max_threshold":"512000", | ||
"yellow_min_threshold":"512000", | ||
"green_max_threshold": "184320", | ||
"green_min_threshold": "184320" | ||
}, | ||
"AZURE_LOSSLESS" : { | ||
"wred_green_enable":"true", | ||
"wred_yellow_enable":"true", | ||
"ecn":"ecn_all", | ||
"red_max_threshold":"512000", | ||
"red_min_threshold":"512000", | ||
"yellow_max_threshold":"512000", | ||
"yellow_min_threshold":"512000", | ||
"green_max_threshold": "184320", | ||
"green_min_threshold": "184320" | ||
} | ||
}, | ||
"QUEUE": { | ||
"Ethernet0,Ethernet2,Ethernet4,Ethernet6,Ethernet8,Ethernet10,Ethernet12,Ethernet14,Ethernet16,Ethernet18,Ethernet20,Ethernet22,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet42,Ethernet44,Ethernet46,Ethernet48,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet58,Ethernet60,Ethernet62,Ethernet64,Ethernet66,Ethernet68,Ethernet70,Ethernet72,Ethernet74,Ethernet76,Ethernet78,Ethernet80,Ethernet82,Ethernet84,Ethernet86,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet106,Ethernet108,Ethernet110,Ethernet112,Ethernet114,Ethernet116,Ethernet118,Ethernet120,Ethernet122,Ethernet124,Ethernet126|0-1": { | ||
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]" | ||
}, | ||
"Ethernet0,Ethernet2,Ethernet4,Ethernet6,Ethernet8,Ethernet10,Ethernet12,Ethernet14,Ethernet16,Ethernet18,Ethernet20,Ethernet22,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet42,Ethernet44,Ethernet46,Ethernet48,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet58,Ethernet60,Ethernet62,Ethernet64,Ethernet66,Ethernet68,Ethernet70,Ethernet72,Ethernet74,Ethernet76,Ethernet78,Ethernet80,Ethernet82,Ethernet84,Ethernet86,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet106,Ethernet108,Ethernet110,Ethernet112,Ethernet114,Ethernet116,Ethernet118,Ethernet120,Ethernet122,Ethernet124,Ethernet126|3-4": { | ||
"scheduler" : "[SCHEDULER|scheduler.0]" | ||
}, | ||
"Ethernet0,Ethernet2,Ethernet4,Ethernet6,Ethernet8,Ethernet10,Ethernet12,Ethernet14,Ethernet16,Ethernet18,Ethernet20,Ethernet22,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet42,Ethernet44,Ethernet46,Ethernet48,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet58,Ethernet60,Ethernet62,Ethernet64,Ethernet66,Ethernet68,Ethernet70,Ethernet72,Ethernet74,Ethernet76,Ethernet78,Ethernet80,Ethernet82,Ethernet84,Ethernet86,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet106,Ethernet108,Ethernet110,Ethernet112,Ethernet114,Ethernet116,Ethernet118,Ethernet120,Ethernet122,Ethernet124,Ethernet126|0": { | ||
"scheduler" : "[SCHEDULER|scheduler.1]" | ||
}, | ||
"Ethernet0,Ethernet2,Ethernet4,Ethernet6,Ethernet8,Ethernet10,Ethernet12,Ethernet14,Ethernet16,Ethernet18,Ethernet20,Ethernet22,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet42,Ethernet44,Ethernet46,Ethernet48,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet58,Ethernet60,Ethernet62,Ethernet64,Ethernet66,Ethernet68,Ethernet70,Ethernet72,Ethernet74,Ethernet76,Ethernet78,Ethernet80,Ethernet82,Ethernet84,Ethernet86,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet106,Ethernet108,Ethernet110,Ethernet112,Ethernet114,Ethernet116,Ethernet118,Ethernet120,Ethernet122,Ethernet124,Ethernet126|1": { | ||
"scheduler" : "[SCHEDULER|scheduler.2]" | ||
} | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/sai.profile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
SAI_INIT_CONFIG_FILE=/etc/bcm/th-a7060-cx32s-8x100G+48x50G.config.bcm |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please increase xoff size to 8356608