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.

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

[pull] master from Azure:master #1061

Merged
merged 2 commits into from
Oct 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{%- set default_topo = 't1' %}
{%- include 'buffers_config.j2' %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

{%- set default_cable = '40m' %}

{%- set PORT_ALL = [] %}

{%- for port in PORT %}
{%- if PORT_ALL.append(port) %}{%- endif %}
{%- endfor %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossless_pool": {
"size": "27678784",
"type": "ingress",
"mode": "dynamic",
"xoff": "4194112"
},
"egress_lossy_pool": {
"size": "26045524",
"type": "egress",
"mode": "dynamic"
},
"egress_lossless_pool": {
"size": "32786432",
"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 %}
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 79872 -4 2288
100000 5m 1248 2288 165568 -4 2288
10000 40m 1248 2288 37024 -4 2288
25000 40m 1248 2288 56160 -4 2288
40000 40m 1248 2288 71552 -4 2288
50000 40m 1248 2288 85696 -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 131456 -4 2288
100000 300m 1248 2288 268736 -4 2288
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# name lanes index speed autoneg
Ethernet0 21,22,23,24 0 100000 0
Ethernet4 17,18,19,20 1 100000 0
Ethernet8 25,26,27,28 2 100000 0
Ethernet12 29,30,31,32 3 100000 0
Ethernet16 37,38,39,40 4 100000 0
Ethernet20 33,34,35,36 5 100000 0
Ethernet24 41,42,43,44 6 100000 0
Ethernet28 45,46,47,48 7 100000 0
Ethernet32 5,6,7,8 8 100000 0
Ethernet36 1,2,3,4 9 100000 0
Ethernet40 9,10,11,12 10 100000 0
Ethernet44 13,14,15,16 11 100000 0
Ethernet48 53,54,55,56 12 100000 0
Ethernet52 49,50,51,52 13 100000 0
Ethernet56 57,58,59,60 14 100000 0
Ethernet60 61,62,63,64 15 100000 0
Ethernet64 69,70,71,72 16 100000 0
Ethernet68 65,66,67,68 17 100000 0
Ethernet72 73,74,75,76 18 100000 0
Ethernet76 77,78,79,80 19 100000 0
Ethernet80 117,118,119,120 20 100000 0
Ethernet84 113,114,115,116 21 100000 0
Ethernet88 121,122,123,124 22 100000 0
Ethernet92 125,126,127,128 23 100000 0
Ethernet96 85,86,87,88 24 100000 0
Ethernet100 81,82,83,84 25 100000 0
Ethernet104 89,90,91,92 26 100000 0
Ethernet108 93,94,95,96 27 100000 0
Ethernet112 101,102,103,104 28 100000 0
Ethernet116 97,98,99,100 29 100000 0
Ethernet120 105,106,107,108 30 100000 0
Ethernet124 109,110,111,112 31 100000 0
161 changes: 161 additions & 0 deletions device/inventec/x86_64-inventec_d6332-r0/INVENTEC-D6332/qos.json.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
{%- set PORT_ALL = [] %}

{%- for port in PORT %}
{%- if PORT_ALL.append(port) %}{%- endif %}
{%- endfor %}

{
"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": {
"{{ PORT_ALL|join(',') }}": {
"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_LOSSLESS" : {
"wred_green_enable":"true",
"wred_yellow_enable":"true",
"wred_red_enable":"true",
"ecn":"ecn_all",
"red_max_threshold":"312000",
"red_min_threshold":"104000",
"yellow_max_threshold":"312000",
"yellow_min_threshold":"104000",
"green_max_threshold": "312000",
"green_min_threshold": "104000"
}
},
"QUEUE": {
"{{ PORT_ALL|join(',') }}|3-4" : {
"scheduler" : "[SCHEDULER|scheduler.0]",
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
},
"{{ PORT_ALL|join(',') }}|0" : {
"scheduler" : "[SCHEDULER|scheduler.1]"
},
"{{ PORT_ALL|join(',') }}|1" : {
"scheduler" : "[SCHEDULER|scheduler.2]"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-d6332-32x100G-SR4.config.bcm
SAI_NUM_ECMP_MEMBERS=32
Loading