Skip to content

Commit 7b9800b

Browse files
qiluo-msftqiluo-msft
committed
Merge branch 'master' into qiluo/tagged
2 parents 211776c + 12ebe3f commit 7b9800b

File tree

43 files changed

+551
-808
lines changed

Some content is hidden

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

43 files changed

+551
-808
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/accton/x86_64-accton_as9716_32d-r0/pddf/pddf-device.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
],
5454
"custom_kos":
5555
[
56-
"pddf_custom_psu"
56+
"pddf_custom_psu",
57+
"accton_as9716_32d_ioport"
5758
]
5859
},
5960

‎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_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>

‎dockers/docker-dhcp-relay/Dockerfile.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN apt-get clean -y && \
3030

3131
COPY ["docker_init.sh", "start.sh", "/usr/bin/"]
3232
COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
33-
COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcpv6-relay.monitors.j2", "/usr/share/sonic/templates/"]
33+
COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcp-relay.monitors.j2", "/usr/share/sonic/templates/"]
3434
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
3535
COPY ["critical_processes", "/etc/supervisor"]
3636
COPY ["cli", "/cli/"]

‎dockers/docker-dhcp-relay/dhcpv6-relay.monitors.j2 renamed to ‎dockers/docker-dhcp-relay/dhcp-relay.monitors.j2

-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ command=/usr/sbin/dhcpmon -id {{ vlan_name }}
5959
{% if prefix | ipv4 %} -im {{ name }}{% endif -%}
6060
{% endfor %}
6161
{% endif %}
62-
{% if relay_for_ipv4.flag %} -4{% endif %}
63-
{% if relay_for_ipv6.flag %} -6{% endif %}
6462

6563
priority=4
6664
autostart=false

‎dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ dependent_startup_wait_for=rsyslogd:running
6565
{% include 'dhcpv6-relay.agents.j2' %}
6666
{% endfor %}
6767

68-
{% include 'dhcpv6-relay.monitors.j2' %}
68+
{% include 'dhcp-relay.monitors.j2' %}
6969
{% endif %}
7070
{% endif %}

‎dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ dependent_startup_wait_for=rsyslogd:running
171171

172172
{% if not skip_pcied %}
173173
[program:pcied]
174-
command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
174+
command=/usr/local/bin/pcied
175175
priority=11
176176
autostart=false
177177
autorestart=unexpected

‎dockers/docker-ptf/Dockerfile.j2

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ RUN rm -rf /debs \
119119
&& pip install pyrasite \
120120
&& mkdir -p /opt \
121121
&& cd /opt \
122-
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py
122+
&& wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
123+
&& pip install --upgrade --ignore-installed scapy==2.4.5
123124

124125
## Adjust sshd settings
125126
RUN mkdir /var/run/sshd \

‎files/Aboot/boot0.j2

