Skip to content

Commit 7279797

Browse files
alexrallenalexrallen
authored
Merge branch 'master' into syncd_bullseye_merge_2
2 parents 7c09e36 + d9117d9 commit 7279797

File tree

53 files changed

+525
-811
lines changed

Some content is hidden

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

53 files changed

+525
-811
lines changed

‎build_debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setup
447447
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
448448

449449
# docker Python API package is needed by Ansible docker module as well as some SONiC applications
450-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
450+
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==5.0.3'
451451

452452
# Install scapy
453453
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ host_as_route_disable=1
55
use_all_splithorizon_groups=1
66
riot_enable=1
77
sai_tunnel_support=1
8+
sai_tunnel_underlay_route_mode=1
89
riot_overlay_l3_intf_mem_size=4096
910
riot_overlay_l3_egress_mem_size=32768
1011
l3_ecmp_levels=2

‎device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ host_as_route_disable=1
55
use_all_splithorizon_groups=1
66
riot_enable=1
77
sai_tunnel_support=1
8+
sai_tunnel_underlay_route_mode=1
89
riot_overlay_l3_intf_mem_size=4096
910
riot_overlay_l3_egress_mem_size=32768
1011
l3_ecmp_levels=2

‎device/arista/x86_64-arista_7050cx3_32s/td3-a7050cx3-32s-flex.config.bcm

+1
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ robust_hash_disable_mpls=1
397397
robust_hash_disable_vlan=1
398398
sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
399399
sai_tunnel_support=1
400+
sai_tunnel_underlay_route_mode=1
400401
serdes_core_rx_polarity_flip_physical{1}=0x8
401402
serdes_core_rx_polarity_flip_physical{5}=0x2
402403
serdes_core_rx_polarity_flip_physical{9}=0xc

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/buffers_defaults_t0.j2

+9-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@
6161

6262
{%- macro generate_queue_buffers(port_names) %}
6363
"BUFFER_QUEUE": {
64-
"{{ port_names }}|3-4": {
65-
"profile" : "egress_lossless_profile"
66-
},
67-
"{{ port_names }}|0-1": {
64+
{% for port in port_names.split(',') %}
65+
"{{ port }}|0-2": {
6866
"profile" : "q_lossy_profile"
69-
}
67+
},
68+
{% endfor %}
69+
{% for port in port_names.split(',') %}
70+
"{{ port }}|3-4": {
71+
"profile" : "egress_lossless_profile"
72+
}{% if not loop.last %},{% endif %}
73+
{% endfor %}
7074
}
7175
{%- endmacro %}

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/buffers_defaults_t1.j2

+9-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,15 @@
6161

