Skip to content

Commit 4037bd9

Browse files
xumiaxumia
committed
Merged PR 8374209: Merge code from master to internal
Merge code from master to internal Related work items: #32, #49, sonic-net#376, sonic-net#2598, sonic-net#11862, sonic-net#12530, sonic-net#14000, sonic-net#14547, sonic-net#14549, sonic-net#14814, sonic-net#15077, sonic-net#15239, sonic-net#15252, sonic-net#15253, sonic-net#15298, sonic-net#15357, sonic-net#15384, sonic-net#15394, sonic-net#15399, sonic-net#15405, sonic-net#15511, sonic-net#15566, sonic-net#15583, sonic-net#15591, sonic-net#15592, sonic-net#15593, sonic-net#15602, sonic-net#15604, sonic-net#15611, sonic-net#15621, sonic-net#15625, sonic-net#15634, sonic-net#15635, sonic-net#15645, sonic-net#15646, sonic-net#15647, sonic-net#15657, sonic-net#15658, sonic-net#15697, sonic-net#15699
2 parents 054f7c0 + 9426000 commit 4037bd9

File tree

67 files changed

+4095
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+4095
-92
lines changed

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/buffers.json.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
{%- set default_topo = 't0' %}
2+
{%- include 'buffers_config.j2' %}

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/buffers_defaults_t0.j2

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{% set default_cable = '5m' %}
2+
{% set ingress_lossless_pool_size = '4194304' %}
3+
{% set ingress_lossy_pool_size = '7340032' %}
4+
{% set egress_lossless_pool_size = '16777152' %}
5+
{% set egress_lossy_pool_size = '7340032' %}
6+
7+
{%- macro generate_port_lists(PORT_ALL) %}
8+
{# Generate list of ports #}
9+
{%- for port_idx in range(0,47) %}
10+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
11+
{%- endfor %}
12+
{% for port_idx in range(48,55) %}
13+
{% if PORT.append("Ethernet%d" % (48 + ( port_idx - 48 )*4)) %}{% endif %}
14+
{% endfor %}
15+
{%- endmacro %}
16+
17+
{%- macro generate_buffer_pool_and_profiles() %}
18+
"BUFFER_POOL": {
19+
"ingress_lossless_pool": {
20+
"size": "{{ ingress_lossless_pool_size }}",
21+
"type": "ingress",
22+
"mode": "dynamic"
23+
},
24+
"ingress_lossy_pool": {
25+
"size": "{{ ingress_lossy_pool_size }}",
26+
"type": "ingress",
27+
"mode": "dynamic"
28+
},
29+
"egress_lossless_pool": {
30+
"size": "{{ egress_lossless_pool_size }}",
31+
"type": "egress",
32+
"mode": "dynamic"
33+
},
34+
"egress_lossy_pool": {
35+
"size": "{{ egress_lossy_pool_size }}",
36+
"type": "egress",
37+
"mode": "dynamic"
38+
}
39+
},
40+
"BUFFER_PROFILE": {
41+
"ingress_lossless_profile": {
42+
"pool":"ingress_lossless_pool",
43+
"size":"4096",
44+
"dynamic_th":"0",
45+
"xon":"18432",
46+
"xoff":"18432"
47+
},
48+
"ingress_lossy_profile": {
49+
"pool":"ingress_lossy_pool",
50+
"size":"4096",
51+
"dynamic_th":"3"
52+
},
53+
"egress_lossless_profile": {
54+
"pool":"egress_lossless_pool",
55+
"size":"4096",
56+
"dynamic_th":"7",
57+
"xon":"18432",
58+
"xoff":"18432"
59+
},
60+
"egress_lossy_profile": {
61+
"pool":"egress_lossy_pool",
62+
"size":"4096",
63+
"dynamic_th":"3"
64+
},
65+
"q_lossy_profile": {
66+
"pool":"egress_lossy_pool",
67+
"size":"4096",
68+
"dynamic_th":"3"
69+
}
70+
},
71+
{%- endmacro %}
72+
73+
{%- macro generate_queue_buffers(port_names) %}
74+
"BUFFER_QUEUE": {
75+
{% for port in port_names.split(',') %}
76+
"{{ port }}|0-2": {
77+
"profile" : "q_lossy_profile"
78+
},
79+
{% endfor %}
80+
{% for port in port_names.split(',') %}
81+
"{{ port }}|3-4": {
82+
"profile" : "egress_lossless_profile"
83+
}{% if not loop.last %},{% endif %}
84+
{% endfor %}
85+
}
86+
{%- endmacro %}

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/buffers_defaults_t1.j2

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{% set default_cable = '5m' %}
2+
{% set ingress_lossless_pool_size = '2097152' %}
3+
{% set ingress_lossy_pool_size = '5242880' %}
4+
{% set egress_lossless_pool_size = '16777152' %}
5+
{% set egress_lossy_pool_size = '5242880' %}
6+
7+
{%- macro generate_port_lists(PORT_ALL) %}
8+
{# Generate list of ports #}
9+
{%- for port_idx in range(0,47) %}
10+
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
11+
{%- endfor %}
12+
{% for port_idx in range(48,55) %}
13+
{% if PORT.append("Ethernet%d" % (48+(port_idx-48)*4)) %}{% endif %}
14+
{% endfor %}
15+
{%- endmacro %}
16+
17+
{%- macro generate_buffer_pool_and_profiles() %}
18+
"BUFFER_POOL": {
19+
"ingress_lossless_pool": {
20+
"size": "{{ ingress_lossless_pool_size }}",
21+
"type": "ingress",
22+
"mode": "dynamic"
23+
},
24+
"ingress_lossy_pool": {
25+
"size": "{{ ingress_lossy_pool_size }}",
26+
"type": "ingress",
27+
"mode": "dynamic"
28+
},
29+
"egress_lossless_pool": {
30+
"size": "{{ egress_lossless_pool_size }}",
31+
"type": "egress",
32+
"mode": "dynamic"
33+
},
34+
"egress_lossy_pool": {
35+
"size": "{{ egress_lossy_pool_size }}",
36+
"type": "egress",
37+
"mode": "dynamic"
38+
}
39+
},
40+
"BUFFER_PROFILE": {
41+
"ingress_lossless_profile": {
42+
"pool":"ingress_lossless_pool",
43+
"size":"4096",
44+
"dynamic_th":"0",
45+
"xon":"18432",
46+
"xoff":"18432"
47+
},
48+
"ingress_lossy_profile": {
49+
"pool":"ingress_lossy_pool",
50+
"size":"4096",
51+
"dynamic_th":"3"
52+
},
53+
"egress_lossless_profile": {
54+
"pool":"egress_lossless_pool",
55+
"size":"4096",
56+
"dynamic_th":"7",
57+
"xon":"18432",
58+
"xoff":"18432"
59+
},
60+
"egress_lossy_profile": {
61+
"pool":"egress_lossy_pool",
62+
"size":"4096",
63+
"dynamic_th":"3"
64+
},
65+
"q_lossy_profile": {
66+
"pool":"egress_lossy_pool",
67+
"size":"4096",
68+
"dynamic_th":"3"
69+
}
70+
},
71+
{%- endmacro %}
72+
73+
{%- macro generate_queue_buffers(port_names) %}
74+
"BUFFER_QUEUE": {
75+
{% for port in port_names.split(',') %}
76+
"{{ port }}|0-2": {
77+
"profile" : "q_lossy_profile"
78+
},
79+
{% endfor %}
80+
{% for port in port_names.split(',') %}
81+
"{{ port }}|3-4": {
82+
"profile" : "egress_lossless_profile"
83+
}{% if not loop.last %},{% endif %}
84+
{% endfor %}
85+
}
86+
{%- endmacro %}

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/hwsku.json

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
{
2+
"interfaces": {
3+
"Ethernet0": {
4+
"default_brkout_mode": "1x100G[40G]",
5+
"autoneg": "off",
6+
"fec": "rs"
7+
},
8+
"Ethernet4": {
9+
"default_brkout_mode": "1x100G[40G]",
10+
"autoneg": "off",
11+
"fec": "rs"
12+
},
13+
"Ethernet8": {
14+
"default_brkout_mode": "1x100G[40G]",
15+
"autoneg": "off",
16+
"fec": "rs"
17+
},
18+
"Ethernet12": {
19+
"default_brkout_mode": "1x100G[40G]",
20+
"autoneg": "off",
21+
"fec": "rs"
22+
},
23+
"Ethernet16": {
24+
"default_brkout_mode": "1x100G[40G]",
25+
"autoneg": "off",
26+
"fec": "rs"
27+
},
28+
"Ethernet20": {
29+
"default_brkout_mode": "1x100G[40G]",
30+
"autoneg": "off",
31+
"fec": "rs"
32+
},
33+
"Ethernet24": {
34+
"default_brkout_mode": "1x100G[40G]",
35+
"autoneg": "off",
36+
"fec": "rs"
37+
},
38+
"Ethernet28": {
39+
"default_brkout_mode": "1x100G[40G]",
40+
"autoneg": "off",
41+
"fec": "rs"
42+
},
43+
"Ethernet32": {
44+
"default_brkout_mode": "1x100G[40G]",
45+
"autoneg": "off",
46+
"fec": "rs"
47+
},
48+
"Ethernet36": {
49+
"default_brkout_mode": "1x100G[40G]",
50+
"autoneg": "off",
51+
"fec": "rs"
52+
},
53+
"Ethernet40": {
54+
"default_brkout_mode": "1x100G[40G]",
55+
"autoneg": "off",
56+
"fec": "rs"
57+
},
58+
"Ethernet44": {
59+
"default_brkout_mode": "1x100G[40G]",
60+
"autoneg": "off",
61+
"fec": "rs"
62+
},
63+
"Ethernet48": {
64+
"default_brkout_mode": "1x100G[40G]",
65+
"autoneg": "off",
66+
"fec": "rs"
67+
},
68+
"Ethernet52": {
69+
"default_brkout_mode": "1x100G[40G]",
70+
"autoneg": "off",
71+
"fec": "rs"
72+
},
73+
"Ethernet56": {
74+
"default_brkout_mode": "1x100G[40G]",
75+
"autoneg": "off",
76+
"fec": "rs"
77+
},
78+
"Ethernet60": {
79+
"default_brkout_mode": "1x100G[40G]",
80+
"autoneg": "off",
81+
"fec": "rs"
82+
},
83+
"Ethernet64": {
84+
"default_brkout_mode": "1x100G[40G]",
85+
"autoneg": "off",
86+
"fec": "rs"
87+
},
88+
"Ethernet68": {
89+
"default_brkout_mode": "1x100G[40G]",
90+
"autoneg": "off",
91+
"fec": "rs"
92+
},
93+
"Ethernet72": {
94+
"default_brkout_mode": "1x100G[40G]",
95+
"autoneg": "off",
96+
"fec": "rs"
97+
},
98+
"Ethernet76": {
99+
"default_brkout_mode": "1x100G[40G]",
100+
"autoneg": "off",
101+
"fec": "rs"
102+
},
103+
"Ethernet80": {
104+
"default_brkout_mode": "1x100G[40G]",
105+
"autoneg": "off",
106+
"fec": "rs"
107+
},
108+
"Ethernet84": {
109+
"default_brkout_mode": "1x100G[40G]",
110+
"autoneg": "off",
111+
"fec": "rs"
112+
},
113+
"Ethernet88": {
114+
"default_brkout_mode": "1x100G[40G]",
115+
"autoneg": "off",
116+
"fec": "rs"
117+
},
118+
"Ethernet92": {
119+
"default_brkout_mode": "1x100G[40G]",
120+
"autoneg": "off",
121+
"fec": "rs"
122+
},
123+
"Ethernet96": {
124+
"default_brkout_mode": "1x100G[40G]",
125+
"autoneg": "off",
126+
"fec": "rs"
127+
},
128+
"Ethernet100": {
129+
"default_brkout_mode": "1x100G[40G]",
130+
"autoneg": "off",
131+
"fec": "rs"
132+
},
133+
"Ethernet104": {
134+
"default_brkout_mode": "1x100G[40G]",
135+
"autoneg": "off",
136+
"fec": "rs"
137+
},
138+
"Ethernet108": {
139+
"default_brkout_mode": "1x100G[40G]",
140+
"autoneg": "off",
141+
"fec": "rs"
142+
},
143+
"Ethernet112": {
144+
"default_brkout_mode": "1x100G[40G]",
145+
"autoneg": "off",
146+
"fec": "rs"
147+
},
148+
"Ethernet116": {
149+
"default_brkout_mode": "1x100G[40G]",
150+
"autoneg": "off",
151+
"fec": "rs"
152+
},
153+
"Ethernet120": {
154+
"default_brkout_mode": "1x100G[40G]",
155+
"autoneg": "off",
156+
"fec": "rs"
157+
},
158+
"Ethernet124": {
159+
"default_brkout_mode": "1x100G[40G]",
160+
"autoneg": "off",
161+
"fec": "rs"
162+
}
163+
}
164+
}

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/pg_profile_lookup.ini

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# PG lossless profiles.
2+
# speed cable size xon xoff threshold
3+
10000 5m 34816 18432 16384 0
4+
25000 5m 34816 18432 16384 0
5+
40000 5m 34816 18432 16384 0
6+
50000 5m 34816 18432 16384 0
7+
100000 5m 36864 18432 18432 0
8+
10000 40m 36864 18432 18432 0
9+
25000 40m 39936 18432 21504 0
10+
40000 40m 41984 18432 23552 0
11+
50000 40m 41984 18432 23552 0
12+
100000 40m 54272 18432 35840 0
13+
10000 300m 49152 18432 30720 0
14+
25000 300m 71680 18432 53248 0
15+
40000 300m 94208 18432 75776 0
16+
50000 300m 94208 18432 75776 0
17+
100000 300m 184320 18432 165888 0

‎device/netberg/x86_64-netberg_aurora_710-r0/aurora-710/port_config.ini

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# name lanes alias speed autoneg fec index
2+
Ethernet0 0,1,2,3 Ethernet0 100000 0 rs 0
3+
Ethernet4 4,5,6,7 Ethernet4 100000 0 rs 1
4+
Ethernet8 8,9,10,11 Ethernet8 100000 0 rs 2
5+
Ethernet12 12,13,14,15 Ethernet12 100000 0 rs 3
6+
Ethernet16 16,17,18,19 Ethernet16 100000 0 rs 4
7+
Ethernet20 20,21,22,23 Ethernet20 100000 0 rs 5
8+
Ethernet24 24,25,26,27 Ethernet24 100000 0 rs 6
9+
Ethernet28 28,29,30,31 Ethernet28 100000 0 rs 7
10+
Ethernet32 32,33,34,35 Ethernet32 100000 0 rs 8
11+
Ethernet36 36,37,38,39 Ethernet36 100000 0 rs 9
12+
Ethernet40 40,41,42,43 Ethernet40 100000 0 rs 10
13+
Ethernet44 44,45,46,47 Ethernet44 100000 0 rs 11
14+
Ethernet48 48,49,50,51 Ethernet48 100000 0 rs 12
15+
Ethernet52 52,53,54,55 Ethernet52 100000 0 rs 13
16+
Ethernet56 56,57,58,59 Ethernet56 100000 0 rs 14
17+
Ethernet60 60,61,62,63 Ethernet60 100000 0 rs 15
18+
Ethernet64 64,65,66,67 Ethernet64 100000 0 rs 16
19+
Ethernet68 68,69,70,71 Ethernet68 100000 0 rs 17
20+
Ethernet72 72,73,74,75 Ethernet72 100000 0 rs 18
21+
Ethernet76 76,77,78,79 Ethernet76 100000 0 rs 19
22+
Ethernet80 80,81,82,83 Ethernet80 100000 0 rs 20
23+
Ethernet84 84,85,86,87 Ethernet84 100000 0 rs 21
24+
Ethernet88 88,89,90,91 Ethernet88 100000 0 rs 22
25+
Ethernet92 92,93,94,95 Ethernet92 100000 0 rs 23
26+
Ethernet96 96,97,98,99 Ethernet96 100000 0 rs 24
27+
Ethernet100 100,101,102,103 Ethernet100 100000 0 rs 25
28+
Ethernet104 104,105,106,107 Ethernet104 100000 0 rs 26
29+
Ethernet108 108,109,110,111 Ethernet108 100000 0 rs 27
30+
Ethernet112 112,113,114,115 Ethernet112 100000 0 rs 28
31+
Ethernet116 116,117,118,119 Ethernet116 100000 0 rs 29
32+
Ethernet120 120,121,122,123 Ethernet120 100000 0 rs 30
33+
Ethernet124 124,125,126,127 Ethernet124 100000 0 rs 31

0 commit comments

Comments
 (0)