-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix typo and missing files in SN3800 and SN4600C's buffer templates (#…
…9537) Why I did it Fix typo and missing files in SN3800 and SN4600C's buffer templates How I did it ingress_lossless_xoff_size => ingress_lossless_pool_xoff add missing files for SN4600C-D100C12S2 How to verify it Deploy the fix and verify whether the device can be up. Signed-off-by: Stephen Sun <[email protected]>
- Loading branch information
Showing
11 changed files
with
29 additions
and
192 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/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
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/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
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/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
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/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
1 change: 1 addition & 0 deletions
1
...ce/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/buffers_default_objects.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 @@ | ||
| ../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2 |
101 changes: 9 additions & 92 deletions
101
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/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 |
|---|---|---|
| @@ -1,104 +1,21 @@ | ||
| {% set default_cable = '5m' %} | ||
| {% set ingress_lossless_pool_size = '44566528' %} | ||
| {% set ingress_lossless_xoff_size = '3614720' %} | ||
| {% set ingress_lossless_pool_xoff = '3614720' %} | ||
| {% set egress_lossless_pool_size = '60817392' %} | ||
| {% set egress_lossy_pool_size = '44566528' %} | ||
|
|
||
| {%- 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 %} | ||
| {%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %} | ||
| {{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_buffer_pool_and_profiles() %} | ||
| "BUFFER_POOL": { | ||
| "ingress_lossless_pool": { | ||
| {%- if dynamic_mode is not defined %} | ||
| "size": "{{ ingress_lossless_pool_size }}", | ||
| "xoff": "{{ ingress_lossless_xoff_size }}", | ||
| {%- endif %} | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossless_pool": { | ||
| "size": "{{ egress_lossless_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossy_pool": { | ||
| {%- if dynamic_mode is not defined %} | ||
| "size": "{{ egress_lossy_pool_size }}", | ||
| {%- endif %} | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| } | ||
| }, | ||
| "BUFFER_PROFILE": { | ||
| "ingress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "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", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "egress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"9216", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "q_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| } | ||
| }, | ||
| {%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %} | ||
| {{ defs.generate_profile_lists(port_names_active, port_names_inactive) }} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_profile_lists(port_names) %} | ||
| "BUFFER_PORT_INGRESS_PROFILE_LIST": { | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| }, | ||
| "BUFFER_PORT_EGRESS_PROFILE_LIST": { | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| } | ||
| {%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %} | ||
| {{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_queue_buffers(port_names) %} | ||
| "BUFFER_QUEUE": { | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}|0-2": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}|5-6": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| } | ||
| {%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %} | ||
| {{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }} | ||
| {%- endmacro %} |
103 changes: 11 additions & 92 deletions
103
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/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 |
|---|---|---|
| @@ -1,104 +1,23 @@ | ||
| {% set default_cable = '5m' %} | ||
| {% set ingress_lossless_pool_size = '43794432' %} | ||
| {% set ingress_lossless_xoff_size = '4386816' %} | ||
| {% set ingress_lossless_pool_xoff = '4386816' %} | ||
| {% set egress_lossless_pool_size = '60817392' %} | ||
| {% set egress_lossy_pool_size = '43794432' %} | ||
|
|
||
| {%- 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 %} | ||
| {% import 'buffers_defaults_objects.j2' as defs with context %} | ||
|
|
||
| {%- macro generate_buffer_pool_and_profiles() %} | ||
| "BUFFER_POOL": { | ||
| "ingress_lossless_pool": { | ||
| {%- if dynamic_mode is not defined %} | ||
| "size": "{{ ingress_lossless_pool_size }}", | ||
| "xoff": "{{ ingress_lossless_xoff_size }}", | ||
| {%- endif %} | ||
| "type": "ingress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossless_pool": { | ||
| "size": "{{ egress_lossless_pool_size }}", | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| }, | ||
| "egress_lossy_pool": { | ||
| {%- if dynamic_mode is not defined %} | ||
| "size": "{{ egress_lossy_pool_size }}", | ||
| {%- endif %} | ||
| "type": "egress", | ||
| "mode": "dynamic" | ||
| } | ||
| }, | ||
| "BUFFER_PROFILE": { | ||
| "ingress_lossless_profile": { | ||
| "pool":"[BUFFER_POOL|ingress_lossless_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "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", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "egress_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"9216", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "q_lossy_profile": { | ||
| "pool":"[BUFFER_POOL|egress_lossy_pool]", | ||
| "size":"0", | ||
| "dynamic_th":"3" | ||
| } | ||
| }, | ||
| {%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %} | ||
| {{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_profile_lists(port_names) %} | ||
| "BUFFER_PORT_INGRESS_PROFILE_LIST": { | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| }, | ||
| "BUFFER_PORT_EGRESS_PROFILE_LIST": { | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}": { | ||
| "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
|
|
||
| {% endfor %} | ||
| } | ||
| {%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %} | ||
| {{ defs.generate_profile_lists(port_names_active, port_names_inactive) }} | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_queue_buffers(port_names) %} | ||
| "BUFFER_QUEUE": { | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}|3-4": { | ||
| "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}|0-2": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }, | ||
| {% endfor %} | ||
| {% for port in port_names.split(',') %} | ||
| "{{ port }}|5-6": { | ||
| "profile" : "[BUFFER_PROFILE|q_lossy_profile]" | ||
| }{% if not loop.last %},{% endif %} | ||
| {%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %} | ||
| {{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }} | ||
| {%- endmacro %} | ||
|
|
||
| {% endfor %} | ||
| } | ||
| {%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %} | ||
| {{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }} | ||
| {%- endmacro %} |
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/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
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/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
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/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
2 changes: 1 addition & 1 deletion
2
device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/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