6262
{%- macro generate_queue_buffers(port_names) %}
6363
"BUFFER_QUEUE": {
64-
"{{ port_names }}|3-4": {
65-
"profile" : "egress_lossless_profile"
66-
},
67-
"{{ port_names }}|0-1": {
64+
{% for port in port_names.split(',') %}
65+
"{{ port }}|0-2": {
6866
"profile" : "q_lossy_profile"
69-
}
67+
},
68+
{% endfor %}
69+
{% for port in port_names.split(',') %}
70+
"{{ port }}|3-4": {
71+
"profile" : "egress_lossless_profile"
72+
}{% if not loop.last %},{% endif %}
73+
{% endfor %}
7074
}
7175
{%- endmacro %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1313
{%- if 'dualtor' in switch_subtype.lower() %}
1414
{%- set IPinIP_sock = 'sai_tunnel_support=1
15+
sai_tunnel_underlay_route_mode=1
1516
host_as_route_disable=1
1617
l3_ecmp_levels=2' -%}
1718
{%- endif %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
55
{%- if 'dualtor' in switch_subtype.lower() %}
66
{%- set IPinIP_sock = 'sai_tunnel_support=1
7+
sai_tunnel_underlay_route_mode=1
78
host_as_route_disable=1
89
l3_ecmp_levels=2' -%}
910
{%- endif %}

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
1313
{%- if 'dualtor' in switch_subtype.lower() %}
1414
{%- set IPinIP_sock = 'sai_tunnel_support=1
15+
sai_tunnel_underlay_route_mode=1
1516
host_as_route_disable=1
1617
l3_ecmp_levels=2' -%}
1718
{%- endif %}

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

+49
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,55 @@ ucode_port_46=CGE2_25:core_1.46
362362
ucode_port_47=CGE2_26:core_1.47
363363
ucode_port_48=CGE2_24:core_1.48
364364

365+
serdes_tx_taps_1=pam4:-18:86:0:4:0:0
366+
serdes_tx_taps_2=pam4:-18:86:0:4:0:0
367+
serdes_tx_taps_3=pam4:-18:86:0:4:0:0
368+
serdes_tx_taps_4=pam4:-18:86:0:4:0:0
369+
serdes_tx_taps_5=pam4:-18:86:0:4:0:0
370+
serdes_tx_taps_6=pam4:-18:86:0:4:0:0
371+
serdes_tx_taps_7=pam4:-18:86:0:4:0:0
372+
serdes_tx_taps_8=pam4:-18:86:0:4:0:0
373+
serdes_tx_taps_9=pam4:-18:86:0:4:0:0
374+
serdes_tx_taps_10=pam4:-18:86:0:4:0:0
375+
serdes_tx_taps_11=pam4:-18:86:0:4:0:0
376+
serdes_tx_taps_12=pam4:-18:86:0:4:0:0
377+
serdes_tx_taps_13=pam4:-18:86:0:4:0:0
378+
serdes_tx_taps_14=pam4:-18:86:0:4:0:0
379+
serdes_tx_taps_15=pam4:-18:86:0:4:0:0
380+
serdes_tx_taps_16=pam4:-18:86:0:4:0:0
381+
serdes_tx_taps_17=pam4:-18:86:0:4:0:0
382+
serdes_tx_taps_18=pam4:-18:86:0:4:0:0
383+
serdes_tx_taps_19=pam4:-18:86:0:4:0:0
384+
serdes_tx_taps_20=pam4:-18:86:0:4:0:0
385+
serdes_tx_taps_21=pam4:-18:86:0:4:0:0
386+
serdes_tx_taps_22=pam4:-18:86:0:4:0:0
387+
serdes_tx_taps_23=pam4:-18:86:0:4:0:0
388+
serdes_tx_taps_24=pam4:-18:86:0:4:0:0
389+
serdes_tx_taps_25=pam4:-18:86:0:4:0:0
390+
serdes_tx_taps_26=pam4:-18:86:0:4:0:0
391+
serdes_tx_taps_27=pam4:-18:86:0:4:0:0
392+
serdes_tx_taps_28=pam4:-18:86:0:4:0:0
393+
serdes_tx_taps_29=pam4:-18:86:0:4:0:0
394+
serdes_tx_taps_30=pam4:-18:86:0:4:0:0
395+
serdes_tx_taps_31=pam4:-18:86:0:4:0:0
396+
serdes_tx_taps_32=pam4:-18:86:0:4:0:0
397+
serdes_tx_taps_33=pam4:-18:86:0:4:0:0
398+
serdes_tx_taps_34=pam4:-18:86:0:4:0:0
399+
serdes_tx_taps_35=pam4:-18:86:0:4:0:0
400+
serdes_tx_taps_36=pam4:-18:86:0:4:0:0
401+
serdes_tx_taps_37=pam4:-18:86:0:4:0:0
402+
serdes_tx_taps_38=pam4:-18:86:0:4:0:0
403+
serdes_tx_taps_39=pam4:-18:86:0:4:0:0
404+
serdes_tx_taps_40=pam4:-18:86:0:4:0:0
405+
serdes_tx_taps_41=pam4:-18:86:0:4:0:0
406+
serdes_tx_taps_42=pam4:-18:86:0:4:0:0
407+
serdes_tx_taps_43=pam4:-18:86:0:4:0:0
408+
serdes_tx_taps_44=pam4:-18:86:0:4:0:0
409+
serdes_tx_taps_45=pam4:-18:86:0:4:0:0
410+
serdes_tx_taps_46=pam4:-18:86:0:4:0:0
411+
serdes_tx_taps_47=pam4:-18:86:0:4:0:0
412+
serdes_tx_taps_48=pam4:-18:86:0:4:0:0
413+
365414
ucode_port_0.BCM8869X=CPU.0:core_0.0
366415
ucode_port_200.BCM8869X=CPU.8:core_1.200
367416
ucode_port_201.BCM8869X=CPU.16:core_0.201

‎device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/gearbox_100G_PAM4.xml

+29-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
<phy_addr>0</phy_addr>
55
<mode>gearbox</mode>
66
<topology>2</topology>
7-
<tx-taps>
8-
<PAM4>2,-8,17,0,0</PAM4>
9-
<NRZ>0,-8,17,0,0</NRZ>
10-
</tx-taps>
11-
<tx-taps-scale>0,0,1,0,0</tx-taps-scale>
127

138
<lane id="0" system-side="true" />
149
<lane id="1" system-side="true" />
@@ -34,4 +29,33 @@
3429
<lane id="21" system-side="false" />
3530
<lane id="22" system-side="false" />
3631
<lane id="23" system-side="false" />
32+
33+
<PAM4>
34+
<lane id="0" tx-taps="1,-5,15,0,0"/>
35+
<lane id="1" tx-taps="1,-5,15,0,0"/>
36+
<lane id="2" tx-taps="1,-5,15,0,0"/>
37+
<lane id="3" tx-taps="1,-5,15,0,0"/>
38+
<lane id="4" tx-taps="1,-5,15,0,0"/>
39+
<lane id="5" tx-taps="1,-5,15,0,0"/>
40+
<lane id="6" tx-taps="1,-5,15,0,0"/>
41+
<lane id="7" tx-taps="1,-5,15,0,0"/>
42+
</PAM4>
43+
<NRZ>
44+
<lane id="8" tx-taps="0,-1,15,-6,0"/>
45+
<lane id="9" tx-taps="0,-1,15,-6,0"/>
46+
<lane id="10" tx-taps="0,-1,15,-6,0"/>
47+
<lane id="11" tx-taps="0,-1,15,-6,0"/>
48+
<lane id="12" tx-taps="0,-1,15,-6,0"/>
49+
<lane id="13" tx-taps="0,-1,15,-6,0"/>
50+
<lane id="14" tx-taps="0,-1,15,-6,0"/>
51+
<lane id="15" tx-taps="0,-1,15,-6,0"/>
52+
<lane id="16" tx-taps="0,-1,15,-6,0"/>
53+
<lane id="17" tx-taps="0,-1,15,-6,0"/>
54+
<lane id="18" tx-taps="0,-1,15,-6,0"/>
55+
<lane id="19" tx-taps="0,-1,15,-6,0"/>
56+
<lane id="20" tx-taps="0,-1,15,-6,0"/>
57+
<lane id="21" tx-taps="0,-1,15,-6,0"/>
58+
<lane id="22" tx-taps="0,-1,15,-6,0"/>
59+
<lane id="23" tx-taps="0,-1,15,-6,0"/>
60+
</NRZ>
3761
</root>

‎device/barefoot/x86_64-accton_as9516_32d-r0/newport/buffers_defaults_t0.j2

+10-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"ingress_lossless_pool": {
1717
"size": "{{ ingress_lossless_pool_size }}",
1818
"type": "ingress",
19-
"mode": "dynamic",
20-
"xoff": "36222208"
19+
"mode": "dynamic"
2120
},
2221
"ingress_lossy_pool": {
2322
"size": "{{ ingress_lossy_pool_size }}",
@@ -61,11 +60,15 @@
6160

6261
{%- macro generate_queue_buffers(port_names) %}
6362
"BUFFER_QUEUE": {
64-
"{{ port_names }}|3-4": {
65-
"profile" : "egress_lossless_profile"
66-
},
67-
"{{ port_names }}|0-1": {
63+
{% for port in port_names.split(',') %}
64+
"{{ port }}|0-2": {
6865
"profile" : "q_lossy_profile"
69-
}
66+
},
67+
{% endfor %}
68+
{% for port in port_names.split(',') %}
69+
"{{ port }}|3-4": {
70+
"profile" : "egress_lossless_profile"
71+
}{% if not loop.last %},{% endif %}
72+
{% endfor %}
7073
}
7174
{%- endmacro %}

‎device/barefoot/x86_64-accton_as9516_32d-r0/newport/buffers_defaults_t1.j2

+10-7
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"ingress_lossless_pool": {
1717
"size": "{{ ingress_lossless_pool_size }}",
1818
"type": "ingress",
19-
"mode": "dynamic",
20-
"xoff": "36222208"
19+
"mode": "dynamic"
2120
},
2221
"ingress_lossy_pool": {
2322
"size": "{{ ingress_lossy_pool_size }}",
@@ -61,11 +60,15 @@
6160

6261
{%- macro generate_queue_buffers(port_names) %}
6362
"BUFFER_QUEUE": {
64-
"{{ port_names }}|3-4": {
65-
"profile" : "egress_lossless_profile"
66-
},
67-
"{{ port_names }}|0-1": {
63+
{% for port in port_names.split(',') %}
64+
"{{ port }}|0-2": {
6865
"profile" : "q_lossy_profile"
69-
}
66+
},
67+
{% endfor %}
68+
{% for port in port_names.split(',') %}
69+
"{{ port }}|3-4": {
70+
"profile" : "egress_lossless_profile"
71+
}{% if not loop.last %},{% endif %}
72+
{% endfor %}
7073
}
7174
{%- endmacro %}

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/buffers_defaults_t0.j2

+9-13
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,17 @@
6363
},
6464
{%- endmacro %}
6565

66-
{%- macro generate_pg_profils(port_names) %}
67-
"BUFFER_PG": {
68-
"{{ port_names }}|3-4": {
69-
"profile" : "ingress_lossless_profile"
70-
}
71-
},
72-
{%- endmacro %}
73-
7466
{%- macro generate_queue_buffers(port_names) %}
7567
"BUFFER_QUEUE": {
76-
"{{ port_names }}|3-4": {
77-
"profile" : "egress_lossless_profile"
78-
},
79-
"{{ port_names }}|0-1": {
68+
{% for port in port_names.split(',') %}
69+
"{{ port }}|0-2": {
8070
"profile" : "q_lossy_profile"
81-
}
71+
},
72+
{% endfor %}
73+
{% for port in port_names.split(',') %}
74+
"{{ port }}|3-4": {
75+
"profile" : "egress_lossless_profile"
76+
}{% if not loop.last %},{% endif %}
77+
{% endfor %}
8278
}
8379
{%- endmacro %}

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/buffers_defaults_t1.j2

+9-13
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,17 @@
6363
},
6464
{%- endmacro %}
6565

66-
{%- macro generate_pg_profils(port_names) %}
67-
"BUFFER_PG": {
68-
"{{ port_names }}|3-4": {
69-
"profile" : "ingress_lossless_profile"
70-
}
71-
},
72-
{%- endmacro %}
73-
7466
{%- macro generate_queue_buffers(port_names) %}
7567
"BUFFER_QUEUE": {
76-
"{{ port_names }}|3-4": {
77-
"profile" : "egress_lossless_profile"
78-
},
79-
"{{ port_names }}|0-1": {
68+
{% for port in port_names.split(',') %}
69+
"{{ port }}|0-2": {
8070
"profile" : "q_lossy_profile"
81-
}
71+
},
72+
{% endfor %}
73+
{% for port in port_names.split(',') %}
74+
"{{ port }}|3-4": {
75+
"profile" : "egress_lossless_profile"
76+
}{% if not loop.last %},{% endif %}
77+
{% endfor %}
8278
}
8379
{%- endmacro %}

‎device/mellanox/x86_64-mlnx_msn3700-r0/sensors.conf

+6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
8585
label power2 "PSU-2 12V Rail Pwr (out)"
8686
label curr1 "PSU-2 220V Rail Curr (in)"
8787
label curr2 "PSU-2 12V Rail Curr (out)"
88+
set in3_lcrit in3_crit * 0.662
89+
set in3_min in3_crit * 0.745
90+
set in3_max in3_crit * 0.952
8891
chip "dps460-i2c-*-59"
8992
label in1 "PSU-1 220V Rail (in)"
9093
ignore in2
@@ -99,6 +102,9 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
99102
label power2 "PSU-1 12V Rail Pwr (out)"
100103
label curr1 "PSU-1 220V Rail Curr (in)"
101104
label curr2 "PSU-1 12V Rail Curr (out)"
105+
set in3_lcrit in3_crit * 0.662
106+
set in3_min in3_crit * 0.745
107+
set in3_max in3_crit * 0.952
102108

103109
# Chassis fans
104110
chip "mlxreg_fan-isa-*"

‎device/mellanox/x86_64-mlnx_msn3700c-r0/sensors.conf

+6
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
8585
label power2 "PSU-2 12V Rail Pwr (out)"
8686
label curr1 "PSU-2 220V Rail Curr (in)"
8787
label curr2 "PSU-2 12V Rail Curr (out)"
88+
set in3_lcrit in3_crit * 0.662
89+
set in3_min in3_crit * 0.745
90+
set in3_max in3_crit * 0.952
8891
chip "dps460-i2c-*-59"
8992
label in1 "PSU-1 220V Rail (in)"
9093
ignore in2
@@ -99,6 +102,9 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
99102
label power2 "PSU-1 12V Rail Pwr (out)"
100103
label curr1 "PSU-1 220V Rail Curr (in)"
101104
label curr2 "PSU-1 12V Rail Curr (out)"
105+
set in3_lcrit in3_crit * 0.662
106+
set in3_min in3_crit * 0.745
107+
set in3_max in3_crit * 0.952
102108

103109
# Chassis fans
104110
chip "mlxreg_fan-isa-*"

‎device/mellanox/x86_64-mlnx_msn3800-r0/sensors.conf

+6
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
106106
label power2 "PSU-2 12V Rail Pwr (out)"
107107
label curr1 "PSU-2 220V Rail Curr (in)"
108108
label curr2 "PSU-2 12V Rail Curr (out)"
109+
set in3_lcrit in3_crit * 0.662
110+
set in3_min in3_crit * 0.745
111+
set in3_max in3_crit * 0.952
109112
chip "dps460-i2c-*-59"
110113
label in1 "PSU-1 220V Rail (in)"
111114
ignore in2
@@ -120,6 +123,9 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
120123
label power2 "PSU-1 12V Rail Pwr (out)"
121124
label curr1 "PSU-1 220V Rail Curr (in)"
122125
label curr2 "PSU-1 12V Rail Curr (out)"
126+
set in3_lcrit in3_crit * 0.662
127+
set in3_min in3_crit * 0.745
128+
set in3_max in3_crit * 0.952
123129

124130
# Chassis fans
125131
chip "mlxreg_fan-isa-*"

0 commit comments

Comments
 (0)