-3
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,6 @@ extract_image() {
355355
local rootdev="$(echo $mountstr | cut -f1 -d' ')"
356356
rootfs_type="$(echo $mountstr | cut -d' ' -f3)"
357357

358-
## Don't reserve any blocks just for root
359-
tune2fs -m 0 -r 0 $rootdev
360-
361358
info "Extracting $dockerfs from swi"
362359
## Unpacking dockerfs delayed
363360
## 1. when disk is vfat as it does not support symbolic link

‎files/build_templates/docker_image_ctl.j2

+6
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,11 @@ start() {
233233
source $ASIC_CONF
234234
fi
235235

236+
PLATFORM_ENV_CONF=/usr/share/sonic/device/$PLATFORM/platform_env.conf
237+
if [ -f "$PLATFORM_ENV_CONF" ]; then
238+
source $PLATFORM_ENV_CONF
239+
fi
240+
236241
{%- if docker_container_name == "database" %}
237242
# Don't mount HWSKU in {{docker_container_name}} container.
238243
HWSKU=""
@@ -421,6 +426,7 @@ start() {
421426
{%- endif %}
422427
{%- if sonic_asic_platform == "broadcom" %}
423428
{%- if docker_container_name == "syncd" %}
429+
--shm-size=${SYNCD_SHM_SIZE:-64m} \
424430
-v /var/run/docker-syncd$DEV:/var/run/sswsyncd \
425431
{%- endif %}
426432
{%- endif %}

‎files/initramfs-tools/mke2fs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ copy_exec /usr/sbin/mke2fs /usr/local/sbin/
2121
copy_exec /sbin/sfdisk
2222
copy_exec /sbin/fdisk
2323
copy_exec /sbin/resize2fs
24+
copy_exec /sbin/tune2fs
2425
copy_exec /sbin/findfs
2526

2627
fstypes="ext4 ext3"

‎files/initramfs-tools/union-mount.j2

+1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ case "${ROOT}" in
133133
*)
134134
## Mount the raw partition again
135135
mount -t ext4 ${ROOT} ${rootmnt}/host
136+
tune2fs -m 0 -r 0 ${ROOT}
136137
;;
137138
esac
138139

‎installer/arm64/install.sh

-5
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ elif [ "$install_env" = "sonic" ]; then
139139
rm -rf $f
140140
fi
141141
done
142-
143-
demo_dev=$(findmnt -n -o SOURCE --target /host)
144-
145-
# Don't reserve any blocks just for root
146-
tune2fs -m 0 -r 0 $demo_dev
147142
fi
148143

149144
# Create target directory or clean it up if exists

‎installer/armhf/install.sh

-5
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,6 @@ elif [ "$install_env" = "sonic" ]; then
139139
rm -rf $f
140140
fi
141141
done
142-
143-
demo_dev=$(findmnt -n -o SOURCE --target /host)
144-
145-
# Don't reserve any blocks just for root
146-
tune2fs -m 0 -r 0 $demo_dev
147142
fi
148143

149144
# Create target directory or clean it up if exists

‎installer/x86_64/install.sh

-11
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,6 @@ if [ "$install_env" = "onie" ]; then
477477
# Make filesystem
478478
mkfs.ext4 -L $demo_volume_label $demo_dev
479479
480-
# Don't reserve any blocks just for root
481-
tune2fs -m 0 -r 0 $demo_dev
482-
483480
# Mount demo filesystem
484481
demo_mnt=$(${onie_bin} mktemp -d) || {
485482
echo "Error: Unable to create file system mount point"
@@ -512,20 +509,12 @@ elif [ "$install_env" = "sonic" ]; then
512509
rm -rf $f
513510
fi
514511
done
515-
516-
demo_dev=$(findmnt -n -o SOURCE --target /host)
517-
518-
# Don't reserve any blocks just for root
519-
tune2fs -m 0 -r 0 $demo_dev
520512
else
521513
demo_mnt="build_raw_image_mnt"
522514
demo_dev=$cur_wd/"%%OUTPUT_RAW_IMAGE%%"
523515
524516
mkfs.ext4 -L $demo_volume_label $demo_dev
525517
526-
# Don't reserve any blocks just for root
527-
tune2fs -m 0 -r 0 $demo_dev
528-
529518
echo "Mounting $demo_dev on $demo_mnt..."
530519
mkdir $demo_mnt
531520
mount -t auto -o loop $demo_dev $demo_mnt

‎platform/barefoot/bfn-platform.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BFN_PLATFORM = bfnplatform_20220127_sai_1.9.1_deb10.deb
1+
BFN_PLATFORM = bfnplatform_20220408_sai_1.9.1_deb10.deb
22
$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
33

44
SONIC_ONLINE_DEBS += $(BFN_PLATFORM)

‎platform/barefoot/bfn-sai.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BFN_SAI = bfnsdk_20220127_sai_1.9.1_deb10.deb
1+
BFN_SAI = bfnsdk_20220408_sai_1.9.1_deb10.deb
22
$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
33

44
$(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)

0 commit comments

Comments
 (0)