Merge branch 'master' into qiluo/tagged

qiluo-msft · Apr 13, 2022 · 7b9800b · 7b9800b
2 parents 211776c + 12ebe3f
commit 7b9800b
Show file tree

Hide file tree

Showing 43 changed files with 551 additions and 808 deletions.
diff --git a/build_debian.sh b/build_debian.sh
@@ -447,7 +447,7 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'setup
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'wheel==0.35.1'
 
 # docker Python API package is needed by Ansible docker module as well as some SONiC applications
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==4.3.1'
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docker==5.0.3'
 
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'

diff --git a/device/accton/x86_64-accton_as9716_32d-r0/pddf/pddf-device.json b/device/accton/x86_64-accton_as9716_32d-r0/pddf/pddf-device.json
@@ -53,7 +53,8 @@
         ],
         "custom_kos":
         [
-            "pddf_custom_psu"
+            "pddf_custom_psu",
+            "accton_as9716_32d_ioport"
         ]
     },
 

diff --git a/...ista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/...ista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -5,6 +5,7 @@ host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=2

diff --git a/..._64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/..._64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -5,6 +5,7 @@ host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 riot_overlay_l3_intf_mem_size=4096
 riot_overlay_l3_egress_mem_size=32768
 l3_ecmp_levels=2

diff --git a/device/arista/x86_64-arista_7050cx3_32s/td3-a7050cx3-32s-flex.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/td3-a7050cx3-32s-flex.config.bcm
@@ -397,6 +397,7 @@ robust_hash_disable_mpls=1
 robust_hash_disable_vlan=1
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
 sai_tunnel_support=1
+sai_tunnel_underlay_route_mode=1
 serdes_core_rx_polarity_flip_physical{1}=0x8
 serdes_core_rx_polarity_flip_physical{5}=0x2
 serdes_core_rx_polarity_flip_physical{9}=0xc

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -12,6 +12,7 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -4,6 +4,7 @@
 {%-     set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
+                               sai_tunnel_underlay_route_mode=1
                                host_as_route_disable=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}

diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -12,6 +12,7 @@
 {%-         set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
+                                   sai_tunnel_underlay_route_mode=1
                                    host_as_route_disable=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}

diff --git a/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -362,6 +362,55 @@ ucode_port_46=CGE2_25:core_1.46
 ucode_port_47=CGE2_26:core_1.47
 ucode_port_48=CGE2_24:core_1.48
 
