Skip to content
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.

Sign up for GitHub

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

Dell Force10-S6000-Q28S16 new HWSKU support #4679

Merged
merged 3 commits into from
Jun 9, 2020
Merged

Dell Force10-S6000-Q28S16 new HWSKU support #4679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dede4b5
Force10 S6000-Q28S16 new HWSKU support
aravindmani-1 Jun 1, 2020
7005f48
Update port_config.ini
aravindmani-1 Jun 1, 2020
a9d5886
Update port_config.ini
aravindmani-1 Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{%- set default_topo = 't0' %}
{%- include 'buffers_config.j2' %}

78 changes: 78 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{%- set default_cable = '300m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{% for port_idx in range(0,1) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(1,2) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{% for port_idx in range(2,3) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(3,4) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{% for port_idx in range(4,5) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(5,6) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{% for port_idx in range(6,7) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(7,32) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{%- endmacro %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "12766208",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossless_pool": {
"size": "12766208",
"type": "egress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
},
"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":"0",
"static_th":"12766208"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"dynamic_th":"3"
}
},
{%- endmacro %}
78 changes: 78 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{%- set default_cable = '300m' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{% for port_idx in range(0,1) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(1,2) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{% for port_idx in range(2,3) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(3,4) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{% for port_idx in range(4,5) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(5,6) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{% for port_idx in range(6,7) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %}
{% endfor %}
{% for port_idx in range(7,32) %}
{% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %}
{% endfor %}
{%- endmacro %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "12766208",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossless_pool": {
"size": "12766208",
"type": "egress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "7326924",
"type": "egress",
"mode": "dynamic"
}
},
"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":"0",
"static_th":"12766208"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"dynamic_th":"3"
}
},
{%- endmacro %}
17 changes: 17 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini
View file
Open in desktop
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 56368 18432 55120 -3 2496
25000 5m 56368 18432 55120 -3 2496
40000 5m 56368 18432 55120 -3 2496
50000 5m 56368 18432 55120 -3 2496
100000 5m 56368 18432 55120 -3 2496
10000 40m 56368 18432 55120 -3 2496
25000 40m 56368 18432 55120 -3 2496
40000 40m 56368 18432 55120 -3 2496
50000 40m 56368 18432 55120 -3 2496
100000 40m 56368 18432 55120 -3 2496
10000 300m 56368 18432 55120 -3 2496
25000 300m 56368 18432 55120 -3 2496
40000 300m 56368 18432 55120 -3 2496
50000 300m 56368 18432 55120 -3 2496
100000 300m 56368 18432 55120 -3 2496
45 changes: 45 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/port_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# name lanes alias index speed
Ethernet0 29 tenGigE0/0 0 10000
Ethernet1 30 tenGigE0/1 0 10000
Ethernet2 31 tenGigE0/2 0 10000
Ethernet3 32 tenGigE0/3 0 10000
Ethernet4 25,26,27,28 fortyGigE0/4 1 40000
Ethernet8 37 tenGigE0/8 2 10000
Ethernet9 38 tenGigE0/9 2 10000
Ethernet10 39 tenGigE0/10 2 10000
Ethernet11 40 tenGigE0/11 2 10000
Ethernet12 33,34,35,36 fortyGigE0/12 3 40000
Ethernet16 41 tenGigE0/16 4 10000
Ethernet17 42 tenGigE0/17 4 10000
Ethernet18 43 tenGigE0/18 4 10000
Ethernet19 44 tenGigE0/19 4 10000
Ethernet20 45,46,47,48 fortyGigE0/20 5 40000
Ethernet24 5 tenGigE0/24 6 10000
Ethernet25 6 tenGigE0/25 6 10000
Ethernet26 7 tenGigE0/26 6 10000
Ethernet27 8 tenGigE0/27 6 10000
Ethernet28 1,2,3,4 fortyGigE0/28 7 40000
Ethernet32 9,10,11,12 fortyGigE0/32 8 40000
Ethernet36 13,14,15,16 fortyGigE0/36 9 40000
Ethernet40 21,22,23,24 fortyGigE0/40 10 40000
Ethernet44 17,18,19,20 fortyGigE0/44 11 40000
Ethernet48 49,50,51,52 fortyGigE0/48 12 40000
Ethernet52 53,54,55,56 fortyGigE0/52 13 40000
Ethernet56 61,62,63,64 fortyGigE0/56 14 40000
Ethernet60 57,58,59,60 fortyGigE0/60 15 40000
Ethernet64 65,66,67,68 fortyGigE0/64 16 40000
Ethernet68 69,70,71,72 fortyGigE0/68 17 40000
Ethernet72 77,78,79,80 fortyGigE0/72 18 40000
Ethernet76 73,74,75,76 fortyGigE0/76 19 40000
Ethernet80 105,106,107,108 fortyGigE0/80 20 40000
Ethernet84 109,110,111,112 fortyGigE0/84 21 40000
Ethernet88 117,118,119,120 fortyGigE0/88 22 40000
Ethernet92 113,114,115,116 fortyGigE0/92 23 40000
Ethernet96 121,122,123,124 fortyGigE0/96 24 40000
Ethernet100 125,126,127,128 fortyGigE0/100 25 40000
Ethernet104 85,86,87,88 fortyGigE0/104 26 40000
Ethernet108 81,82,83,84 fortyGigE0/108 27 40000
Ethernet112 89,90,91,92 fortyGigE0/112 28 40000
Ethernet116 93,94,95,96 fortyGigE0/116 29 40000
Ethernet120 97,98,99,100 fortyGigE0/120 30 40000
Ethernet124 101,102,103,104 fortyGigE0/124 31 40000
1 change: 1 addition & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{%- include 'qos_config.j2' %}
2 changes: 2 additions & 0 deletions device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/sai.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-28x40G-16x10G.config.bcm
SAI_NUM_ECMP_MEMBERS=32
Loading