Skip to content

Commit dacab24

Browse files
noaOrMlnxram25794
authored andcommitted
[Mellanox] Update DSCP mapping for SN5600, SN5610 SKUs (sonic-net#21762)
- Why I did it To have DSCP mapping updated to Mellanox SN5600, SN5610N SKUs - How I did it Update buffers_defaults_objects.j2 and qos.json.j2 according to new DSCP mapping - How to verify it Check SDK dumps to make sure values are correct
1 parent 316d87b commit dacab24

File tree

6 files changed

+59
-440
lines changed

6 files changed

+59
-440
lines changed

device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_objects.j2

+4-4
Original file line numberDiff line numberDiff line change
@@ -155,22 +155,22 @@
155155
},
156156
{% endfor %}
157157
{% for port in port_names_active.split(',') %}
158-
"{{ port }}|1-2": {
158+
"{{ port }}|1-3": {
159159
"profile" : "q_lossy_minus_7_profile"
160160
},
161161
{% endfor %}
162162
{% for port in port_names_active.split(',') %}
163-
"{{ port }}|3": {
163+
"{{ port }}|4": {
164164
"profile" : "q_lossy_profile"
165165
},
166166
{% endfor %}
167167
{% for port in port_names_active.split(',') %}
168-
"{{ port }}|4": {
168+
"{{ port }}|5": {
169169
"profile" : "q_lossy_minus_3_profile"
170170
},
171171
{% endfor %}
172172
{% for port in port_names_active.split(',') %}
173-
"{{ port }}|5-6": {
173+
"{{ port }}|6": {
174174
"profile" : "q_lossy_profile"
175175
}{% if not loop.last %},{% endif %}
176176

device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/qos.json.j2

+51-51
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,47 @@
1616
{%- macro generate_dscp_to_tc_map_per_sku() -%}
1717
"DSCP_TO_TC_MAP": {
1818
"AZURE": {
19-
"0" : "6",
19+
"0" : "0",
2020
"1" : "1",
21-
"2" : "2",
22-
"3" : "3",
23-
"4" : "3",
24-
"5" : "4",
25-
"6" : "5",
21+
"2" : "1",
22+
"3" : "2",
23+
"4" : "2",
24+
"5" : "3",
25+
"6" : "3",
2626
"7" : "0",
2727
"8" : "0",
2828
"9" : "0",
2929
"10": "0",
30-
"11": "0",
31-
"12": "0",
32-
"13": "0",
33-
"14": "0",
34-
"15": "0",
35-
"16": "0",
36-
"17": "0",
37-
"18": "0",
38-
"19": "0",
39-
"20": "0",
40-
"21": "0",
41-
"22": "0",
42-
"23": "0",
43-
"24": "0",
44-
"25": "0",
45-
"26": "0",
46-
"27": "0",
47-
"28": "0",
48-
"29": "0",
49-
"30": "0",
50-
"31": "0",
51-
"32": "0",
52-
"33": "0",
53-
"34": "0",
54-
"35": "0",
55-
"36": "0",
56-
"37": "0",
57-
"38": "0",
58-
"39": "0",
59-
"40": "0",
30+
"11": "4",
31+
"12": "4",
32+
"13": "4",
33+
"14": "4",
34+
"15": "4",
35+
"16": "4",
36+
"17": "4",
37+
"18": "4",
38+
"19": "4",
39+
"20": "4",
40+
"21": "4",
41+
"22": "4",
42+
"23": "4",
43+
"24": "4",
44+
"25": "4",
45+
"26": "4",
46+
"27": "4",
47+
"28": "4",
48+
"29": "4",
49+
"30": "4",
50+
"31": "5",
51+
"32": "5",
52+
"33": "5",
53+
"34": "5",
54+
"35": "5",
55+
"36": "5",
56+
"37": "5",
57+
"38": "5",
58+
"39": "5",
59+
"40": "5",
6060
"41": "0",
6161
"42": "0",
6262
"43": "0",
@@ -100,46 +100,46 @@
100100

101101
{%- macro generate_scheduler_per_sku() -%}
102102
"SCHEDULER": {
103-
"scheduler.1": {
103+
"scheduler.4": {
104104
"type" : "DWRR",
105-
"weight": "1"
105+
"weight": "4"
106106
},
107-
"scheduler.10": {
107+
"scheduler.8": {
108108
"type" : "DWRR",
109-
"weight": "10"
109+
"weight": "8"
110110
},
111-
"scheduler.12": {
111+
"scheduler.18": {
112112
"type" : "DWRR",
113-
"weight": "12"
113+
"weight": "18"
114114
},
115-
"scheduler.32": {
115+
"scheduler.22": {
116116
"type" : "DWRR",
117-
"weight": "32"
117+
"weight": "22"
118118
}
119119
},
120120
{%- endmacro -%}
121121

122122
{%- macro generate_single_queue_per_sku(port) -%}
123123
"{{ port }}|0": {
124-
"scheduler": "scheduler.1"
124+
"scheduler": "scheduler.4"
125125
},
126126
"{{ port }}|1": {
127-
"scheduler": "scheduler.10"
127+
"scheduler": "scheduler.8"
128128
},
129129
"{{ port }}|2": {
130-
"scheduler": "scheduler.12"
130+
"scheduler": "scheduler.18"
131131
},
132132
"{{ port }}|3": {
133-
"scheduler": "scheduler.12"
133+
"scheduler": "scheduler.22"
134134
},
135135
"{{ port }}|4": {
136-
"scheduler": "scheduler.32"
136+
"scheduler": "scheduler.22"
137137
},
138138
"{{ port }}|5": {
139-
"scheduler": "scheduler.32"
139+
"scheduler": "scheduler.22"
140140
},
141141
"{{ port }}|6": {
142-
"scheduler": "scheduler.1"
142+
"scheduler": "scheduler.4"
143143
}
144144
{%- endmacro -%}
145145

Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../Mellanox-SN5610N-C256S2/buffers_defaults_objects.j2
1+
../../x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_objects.j2
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../Mellanox-SN5610N-C256S2/qos.json.j2
1+
../../x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/qos.json.j2

device/mellanox/x86_64-nvidia_sn5610n-r0/Mellanox-SN5610N-C256S2/buffers_defaults_objects.j2

-213
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_objects.j2

0 commit comments

Comments
 (0)