+serdes_tx_taps_1=pam4:-18:86:0:4:0:0
+serdes_tx_taps_2=pam4:-18:86:0:4:0:0
+serdes_tx_taps_3=pam4:-18:86:0:4:0:0
+serdes_tx_taps_4=pam4:-18:86:0:4:0:0
+serdes_tx_taps_5=pam4:-18:86:0:4:0:0
+serdes_tx_taps_6=pam4:-18:86:0:4:0:0
+serdes_tx_taps_7=pam4:-18:86:0:4:0:0
+serdes_tx_taps_8=pam4:-18:86:0:4:0:0
+serdes_tx_taps_9=pam4:-18:86:0:4:0:0
+serdes_tx_taps_10=pam4:-18:86:0:4:0:0
+serdes_tx_taps_11=pam4:-18:86:0:4:0:0
+serdes_tx_taps_12=pam4:-18:86:0:4:0:0
+serdes_tx_taps_13=pam4:-18:86:0:4:0:0
+serdes_tx_taps_14=pam4:-18:86:0:4:0:0
+serdes_tx_taps_15=pam4:-18:86:0:4:0:0
+serdes_tx_taps_16=pam4:-18:86:0:4:0:0
+serdes_tx_taps_17=pam4:-18:86:0:4:0:0
+serdes_tx_taps_18=pam4:-18:86:0:4:0:0
+serdes_tx_taps_19=pam4:-18:86:0:4:0:0
+serdes_tx_taps_20=pam4:-18:86:0:4:0:0
+serdes_tx_taps_21=pam4:-18:86:0:4:0:0
+serdes_tx_taps_22=pam4:-18:86:0:4:0:0
+serdes_tx_taps_23=pam4:-18:86:0:4:0:0
+serdes_tx_taps_24=pam4:-18:86:0:4:0:0
+serdes_tx_taps_25=pam4:-18:86:0:4:0:0
+serdes_tx_taps_26=pam4:-18:86:0:4:0:0
+serdes_tx_taps_27=pam4:-18:86:0:4:0:0
+serdes_tx_taps_28=pam4:-18:86:0:4:0:0
+serdes_tx_taps_29=pam4:-18:86:0:4:0:0
+serdes_tx_taps_30=pam4:-18:86:0:4:0:0
+serdes_tx_taps_31=pam4:-18:86:0:4:0:0
+serdes_tx_taps_32=pam4:-18:86:0:4:0:0
+serdes_tx_taps_33=pam4:-18:86:0:4:0:0
+serdes_tx_taps_34=pam4:-18:86:0:4:0:0
+serdes_tx_taps_35=pam4:-18:86:0:4:0:0
+serdes_tx_taps_36=pam4:-18:86:0:4:0:0
+serdes_tx_taps_37=pam4:-18:86:0:4:0:0
+serdes_tx_taps_38=pam4:-18:86:0:4:0:0
+serdes_tx_taps_39=pam4:-18:86:0:4:0:0
+serdes_tx_taps_40=pam4:-18:86:0:4:0:0
+serdes_tx_taps_41=pam4:-18:86:0:4:0:0
+serdes_tx_taps_42=pam4:-18:86:0:4:0:0
+serdes_tx_taps_43=pam4:-18:86:0:4:0:0
+serdes_tx_taps_44=pam4:-18:86:0:4:0:0
+serdes_tx_taps_45=pam4:-18:86:0:4:0:0
+serdes_tx_taps_46=pam4:-18:86:0:4:0:0
+serdes_tx_taps_47=pam4:-18:86:0:4:0:0
+serdes_tx_taps_48=pam4:-18:86:0:4:0:0
+
 ucode_port_0.BCM8869X=CPU.0:core_0.0
 ucode_port_200.BCM8869X=CPU.8:core_1.200
 ucode_port_201.BCM8869X=CPU.16:core_0.201

diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/gearbox_100G_PAM4.xml b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/gearbox_100G_PAM4.xml
@@ -4,11 +4,6 @@
     <phy_addr>0</phy_addr>
     <mode>gearbox</mode>
     <topology>2</topology>
-    <tx-taps>
-        <PAM4>2,-8,17,0,0</PAM4>
-        <NRZ>0,-8,17,0,0</NRZ>
-    </tx-taps>
-    <tx-taps-scale>0,0,1,0,0</tx-taps-scale>
 
     <lane id="0" system-side="true" />
     <lane id="1" system-side="true" />
@@ -34,4 +29,33 @@
     <lane id="21" system-side="false"  />
     <lane id="22" system-side="false"  />
     <lane id="23" system-side="false"  />
+
+    <PAM4>
+        <lane id="0" tx-taps="1,-5,15,0,0"/>
+        <lane id="1" tx-taps="1,-5,15,0,0"/>
+        <lane id="2" tx-taps="1,-5,15,0,0"/>
+        <lane id="3" tx-taps="1,-5,15,0,0"/>
+        <lane id="4" tx-taps="1,-5,15,0,0"/>
+        <lane id="5" tx-taps="1,-5,15,0,0"/>
+        <lane id="6" tx-taps="1,-5,15,0,0"/>
+        <lane id="7" tx-taps="1,-5,15,0,0"/>
+    </PAM4>
+    <NRZ>
+        <lane id="8" tx-taps="0,-1,15,-6,0"/>
+        <lane id="9" tx-taps="0,-1,15,-6,0"/>
+        <lane id="10" tx-taps="0,-1,15,-6,0"/>
+        <lane id="11" tx-taps="0,-1,15,-6,0"/>
+        <lane id="12" tx-taps="0,-1,15,-6,0"/>
+        <lane id="13" tx-taps="0,-1,15,-6,0"/>
+        <lane id="14" tx-taps="0,-1,15,-6,0"/>
+        <lane id="15" tx-taps="0,-1,15,-6,0"/>
+        <lane id="16" tx-taps="0,-1,15,-6,0"/>
+        <lane id="17" tx-taps="0,-1,15,-6,0"/>
+        <lane id="18" tx-taps="0,-1,15,-6,0"/>
+        <lane id="19" tx-taps="0,-1,15,-6,0"/>
+        <lane id="20" tx-taps="0,-1,15,-6,0"/>
+        <lane id="21" tx-taps="0,-1,15,-6,0"/>
+        <lane id="22" tx-taps="0,-1,15,-6,0"/>
+        <lane id="23" tx-taps="0,-1,15,-6,0"/>
+    </NRZ>
 </root>
