matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Dell] S5232f default buffer configuration changes (#3278)

Browse Source 
Corrected the ingress and egress lossy and lossless buffer pool and profile values.
Single pool for lossy and lossless traffic for PFC priority 3 and 4.
In HWSKU DellEMC-S5232f-P-100GG/25G/10G. Defaults to lossy profile. No Lossless support.
2 default mmu_init.data files (TD3-DEFAULT-LOSSLESS-P3P4 and "TD3-DEFAULT" created in SAI code. This will have cpu pool configuration and MMU init related configurations.
TD3-DEFAULT.data file is only supports lossy.
TD3-DEFAULT-LOSSLESS-P3P4.data file is supports lossless on P3 and P4.
This commit is contained in:
Ashok Daparthi-Dell 2019-08-08 01:07:52 -07:00 committed by lguohan
parent cc312793b5
commit fe6664b1bb
18 changed files with 233 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 Normal file
View File

@ -0,0 +1,37 @@
{%- set default_cable = '40m' %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "28550336",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_pool": {
"size": "28550336",
"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_pool]",
"size":"0",
"mode": "static",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "dynamic",
"dynamic_th":"3"
}
},
{%- endmacro %}

30
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2
View File

@ -1,28 +1,16 @@
{%- set default_cable = '40m' %}
{%- 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*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "27678784",
"size": "28550336",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "26045524",
"type": "egress",
"mode": "dynamic"
},
"egress_lossless_pool": {
"size": "32786432",
"egress_pool": {
"size": "28550336",
"type": "egress",
"mode": "static"
}
@ -34,13 +22,15 @@
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518",
"static_th":"3995680"
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "static",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"pool":"[BUFFER_POOL|egress_pool]",
"size":"0",
"mode": "dynamic",
"dynamic_th":"3"
}
},

3
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm
View File

@ -37,7 +37,6 @@ l3_max_ecmp_mode=1
bcm_tunnel_term_compatible_mode=1
ifp_inports_support_enable=1
mmu_init_config="MSFT-TD3-Tier1"
stable_size=0x5500000
@ -542,4 +541,4 @@ dport_map_port_129=126
dport_map_port_66=127
dport_map_port_130=128
mmu_init_config="TD3-DEFAULT-LOSSLESS-P3P4"

46
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 Normal file
View File

