-
Notifications
You must be signed in to change notification settings - Fork 1.8k
[Mellanox] Add a new Mellanox platform x86_64-mlnx_msn4700 and new SKU ACS-MSN4700 #3901
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
f80afb4
add MSN4700 device files
keboliu 6e87e75
update ACS-MSN4700 sai profile
keboliu dab58cf
update buffer pool size, headroom, sensor conf, port config and reboo…
keboliu 0a3d73b
fix ident
keboliu 5a68a0b
update sensor conf and buffer pool
keboliu ac37b1e
[sn4700] add sku 4700 to chassis.py
nazariig f90214c
Merge branch 'master' into new-sku-msn-4700
keboliu bffa31b
[Mellanox-4700] Add 4700 info to psu and thermal platform API
Junchao-Mellanox 5112d11
Merge branch 'new-sku-msn-4700' of github.com:keboliu/sonic-buildimag…
Junchao-Mellanox 8a5aa21
update buffer config file template to the latest.
keboliu af29ae2
[Mellanox]Update the buffer configurations for 4700
20ba5b9
Merge branch 'master' into new-sku-msn-4700
keboliu cc37c9c
Merge pull request #18 from stephenxs/new-sku-msn4700-new-buffer-size
keboliu 796ca3b
fix alignment in pg_profile_lookup.ini
keboliu 397c330
add platform components file for new sku
keboliu 95a6f96
Update device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_…
keboliu efd8a42
remove redundant line
keboliu 79fb245
[Mellanox]Correct type, buffer size
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
1 change: 1 addition & 0 deletions
1
device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers.json.j2
This file contains hidden or 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 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2 |
91 changes: 91 additions & 0 deletions
91
device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2
This file contains hidden or 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,91 @@ | ||
| {% set default_cable = '5m' %} | ||
| {% set ingress_lossless_pool_size = '30973952' %} | ||
| {% set ingress_lossy_pool_size = '30973952' %} | ||
| {% set egress_lossless_pool_size = '67108864' %} | ||
| {% set egress_lossy_pool_size = '30973952' %} | ||
|
|
||
| {%- macro generate_port_lists(PORT_ALL) %} | ||
| {# Generate list of ports #} | ||
| {%- for port_idx in range(0, 32) %} | ||
| {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %} | ||
| {%- endfor %} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_buffer_pool_and_profiles() %} | ||
| "BUFFER_POOL": { | ||
| "ingress_lossless_pool": { | ||
| "size": "{{ ingress_lossless_pool_size }}", | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "ingress_lossy_pool": { | ||
| "size": "{{ ingress_lossy_pool_size }}", | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossless_pool": { | ||
| "size": "{{ egress_lossless_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossy_pool": { | ||
| "size": "{{ egress_lossy_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| } | ||
| }, | ||
| "BUFFER_PROFILE": { | ||
| "ingress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"0" | ||
| }, | ||
| "ingress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "egress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "egress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"4096", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "q_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| } | ||
| }, | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_profile_lists(port_names) %} | ||
| "BUFFER_PORT_INGRESS_PROFILE_LIST": { | ||
| "{{ port_names }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]" | ||
| } | ||
| }, | ||
| "BUFFER_PORT_EGRESS_PROFILE_LIST": { | ||
| "{{ port_names }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" | ||
| } | ||
| } | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_queue_buffers(port_names) %} | ||
| "BUFFER_QUEUE": { | ||
| "{{ port_names }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" | ||
| }, | ||
| "{{ port_names }}|0-1": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }, | ||
| "{{ port_names }}|5": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| } | ||
| } | ||
| {%- endmacro %} | ||
91 changes: 91 additions & 0 deletions
91
device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2
This file contains hidden or 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,91 @@ | ||
| {% set default_cable = '5m' %} | ||
| {% set ingress_lossless_pool_size = '19283968' %} | ||
| {% set ingress_lossy_pool_size = '19283968' %} | ||
| {% set egress_lossless_pool_size = '67108864' %} | ||
keboliu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| {% set egress_lossy_pool_size = '19283968' %} | ||
|
|
||
| {%- macro generate_port_lists(PORT_ALL) %} | ||
| {# Generate list of ports #} | ||
| {%- for port_idx in range(0, 32) %} | ||
| {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %} | ||
| {%- endfor %} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_buffer_pool_and_profiles() %} | ||
| "BUFFER_POOL": { | ||
| "ingress_lossless_pool": { | ||
| "size": "{{ ingress_lossless_pool_size }}", | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "ingress_lossy_pool": { | ||
| "size": "{{ ingress_lossy_pool_size }}", | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossless_pool": { | ||
| "size": "{{ egress_lossless_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossy_pool": { | ||
| "size": "{{ egress_lossy_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| } | ||
| }, | ||
| "BUFFER_PROFILE": { | ||
| "ingress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"0" | ||
| }, | ||
| "ingress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "egress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "egress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"4096", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "q_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| } | ||
| }, | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_profile_lists(port_names) %} | ||
| "BUFFER_PORT_INGRESS_PROFILE_LIST": { | ||
| "{{ port_names }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]" | ||
| } | ||
| }, | ||
| "BUFFER_PORT_EGRESS_PROFILE_LIST": { | ||
| "{{ port_names }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" | ||
| } | ||
| } | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_queue_buffers(port_names) %} | ||
| "BUFFER_QUEUE": { | ||
| "{{ port_names }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" | ||
| }, | ||
| "{{ port_names }}|0-1": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }, | ||
| "{{ port_names }}|5": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| } | ||
| } | ||
| {%- endmacro %} | ||
keboliu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
25 changes: 25 additions & 0 deletions
25
device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini
This file contains hidden or 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,25 @@ | ||
| # speed cable size xon xoff threshold | ||
| 1000 5m 35840 18432 17408 0 | ||
| 10000 5m 36864 18432 18432 0 | ||
| 25000 5m 36864 18432 18432 0 | ||
| 40000 5m 36864 18432 18432 0 | ||
| 50000 5m 37888 18432 19456 0 | ||
| 100000 5m 38912 18432 20480 0 | ||
| 200000 5m 41984 18432 23552 0 | ||
| 400000 5m 48128 19456 28672 0 | ||
| 1000 40m 36864 18432 18432 0 | ||
| 10000 40m 38912 18432 20480 0 | ||
| 25000 40m 41984 18432 23552 0 | ||
| 40000 40m 45056 18432 26624 0 | ||
| 50000 40m 47104 18432 28672 0 | ||
| 100000 40m 59392 18432 40960 0 | ||
| 200000 40m 81920 18432 63488 0 | ||
| 400000 40m 128000 19456 108544 0 | ||
keboliu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 1000 300m 37888 18432 19456 0 | ||
| 10000 300m 53248 18432 34816 0 | ||
| 25000 300m 78848 18432 60416 0 | ||
| 40000 300m 104448 18432 86016 0 | ||
| 50000 300m 121856 18432 103424 0 | ||
| 100000 300m 206848 18432 188416 0 | ||
| 200000 300m 376832 18432 358400 0 | ||
| 400000 300m 718848 19456 699392 0 | ||
33 changes: 33 additions & 0 deletions
33
device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini
This file contains hidden or 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,33 @@ | ||
| # name lanes alias | ||
| Ethernet0 0,1,2,3,4,5,6,7 etp1 | ||
keboliu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Ethernet8 8,9,10,11,12,13,14,15 etp2 | ||
| Ethernet16 16,17,18,19,20,21,22,23 etp3 | ||
| Ethernet24 24,25,26,27,28,29,30,31 etp4 | ||
| Ethernet32 32,33,34,35,36,37,38,39 etp5 | ||
| Ethernet40 40,41,42,43,44,45,46,47 etp6 | ||
| Ethernet48 48,49,50,51,52,53,54,55 etp7 | ||
| Ethernet56 56,57,58,59,60,61,62,63 etp8 | ||
| Ethernet64 64,65,66,67,68,69,70,71 etp9 | ||
| Ethernet72 72,73,74,75,76,77,78,79 etp10 | ||
| Ethernet80 80,81,82,83,84,85,86,87 etp11 | ||
| Ethernet88 88,89,90,91,92,93,94,95 etp12 | ||
| Ethernet96 96,97,98,99,100,101,102,103 etp13 | ||
| Ethernet104 104,105,106,107,108,109,110,111 etp14 | ||
| Ethernet112 112,113,114,115,116,117,118,119 etp15 | ||
| Ethernet120 120,121,122,123,124,125,126,127 etp16 | ||
| Ethernet128 128,129,130,131,132,133,134,135 etp17 | ||
| Ethernet136 136,137,138,139,140,141,142,143 etp18 | ||
| Ethernet144 144,145,146,147,148,149,150,151 etp19 | ||
| Ethernet152 152,153,154,155,156,157,158,159 etp20 | ||
| Ethernet160 160,161,162,163,164,165,166,167 etp21 | ||
| Ethernet168 168,169,170,171,172,173,174,175 etp22 | ||
| Ethernet176 176,177,178,179,180,181,182,183 etp23 | ||
| Ethernet184 184,185,186,187,188,189,190,191 etp24 | ||
| Ethernet192 192,193,194,195,196,197,198,199 etp25 | ||
| Ethernet200 200,201,202,203,204,205,206,207 etp26 | ||
| Ethernet208 208,209,210,211,212,213,214,215 etp27 | ||
| Ethernet216 216,217,218,219,220,221,222,223 etp28 | ||
| Ethernet224 224,225,226,227,228,229,230,231 etp29 | ||
| Ethernet232 232,233,234,235,236,237,238,239 etp30 | ||
| Ethernet240 240,241,242,243,244,245,246,247 etp31 | ||
| Ethernet248 248,249,250,251,252,253,254,255 etp32 | ||
This file contains hidden or 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 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 |
This file contains hidden or 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=/usr/share/sonic/hwsku/sai_4700.xml |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.