diff --git a/dockers/docker-dhcp-relay/Dockerfile.j2 b/dockers/docker-dhcp-relay/Dockerfile.j2
@@ -30,7 +30,7 @@ RUN apt-get clean -y         && \
 
 COPY ["docker_init.sh", "start.sh", "/usr/bin/"]
 COPY ["docker-dhcp-relay.supervisord.conf.j2", "port-name-alias-map.txt.j2", "wait_for_intf.sh.j2", "/usr/share/sonic/templates/"]
-COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcpv6-relay.monitors.j2", "/usr/share/sonic/templates/"]
+COPY ["dhcp-relay.programs.j2", "dhcpv4-relay.agents.j2", "dhcpv6-relay.agents.j2", "dhcp-relay.monitors.j2", "/usr/share/sonic/templates/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 COPY ["cli", "/cli/"]

diff --git a/...ocker-dhcp-relay/dhcpv6-relay.monitors.j2 → .../docker-dhcp-relay/dhcp-relay.monitors.j2 b/...ocker-dhcp-relay/dhcpv6-relay.monitors.j2 → .../docker-dhcp-relay/dhcp-relay.monitors.j2
@@ -59,8 +59,6 @@ command=/usr/sbin/dhcpmon -id {{ vlan_name }}
 {% if prefix | ipv4 %} -im {{ name }}{% endif -%}
 {% endfor %}
 {% endif %}
-{% if relay_for_ipv4.flag %} -4{% endif %}
-{% if relay_for_ipv6.flag %} -6{% endif %}
 
 priority=4
 autostart=false

diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -65,6 +65,6 @@ dependent_startup_wait_for=rsyslogd:running
 {% include 'dhcpv6-relay.agents.j2' %}
 {% endfor %}
 
-{% include 'dhcpv6-relay.monitors.j2' %}
+{% include 'dhcp-relay.monitors.j2' %}
 {% endif %}
 {% endif %}
diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -171,7 +171,7 @@ dependent_startup_wait_for=rsyslogd:running
 
 {% if not skip_pcied %}
 [program:pcied]
-command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
+command=/usr/local/bin/pcied
 priority=11
 autostart=false
 autorestart=unexpected

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
@@ -119,7 +119,8 @@ RUN rm -rf /debs \
     && pip install pyrasite \
     && mkdir -p /opt       \
     && cd /opt             \
-    && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py
+    && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py \
+    && pip install --upgrade --ignore-installed scapy==2.4.5
 
 ## Adjust sshd settings
 RUN mkdir /var/run/sshd \

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
@@ -355,9 +355,6 @@ extract_image() {
     local rootdev="$(echo $mountstr | cut -f1 -d' ')"
     rootfs_type="$(echo $mountstr | cut -d' ' -f3)"
 
-    ## Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $rootdev
-
     info "Extracting $dockerfs from swi"
     ## Unpacking dockerfs delayed
     ## 1. when disk is vfat as it does not support symbolic link

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -233,6 +233,11 @@ start() {
         source $ASIC_CONF
     fi
 
+    PLATFORM_ENV_CONF=/usr/share/sonic/device/$PLATFORM/platform_env.conf
+    if [ -f "$PLATFORM_ENV_CONF" ]; then
+        source $PLATFORM_ENV_CONF
+    fi
+
     {%- if docker_container_name == "database" %}
     # Don't mount HWSKU in {{docker_container_name}} container.
     HWSKU=""
@@ -421,6 +426,7 @@ start() {
 {%- endif %}
 {%- if sonic_asic_platform == "broadcom" %}
 {%- if docker_container_name == "syncd" %}
+        --shm-size=${SYNCD_SHM_SIZE:-64m} \
         -v /var/run/docker-syncd$DEV:/var/run/sswsyncd \
 {%- endif %}
 {%- endif %}

diff --git a/files/initramfs-tools/mke2fs b/files/initramfs-tools/mke2fs
@@ -21,6 +21,7 @@ copy_exec /usr/sbin/mke2fs /usr/local/sbin/
 copy_exec /sbin/sfdisk
 copy_exec /sbin/fdisk
 copy_exec /sbin/resize2fs
+copy_exec /sbin/tune2fs
 copy_exec /sbin/findfs
 
 fstypes="ext4 ext3"

diff --git a/files/initramfs-tools/union-mount.j2 b/files/initramfs-tools/union-mount.j2
@@ -133,6 +133,7 @@ case "${ROOT}" in
     *)
         ## Mount the raw partition again
         mount -t ext4 ${ROOT} ${rootmnt}/host
+        tune2fs -m 0 -r 0 ${ROOT}
         ;;
 esac
 

diff --git a/installer/arm64/install.sh b/installer/arm64/install.sh
@@ -139,11 +139,6 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
-
-    demo_dev=$(findmnt -n -o SOURCE --target /host)
-
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
 fi
 
 # Create target directory or clean it up if exists

diff --git a/installer/armhf/install.sh b/installer/armhf/install.sh
@@ -139,11 +139,6 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
-
-    demo_dev=$(findmnt -n -o SOURCE --target /host)
-
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
 fi
 
 # Create target directory or clean it up if exists

diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
@@ -477,9 +477,6 @@ if [ "$install_env" = "onie" ]; then
     # Make filesystem
     mkfs.ext4 -L $demo_volume_label $demo_dev
 
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
-
     # Mount demo filesystem
     demo_mnt=$(${onie_bin} mktemp -d) || {
         echo "Error: Unable to create file system mount point"
@@ -512,20 +509,12 @@ elif [ "$install_env" = "sonic" ]; then
             rm -rf $f
         fi
     done
-
-    demo_dev=$(findmnt -n -o SOURCE --target /host)
-
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
 else
     demo_mnt="build_raw_image_mnt"
     demo_dev=$cur_wd/"%%OUTPUT_RAW_IMAGE%%"
 
     mkfs.ext4 -L $demo_volume_label $demo_dev
 
-    # Don't reserve any blocks just for root
-    tune2fs -m 0 -r 0 $demo_dev
-
     echo "Mounting $demo_dev on $demo_mnt..."
     mkdir $demo_mnt
     mount -t auto -o loop $demo_dev $demo_mnt

diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk
@@ -1,4 +1,4 @@
-BFN_PLATFORM = bfnplatform_20220127_sai_1.9.1_deb10.deb
+BFN_PLATFORM = bfnplatform_20220408_sai_1.9.1_deb10.deb
 $(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_PLATFORM)"
 
 SONIC_ONLINE_DEBS += $(BFN_PLATFORM)

diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk
@@ -1,4 +1,4 @@
-BFN_SAI = bfnsdk_20220127_sai_1.9.1_deb10.deb
+BFN_SAI = bfnsdk_20220408_sai_1.9.1_deb10.deb
 $(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/$(BFN_SAI)"
 
 $(BFN_SAI)_DEPENDS += $(LIBNL_GENL3_DEV)
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,6 +133,7 @@ case "${ROOT}" in @@
         *)
             ## Mount the raw partition again
             mount -t ext4 ${ROOT} ${rootmnt}/host
+            tune2fs -m 0 -r 0 ${ROOT}
             ;;
     esac
@@ Expand Down @@