@ -0,0 +1,46 @@
{%- set default_cable = '40m' %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32744448",
"type": "ingress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"0",
"dynamic_th":"3"
}
},
{%- endmacro %}
{%- macro generate_pg_profils(port_names_active) %}
"BUFFER_PG": {
"{{ port_names_active }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
{%- endmacro %}
{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
{% endmacro %}

19
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t1.j2
View File

@ -1,22 +1,15 @@
{%- set default_cable = '40m' %}
{%- 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*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33554432",
"size": "32744448",
"type": "ingress",
"mode": "dynamic"
"mode": "static"
},
"egress_lossy_pool": {
"size": "32786432",
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
@ -25,11 +18,11 @@
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"size":"0",
"dynamic_th":"3"
}
},
@ -45,7 +38,7 @@
{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-7": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}

17
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini
View File

@ -1,17 +0,0 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
10000 5m 1248 2288 35776 -3 2288
25000 5m 1248 2288 53248 -3 2288
40000 5m 1248 2288 66560 -3 2288
50000 5m 1248 2288 90272 -3 2288
100000 5m 1248 2288 165568 -3 2288
10000 40m 1248 2288 37024 -3 2288
25000 40m 1248 2288 53248 -3 2288
40000 40m 1248 2288 71552 -3 2288
50000 40m 1248 2288 96096 -3 2288
100000 40m 1248 2288 177632 -3 2288
10000 300m 1248 2288 46176 -3 2288
25000 300m 1248 2288 79040 -3 2288
40000 300m 1248 2288 108160 -3 2288
50000 300m 1248 2288 141856 -3 2288
100000 300m 1248 2288 268736 -3 2288

24
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/qos.json.j2
View File

@ -36,7 +36,7 @@
{{- generate_tc_to_pg_map() }}
{% else %}
"TC_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "0",
"2": "0",
@ -44,12 +44,12 @@
"4": "0",
"5": "0",
"6": "0",
"7": "0"
"7": "7"
}
},
{% endif %}
"MAP_PFC_PRIORITY_TO_QUEUE": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
@ -61,7 +61,7 @@
}
},
"TC_TO_QUEUE_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
@ -73,7 +73,7 @@
}
},
"DSCP_TO_TC_MAP": {
"AZURE": {
"DEFAULT": {
"0" : "0",
"1" : "0",
"2" : "0",
@ -174,19 +174,11 @@
"weight": "50"
}
},
{% if asic_type in pfc_to_pg_map_supported_asics %}
"PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"3": "3",
"4": "4"
}
},
{% endif %}
"PORT_QOS_MAP": {
"{{ port_names_active }}": {
"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]"
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
}
},
"QUEUE": {

3
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm
View File

@ -37,7 +37,6 @@ l3_max_ecmp_mode=1
bcm_tunnel_term_compatible_mode=1
ifp_inports_support_enable=1
mmu_init_config="MSFT-TD3-Tier1"
stable_size=0x5500000
@ -542,4 +541,4 @@ dport_map_port_129=126
dport_map_port_66=127
dport_map_port_130=128
mmu_init_config="TD3-DEFAULT"

46
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 Normal file
View File

@ -0,0 +1,46 @@
{%- set default_cable = '40m' %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32744448",
"type": "ingress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"0",
"dynamic_th":"3"
}
},
{%- endmacro %}
{%- macro generate_pg_profils(port_names_active) %}
"BUFFER_PG": {
"{{ port_names_active }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
{%- endmacro %}
{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
{% endmacro %}

19
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t1.j2
View File

@ -1,22 +1,15 @@
{%- set default_cable = '40m' %}
{%- 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*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33554432",
"size": "32744448",
"type": "ingress",
"mode": "dynamic"
"mode": "static"
},
"egress_lossy_pool": {
"size": "32786432",
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
@ -25,11 +18,11 @@
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"size":"0",
"dynamic_th":"3"
}
},
@ -45,7 +38,7 @@
{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-7": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}

24
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/qos.json.j2
View File

@ -36,7 +36,7 @@
{{- generate_tc_to_pg_map() }}
{% else %}
"TC_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "0",
"2": "0",
@ -44,12 +44,12 @@
"4": "0",
"5": "0",
"6": "0",
"7": "0"
"7": "7"
}
},
{% endif %}
"MAP_PFC_PRIORITY_TO_QUEUE": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
@ -61,7 +61,7 @@
}
},
"TC_TO_QUEUE_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
@ -73,7 +73,7 @@
}
},
"DSCP_TO_TC_MAP": {
"AZURE": {
"DEFAULT": {
"0" : "0",
"1" : "0",
"2" : "0",
@ -174,19 +174,11 @@
"weight": "50"
}
},
{% if asic_type in pfc_to_pg_map_supported_asics %}
"PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"3": "3",
"4": "4"
}
},
{% endif %}
"PORT_QOS_MAP": {
"{{ port_names_active }}": {
"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]"
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
}
},
"QUEUE": {

2
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/sai.profile
View File

@ -1 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-8x100G-96x10G.config.bcm
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-96x10G+8x100G.config.bcm

3
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm
View File

@ -37,7 +37,6 @@ l3_max_ecmp_mode=1
bcm_tunnel_term_compatible_mode=1
ifp_inports_support_enable=1
mmu_init_config="MSFT-TD3-Tier1"
stable_size=0x5500000
@ -615,4 +614,4 @@ dport_map_port_129=126
dport_map_port_66=127
dport_map_port_130=128
mmu_init_config="TD3-DEFAULT"

46
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 Normal file
View File

@ -0,0 +1,46 @@
{%- set default_cable = '40m' %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "32744448",
"type": "ingress",
"mode": "static"
},
"egress_lossy_pool": {
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"0",
"dynamic_th":"3"
}
},
{%- endmacro %}
{%- macro generate_pg_profils(port_names_active) %}
"BUFFER_PG": {
"{{ port_names_active }}|0": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
{%- endmacro %}
{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
{% endmacro %}

19
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t1.j2
View File

@ -1,22 +1,15 @@
{%- set default_cable = '40m' %}
{%- 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*4)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}
{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "33554432",
"size": "32744448",
"type": "ingress",
"mode": "dynamic"
"mode": "static"
},
"egress_lossy_pool": {
"size": "32786432",
"size": "32744448",
"type": "egress",
"mode": "dynamic"
}
@ -25,11 +18,11 @@
"ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0",
"dynamic_th":"3"
"static_th":"32744448"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
"size":"1518",
"size":"0",
"dynamic_th":"3"
}
},
@ -45,7 +38,7 @@
{% macro generate_queue_buffers(port_names_active) %}
"BUFFER_QUEUE": {
"{{ port_names_active }}|0-7": {
"{{ port_names_active }}|0-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}

24
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/qos.json.j2
View File

@ -36,7 +36,7 @@
{{- generate_tc_to_pg_map() }}
{% else %}
"TC_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "0",
"2": "0",
@ -44,12 +44,12 @@
"4": "0",
"5": "0",
"6": "0",
"7": "0"
"7": "7"
}
},
{% endif %}
"MAP_PFC_PRIORITY_TO_QUEUE": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
@ -61,7 +61,7 @@
}
},
"TC_TO_QUEUE_MAP": {
"AZURE": {
"DEFAULT": {
"0": "0",
"1": "1",
"2": "2",
@ -73,7 +73,7 @@
}
},
"DSCP_TO_TC_MAP": {
"AZURE": {
"DEFAULT": {
"0" : "0",
"1" : "0",
"2" : "0",
@ -174,19 +174,11 @@
"weight": "50"
}
},
{% if asic_type in pfc_to_pg_map_supported_asics %}
"PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"3": "3",
"4": "4"
}
},
{% endif %}
"PORT_QOS_MAP": {
"{{ port_names_active }}": {
"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]"
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]"
}
},
"QUEUE": {

2
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/sai.profile
View File

@ -1 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-8x100G-96x25G.config.bcm
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-96x25G+8x100G.config.bcm

3
device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm
View File

@ -37,7 +37,6 @@ l3_max_ecmp_mode=1
bcm_tunnel_term_compatible_mode=1
ifp_inports_support_enable=1
mmu_init_config="MSFT-TD3-Tier1"
stable_size=0x5500000
@ -615,4 +614,4 @@ dport_map_port_129=126
dport_map_port_66=127
dport_map_port_130=128
mmu_init_config="TD3-DEFAULT"