Skip to content

Commit 07f8c02

Browse files
saiarcot895saiarcot895
committed
Merge remote-tracking branch 'origin/master' into update-dockerfiles
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2 parents da5c8a8 + 88c8ec9 commit 07f8c02

File tree

178 files changed

+11065
-117
lines changed

Some content is hidden

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

178 files changed

+11065
-117
lines changed

‎.azure-pipelines/azure-pipelines-repd-build-variables.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
variables:
2-
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=deb,py2,py3,web,git,docker'
2+
VERSION_CONTROL_OPTIONS: 'SONIC_VERSION_CONTROL_COMPONENTS=py2,py3,web,git,docker'

‎azure-pipelines.yml

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ stages:
109109
- job:
110110
pool: sonictest
111111
displayName: "vstest"
112+
condition: false # agent pool don't work. disable this job to unblock PRs.
112113
timeoutInMinutes: 60
113114
steps:
114115
- template: .azure-pipelines/cleanup.yml

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/BALANCED/buffers_defaults_t0.j2

+11-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@
88
{%- endfor %}
99
{%- endmacro %}
1010

11+
{%- set ingress_lossless_pool_size = '32689152' %}
12+
{%- set egress_lossless_pool_size = '32340992' %}
13+
{%- if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'] == 'DualToR') %}
14+
{%- set ingress_lossless_pool_size = '32441856' %}
15+
{%- set egress_lossless_pool_size = '32441856' %}
16+
{%- endif %}
17+
1118
{%- macro generate_buffer_pool_and_profiles() %}
1219
"BUFFER_POOL": {
1320
"ingress_lossless_pool": {
14-
"size": "32689152",
21+
"size": "{{ingress_lossless_pool_size }}",
1522
"type": "ingress",
1623
"mode": "dynamic",
1724
"xoff": "2058240"
@@ -22,7 +29,7 @@
2229
"mode": "dynamic"
2330
},
2431
"egress_lossless_pool": {
25-
"size": "32340992",
32+
"size": "{{egress_lossless_pool_size }}",
2633
"type": "egress",
2734
"mode": "static"
2835
}
@@ -31,12 +38,12 @@
3138
"ingress_lossy_profile": {
3239
"pool":"ingress_lossless_pool",
3340
"size":"0",
34-
"static_th":"32689152"
41+
"static_th":"{{ingress_lossless_pool_size }}"
3542
},
3643
"egress_lossless_profile": {
3744
"pool":"egress_lossless_pool",
3845
"size":"0",
39-
"static_th":"32340992"
46+
"static_th":"{{egress_lossless_pool_size }}"
4047
},
4148
"egress_lossy_profile": {
4249
"pool":"egress_lossy_pool",

‎device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C256S2/th5-a7060x6-64pe.config.bcm

+13-2
Original file line numberDiff line numberDiff line change
@@ -1907,14 +1907,25 @@ bcm_device:
19071907
0:
19081908
global:
19091909
ftem_mem_entries: 65536
1910+
sai_stats_support_mask: 0
1911+
global_flexctr_ing_action_num_reserved: 20
1912+
global_flexctr_ing_pool_num_reserved: 8
1913+
global_flexctr_ing_op_profile_num_reserved: 20
1914+
global_flexctr_ing_group_num_reserved: 2
1915+
global_flexctr_egr_action_num_reserved: 8
1916+
global_flexctr_egr_pool_num_reserved: 5
1917+
global_flexctr_egr_op_profile_num_reserved: 10
1918+
global_flexctr_egr_group_num_reserved: 1
19101919
...
19111920
---
19121921
device:
19131922
0:
19141923
# Per pipe flex counter configuration
19151924
CTR_EFLEX_CONFIG:
1916-
CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 0
1917-
CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 0
1925+
CTR_ING_EFLEX_OPERMODE_PIPEUNIQUE: 1
1926+
CTR_ING_EFLEX_OPERMODE_PIPE_INSTANCE_UNIQUE: 1
1927+
CTR_EGR_EFLEX_OPERMODE_PIPEUNIQUE: 1
1928+
CTR_EGR_EFLEX_OPERMODE_PIPE_INSTANCE_UNIQUE: 1
19181929

19191930
# IFP mode
19201931
FP_CONFIG:

‎device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ l4_protocols_load_balancing_enable=1
99
fabric_logical_port_base=512
1010
trunk_group_max_members=16
1111
num_olp_tm_ports.BCM8869X=1
12+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
1213

1314
# nif
1415
port_init_cl72=0

‎device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/sai_postinit_cmd.soc

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
INTeRrupt ENAble id=1550
2+
INTeRrupt ENAble id=1551
3+
INTeRrupt ENAble id=1552
4+
INTeRrupt ENAble id=1553
5+
INTeRrupt ENAble id=1554
6+
INTeRrupt ENAble id=1555
7+
INTeRrupt ENAble id=1556
8+
INTeRrupt ENAble id=1557
9+
INTeRrupt ENAble id=1558
10+
INTeRrupt ENAble id=1559
11+
INTeRrupt ENAble id=1560
12+
INTeRrupt ENAble id=1561
13+
INTeRrupt ENAble id=1562
14+
INTeRrupt ENAble id=1563
15+
INTeRrupt ENAble id=1564
16+
INTeRrupt ENAble id=1565
17+
INTeRrupt ENAble id=1566
18+
INTeRrupt ENAble id=1567
19+
20+
INTeRrupt ENAble id=1296
21+
INTeRrupt ENAble id=1297
22+
INTeRrupt ENAble id=1298
23+
INTeRrupt ENAble id=1299
24+
INTeRrupt ENAble id=1661
25+
INTeRrupt ENAble id=1662
26+
27+
INTeRrupt ENAble id=1093
28+
debug intr error

‎device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/sai_postinit_cmd.soc

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
INTeRrupt ENAble id=1550
2+
INTeRrupt ENAble id=1551
3+
INTeRrupt ENAble id=1552
4+
INTeRrupt ENAble id=1553
5+
INTeRrupt ENAble id=1554
6+
INTeRrupt ENAble id=1555
7+
INTeRrupt ENAble id=1556
8+
INTeRrupt ENAble id=1557
9+
INTeRrupt ENAble id=1558
10+
INTeRrupt ENAble id=1559
11+
INTeRrupt ENAble id=1560
12+
INTeRrupt ENAble id=1561
13+
INTeRrupt ENAble id=1562
14+
INTeRrupt ENAble id=1563
15+
INTeRrupt ENAble id=1564
16+
INTeRrupt ENAble id=1565
17+
INTeRrupt ENAble id=1566
18+
INTeRrupt ENAble id=1567
19+
20+
INTeRrupt ENAble id=1296
21+
INTeRrupt ENAble id=1297
22+
INTeRrupt ENAble id=1298
23+
INTeRrupt ENAble id=1299
24+
INTeRrupt ENAble id=1661
25+
INTeRrupt ENAble id=1662
26+
27+
INTeRrupt ENAble id=1093
28+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ system_ref_core_clock_khz=1600000
33

44
dpp_db_path=/usr/share/bcm/db
55
programmability_ucode_relative_path.BCM8885X=pemla/ucode/standard_1/jer2pemla/u_code_db2pem.txt
6-
6+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
77
####################################################
88
##Reference applications related properties - Start
99
####################################################

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/sai_postinit_cmd.soc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
INTeRrupt ENAble id=2209
2+
INTeRrupt ENAble id=2210
3+
INTeRrupt ENAble id=2211
4+
INTeRrupt ENAble id=2212
5+
INTeRrupt ENAble id=2213
6+
INTeRrupt ENAble id=2214
7+
INTeRrupt ENAble id=2215
8+
INTeRrupt ENAble id=2216
9+
INTeRrupt ENAble id=2217
10+
INTeRrupt ENAble id=2218
11+
INTeRrupt ENAble id=2219
12+
INTeRrupt ENAble id=2220
13+
INTeRrupt ENAble id=2221
14+
INTeRrupt ENAble id=2222
15+
INTeRrupt ENAble id=2223
16+
INTeRrupt ENAble id=2224
17+
INTeRrupt ENAble id=2225
18+
INTeRrupt ENAble id=2226
19+
20+
INTeRrupt ENAble id=482
21+
INTeRrupt ENAble id=483
22+
INTeRrupt ENAble id=484
23+
INTeRrupt ENAble id=485
24+
INTeRrupt ENAble id=486
25+
INTeRrupt ENAble id=487
26+
INTeRrupt ENAble id=488
27+
28+
INTeRrupt ENAble id=1597
29+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ system_ref_core_clock_khz=1600000
33

44
dpp_db_path=/usr/share/bcm/db
55
programmability_ucode_relative_path.BCM8885X=pemla/ucode/standard_1/jer2pemla/u_code_db2pem.txt
6-
6+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
77
####################################################
88
##Reference applications related properties - Start
99
####################################################

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/sai_postinit_cmd.soc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
INTeRrupt ENAble id=2209
2+
INTeRrupt ENAble id=2210
3+
INTeRrupt ENAble id=2211
4+
INTeRrupt ENAble id=2212
5+
INTeRrupt ENAble id=2213
6+
INTeRrupt ENAble id=2214
7+
INTeRrupt ENAble id=2215
8+
INTeRrupt ENAble id=2216
9+
INTeRrupt ENAble id=2217
10+
INTeRrupt ENAble id=2218
11+
INTeRrupt ENAble id=2219
12+
INTeRrupt ENAble id=2220
13+
INTeRrupt ENAble id=2221
14+
INTeRrupt ENAble id=2222
15+
INTeRrupt ENAble id=2223
16+
INTeRrupt ENAble id=2224
17+
INTeRrupt ENAble id=2225
18+
INTeRrupt ENAble id=2226
19+
20+
INTeRrupt ENAble id=482
21+
INTeRrupt ENAble id=483
22+
INTeRrupt ENAble id=484
23+
INTeRrupt ENAble id=485
24+
INTeRrupt ENAble id=486
25+
INTeRrupt ENAble id=487
26+
INTeRrupt ENAble id=488
27+
28+
INTeRrupt ENAble id=1597
29+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ system_ref_core_clock_khz=1600000
33

44
dpp_db_path=/usr/share/bcm/db
55
programmability_ucode_relative_path.BCM8885X=pemla/ucode/standard_1/jer2pemla/u_code_db2pem.txt
6-
6+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
77
####################################################
88
##Reference applications related properties - Start
99
####################################################

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/sai_postinit_cmd.soc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
INTeRrupt ENAble id=2209
2+
INTeRrupt ENAble id=2210
3+
INTeRrupt ENAble id=2211
4+
INTeRrupt ENAble id=2212
5+
INTeRrupt ENAble id=2213
6+
INTeRrupt ENAble id=2214
7+
INTeRrupt ENAble id=2215
8+
INTeRrupt ENAble id=2216
9+
INTeRrupt ENAble id=2217
10+
INTeRrupt ENAble id=2218
11+
INTeRrupt ENAble id=2219
12+
INTeRrupt ENAble id=2220
13+
INTeRrupt ENAble id=2221
14+
INTeRrupt ENAble id=2222
15+
INTeRrupt ENAble id=2223
16+
INTeRrupt ENAble id=2224
17+
INTeRrupt ENAble id=2225
18+
INTeRrupt ENAble id=2226
19+
20+
INTeRrupt ENAble id=482
21+
INTeRrupt ENAble id=483
22+
INTeRrupt ENAble id=484
23+
INTeRrupt ENAble id=485
24+
INTeRrupt ENAble id=486
25+
INTeRrupt ENAble id=487
26+
INTeRrupt ENAble id=488
27+
28+
INTeRrupt ENAble id=1597
29+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ system_ref_core_clock_khz=1600000
33

44
dpp_db_path=/usr/share/bcm/db
55
programmability_ucode_relative_path.BCM8885X=pemla/ucode/standard_1/jer2pemla/u_code_db2pem.txt
6-
6+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
77
####################################################
88
##Reference applications related properties - Start
99
####################################################

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/sai_postinit_cmd.soc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
INTeRrupt ENAble id=2209
2+
INTeRrupt ENAble id=2210
3+
INTeRrupt ENAble id=2211
4+
INTeRrupt ENAble id=2212
5+
INTeRrupt ENAble id=2213
6+
INTeRrupt ENAble id=2214
7+
INTeRrupt ENAble id=2215
8+
INTeRrupt ENAble id=2216
9+
INTeRrupt ENAble id=2217
10+
INTeRrupt ENAble id=2218
11+
INTeRrupt ENAble id=2219
12+
INTeRrupt ENAble id=2220
13+
INTeRrupt ENAble id=2221
14+
INTeRrupt ENAble id=2222
15+
INTeRrupt ENAble id=2223
16+
INTeRrupt ENAble id=2224
17+
INTeRrupt ENAble id=2225
18+
INTeRrupt ENAble id=2226
19+
20+
INTeRrupt ENAble id=482
21+
INTeRrupt ENAble id=483
22+
INTeRrupt ENAble id=484
23+
INTeRrupt ENAble id=485
24+
INTeRrupt ENAble id=486
25+
INTeRrupt ENAble id=487
26+
INTeRrupt ENAble id=488
27+
28+
INTeRrupt ENAble id=1597
29+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ system_ref_core_clock_khz=1600000
33

44
dpp_db_path=/usr/share/bcm/db
55
programmability_ucode_relative_path.BCM8885X=pemla/ucode/standard_1/jer2pemla/u_code_db2pem.txt
6-
6+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
77
####################################################
88
##Reference applications related properties - Start
99
####################################################

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/sai_postinit_cmd.soc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
INTeRrupt ENAble id=2209
2+
INTeRrupt ENAble id=2210
3+
INTeRrupt ENAble id=2211
4+
INTeRrupt ENAble id=2212
5+
INTeRrupt ENAble id=2213
6+
INTeRrupt ENAble id=2214
7+
INTeRrupt ENAble id=2215
8+
INTeRrupt ENAble id=2216
9+
INTeRrupt ENAble id=2217
10+
INTeRrupt ENAble id=2218
11+
INTeRrupt ENAble id=2219
12+
INTeRrupt ENAble id=2220
13+
INTeRrupt ENAble id=2221
14+
INTeRrupt ENAble id=2222
15+
INTeRrupt ENAble id=2223
16+
INTeRrupt ENAble id=2224
17+
INTeRrupt ENAble id=2225
18+
INTeRrupt ENAble id=2226
19+
20+
INTeRrupt ENAble id=482
21+
INTeRrupt ENAble id=483
22+
INTeRrupt ENAble id=484
23+
INTeRrupt ENAble id=485
24+
INTeRrupt ENAble id=486
25+
INTeRrupt ENAble id=487
26+
INTeRrupt ENAble id=488
27+
28+
INTeRrupt ENAble id=1597
29+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ system_ref_core_clock_khz=1600000
33

44
dpp_db_path=/usr/share/bcm/db
55
programmability_ucode_relative_path.BCM8885X=pemla/ucode/standard_1/jer2pemla/u_code_db2pem.txt
6-
6+
sai_postinit_cmd_file=/usr/share/sonic/hwsku/sai_postinit_cmd.soc
77
####################################################
88
##Reference applications related properties - Start
99
####################################################

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/sai_postinit_cmd.soc

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
INTeRrupt ENAble id=2209
2+
INTeRrupt ENAble id=2210
3+
INTeRrupt ENAble id=2211
4+
INTeRrupt ENAble id=2212
5+
INTeRrupt ENAble id=2213
6+
INTeRrupt ENAble id=2214
7+
INTeRrupt ENAble id=2215
8+
INTeRrupt ENAble id=2216
9+
INTeRrupt ENAble id=2217
10+
INTeRrupt ENAble id=2218
11+
INTeRrupt ENAble id=2219
12+
INTeRrupt ENAble id=2220
13+
INTeRrupt ENAble id=2221
14+
INTeRrupt ENAble id=2222
15+
INTeRrupt ENAble id=2223
16+
INTeRrupt ENAble id=2224
17+
INTeRrupt ENAble id=2225
18+
INTeRrupt ENAble id=2226
19+
20+
INTeRrupt ENAble id=482
21+
INTeRrupt ENAble id=483
22+
INTeRrupt ENAble id=484
23+
INTeRrupt ENAble id=485
24+
INTeRrupt ENAble id=486
25+
INTeRrupt ENAble id=487
26+
INTeRrupt ENAble id=488
27+
28+
INTeRrupt ENAble id=1597
29+
debug intr error

‎device/arista/x86_64-arista_7800r3a_36d2_lc/platform.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chassis": {
3-
"name": "7800R3A-36DM2-LC",
3+
"name": "7800R3A-36D2-LC",
44
"components": [
55
{
66
"name": "Aboot()"

0 commit comments

Comments
 (0)