Merge remote-tracking branch 'upstream/master' into replace_unsafe_fu…

…nc_user

Makefile.work

@@ -68,7 +68,11 @@ SHELL = /bin/bash
 USER := $(shell id -un)
 PWD := $(shell pwd)
 USER_LC := $(shell echo $(USER) | tr A-Z a-z)
+ifneq ($(DEFAULT_CONTAINER_REGISTRY),)
+DOCKER_MACHINE := $(shell docker run --rm $(DEFAULT_CONTAINER_REGISTRY)/debian:buster uname -m)
+else
 DOCKER_MACHINE := $(shell docker run --rm debian:buster uname -m)
+endif
 HOST_DOCKERD_GID := $(shell getent group docker | cut -d : -f3)
 
 comma := ,

azure-pipelines.yml

@@ -295,6 +295,23 @@ stages:
           MGMT_BRANCH: $(BUILD_BRANCH)
           TEST_SET: onboarding_t1
 
+  - job: onboarding_elastictest_dualtor
+    displayName: "onboarding dualtor testcases by Elastictest - optional"
+    timeoutInMinutes: 240
+    continueOnError: true
+    pool: sonic-ubuntu-1c
+    steps:
+      - template: .azure-pipelines/run-test-elastictest-template.yml@sonic-mgmt
+        parameters:
+          TOPOLOGY: dualtor
+          STOP_ON_FAILURE: "False"
+          RETRY_TIMES: 0
+          MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
+          MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM)
+          KVM_IMAGE_BRANCH: $(BUILD_BRANCH)
+          MGMT_BRANCH: $(BUILD_BRANCH)
+          TEST_SET: onboarding_dualtor
+
 #  - job: wan_elastictest
 #    displayName: "kvmtest-wan by Elastictest"
 #    pool: sonic-ubuntu-1c

build_image.sh

@@ -253,6 +253,17 @@ elif [ "$IMAGE_TYPE" = "dsc" ]; then
 
     generate_onie_installer_image
 
+elif [ "$IMAGE_TYPE" = "bfb" ]; then
+    echo "Build BFB installer"
+
+    if [[ $SECURE_UPGRADE_MODE != "no_sign" ]]; then
+         secure_upgrade_keys="--signing-key "$SECURE_UPGRADE_DEV_SIGNING_KEY" --signing-cert "$SECURE_UPGRADE_SIGNING_CERT""
+    fi
+
+    sudo -E ./platform/${CONFIGURED_PLATFORM}/installer/create_sonic_image --kernel $KVERSION "$secure_upgrade_keys"
+
+    sudo chown $USER $OUTPUT_BFB_IMAGE
+
 else
     echo "Error: Non supported image type $IMAGE_TYPE"
     exit 1

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/Nvidia-bf3-com-dpu/hwsku.json

@@ -0,0 +1,9 @@
+{
+    "interfaces": {
+        "Ethernet0": {
+            "default_brkout_mode": "1x400G",
+            "autoneg": "on",
+            "role": "Dpc"
+        }
+    }
+}

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/Nvidia-bf3-com-dpu/port_config.ini

@@ -0,0 +1,18 @@
+##
+## Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+# name          lanes               alias     index
+Ethernet0       0,1,2,3             etp1      1

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/Nvidia-bf3-com-dpu/sai.profile

@@ -0,0 +1,5 @@
+SAI_DUMP_STORE_PATH=/var/log/bluefield/sdk-dumps
+SAI_DUMP_STORE_AMOUNT=10
+DASH_ACL_DEFAULT_RULE_ACTION=permit
+PORT_LAYOUT=1x400G
+HAIRPIN=false

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/default_sku

@@ -0,0 +1 @@
+Nvidia-bf3-com-dpu appliance

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/installer.conf

@@ -0,0 +1,2 @@
+GRUB_CMDLINE_LINUX="console=ttyAMA1 console=hvc0 console=ttyAMA0 earlycon=pl011,0x13010000 quiet"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="isolcpus=1-13 nohz_full=1-13 rcu_nocbs=1-13"

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/pcie.yaml

@@ -0,0 +1,47 @@
+- bus: '00'
+  dev: '00'
+  fn: '0'
+  id: a2da
+  name: 'PCI bridge: Mellanox Technologies MT43244 BlueField-3 SoC Crypto enabled
+    (rev 01)'
+- bus: '01'
+  dev: '00'
+  fn: '0'
+  id: 197b
+  name: 'PCI bridge: Mellanox Technologies MT43244 Family [BlueField-3 SoC PCIe Bridge]
+    (rev 01)'
+- bus: '02'
+  dev: '00'
+  fn: '0'
+  id: 197b
+  name: 'PCI bridge: Mellanox Technologies MT43244 Family [BlueField-3 SoC PCIe Bridge]
+    (rev 01)'
+- bus: '02'
+  dev: '03'
+  fn: '0'
+  id: 197b
+  name: 'PCI bridge: Mellanox Technologies MT43244 Family [BlueField-3 SoC PCIe Bridge]
+    (rev 01)'
+- bus: '03'
+  dev: '00'
+  fn: '0'
+  id: a2dc
+  name: 'Ethernet controller: Mellanox Technologies MT43244 BlueField-3 integrated
+    ConnectX-7 network controller (rev 01)'
+- bus: '04'
+  dev: '00'
+  fn: '0'
+  id: 197b
+  name: 'PCI bridge: Mellanox Technologies MT43244 Family [BlueField-3 SoC PCIe Bridge]
+    (rev 01)'
+- bus: '05'
+  dev: '00'
+  fn: '0'
+  id: 197b
+  name: 'PCI bridge: Mellanox Technologies MT43244 Family [BlueField-3 SoC PCIe Bridge]
+    (rev 01)'
+- bus: '06'
+  dev: '00'
+  fn: '0'
+  id: '5765'
+  name: 'Non-Volatile memory controller: Device 1f9f:5765 (rev 01)'

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/platform.json

@@ -0,0 +1,21 @@
+{
+    "chassis": {
+        "name": "Nvidia-bf3-com-dpu",
+        "components": [],
+        "fans": [],
+        "fan_drawers": [],
+        "psus": [],
+        "thermals": [],
+        "sfps": []
+    },
+    "interfaces": {
+        "Ethernet0": {
+            "index": "1,1,1,1",
+            "lanes": "0,1,2,3",
+            "breakout_modes": {
+                "1x400G": ["etp1"]
+            }
+        }
+    },
+    "DPU": {}
+}

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/platform_asic

@@ -0,0 +1 @@
+nvidia-bluefield

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/plugins/ssd_util.py

@@ -0,0 +1,10 @@
+
+import os
+
+from sonic_platform_base.sonic_storage.emmc import EmmcUtil
+from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilDefault
+
+def SsdUtil(diskdev):
+   if os.path.basename(diskdev).startswith('mmcblk'):
+      return EmmcUtil(diskdev)
+   return SsdUtilDefault(diskdev)

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/pmon_daemon_control.json

@@ -0,0 +1,7 @@
+{
+    "skip_ledd": true,
+    "skip_psud": true,
+    "skip_fancontrol": true,
+    "skip_chassisd": true,
+    "skip_ycabled": true
+}

device/nvidia-bluefield/arm64-nvda_bf-bf3comdpu/system_health_monitoring_config.json

@@ -0,0 +1,6 @@
+{
+    "services_to_ignore": [],
+    "devices_to_ignore": ["psu", "fan"],
+    "user_defined_checkers": [],
+    "polling_interval": 60
+}

dockers/docker-fpm-frr/base_image_files/TS

@@ -4,10 +4,10 @@
 [ -f /etc/sonic/sonic-environment ] && . /etc/sonic/sonic-environment
 
 PLATFORM=${PLATFORM:-`sonic-cfggen -H -v DEVICE_METADATA.localhost.platform`}
-switch_type=`sonic-db-cli CONFIG_DB hget 'DEVICE_METADATA|localhost' 'switch_type'`
+type=`sonic-db-cli CONFIG_DB hget 'DEVICE_METADATA|localhost' 'type'`
 TSA_CHASSIS_STATE=false
 
-if [[ $switch_type == 'voq' ]]; then
+if [[ $type == *"SpineRouter"* ]]; then
  TSA_CHASSIS_STATE="$(sonic-db-cli CHASSIS_APP_DB HGET "BGP_DEVICE_GLOBAL|STATE" tsa_enabled)"
 fi
 

dockers/docker-fpm-frr/base_image_files/TSA

@@ -19,7 +19,7 @@ if [ -f /etc/sonic/chassisdb.conf ]; then
     echo "Chassis Mode: Normal -> Maintenance"
     logger -t TSA -p user.info "Chassis Mode: Normal -> Maintenance"
   fi
-  echo "Please execute \"rexec all -c 'sudo config save -y'\" to preserve System mode in Maintenance after reboot\
+  echo "Please execute 'sudo config save' to preserve System mode in Maintenance after reboot\
   or config reload on all linecards"
   exit 0
 fi

dockers/docker-fpm-frr/base_image_files/TSB

@@ -19,7 +19,7 @@ if [ -f /etc/sonic/chassisdb.conf ]; then
     echo "Chassis Mode: Maintenance -> Normal"
     logger -t TSB -p user.info "Chassis Mode: Maintenance -> Normal"
   fi
-  echo "Please execute \"rexec all -c 'sudo config save -y'\" to preserve System mode in Normal state after reboot\
+  echo "Please execute 'sudo config save' to preserve System mode in Normal state after reboot\
   or config reload on all linecards"
   exit 0
 fi

dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2

@@ -70,7 +70,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
 !
 {% block bgp_init %}
   bgp log-neighbor-changes
-  bgp suppress-fib-pending
   no bgp default ipv4-unicast
   no bgp ebgp-requires-policy
 {% if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'].lower() == 'dualtor') %}

dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2

@@ -30,7 +30,7 @@ stderr_logfile=syslog
 dependent_startup=true
 
 [program:zebra]
-command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp --asic-offload=notify_on_offload
+command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp
 priority=4
 autostart=false
 autorestart=false

files/build_templates/sonic_debian_extension.j2

@@ -1060,6 +1060,8 @@ for MLNX_CPLD_ARCHIVE in $MLNX_CPLD_ARCHIVES; do
 done
 sudo cp platform/mellanox/get_component_versions/get_component_versions.py $FILESYSTEM_ROOT/usr/bin/get_component_versions.py
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/get_component_versions.py
+sudo cp platform/mellanox/cmis_host_mgmt/cmis_host_mgmt.py $FILESYSTEM_ROOT/usr/bin/cmis_host_mgmt.py
+sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/cmis_host_mgmt.py
 j2 platform/mellanox/mlnx-fw-upgrade.j2 | sudo tee $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
 
@@ -1075,6 +1077,8 @@ sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable nv-syncd-shared
 
 # Install required packages specific for mellanox platform
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install minicom xmlstarlet
+sudo mkdir -p $FILESYSTEM_ROOT/etc/minicom/
+sudo cp platform/mellanox/minirc.dfl $FILESYSTEM_ROOT/etc/minicom/
 
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl disable rshim.service
 {% endif %}

files/build_templates/systemd_regex.json

@@ -6,7 +6,7 @@
     },
     {
         "tag": "watchdog-timeout",
-        "regex": "(?:watchdog|Watchdog) timeout .limit.([0-9])min.",
+        "regex": ".*(?:watchdog|Watchdog) timeout .limit.([0-9])min.",
         "params": [ "limit" ]
     }
 ]

onie-image-arm64.conf

@@ -53,3 +53,6 @@ ABOOT_BOOT_IMAGE=.sonic-boot.swi
 
 ## Output file name for dsc installer
 OUTPUT_DSC_IMAGE=target/sonic-$TARGET_MACHINE.tar
+
+## Output file name for bfb image
+OUTPUT_BFB_IMAGE=target/sonic-$TARGET_MACHINE.bfb

platform/broadcom/sai.mk

@@ -1,4 +1,4 @@
-LIBSAIBCM_XGS_VERSION = 10.1.7.0
+LIBSAIBCM_XGS_VERSION = 10.1.21.0
 LIBSAIBCM_DNX_VERSION = 10.1.25.0
 LIBSAIBCM_XGS_BRANCH_NAME = SAI_10.1.0_GA
 LIBSAIBCM_DNX_BRANCH_NAME = SAI_10.1.0_GA

platform/checkout/cisco-8000.ini

@@ -1,3 +1,3 @@
 [module]
 repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
-ref=202405.0.1
+ref=202405.0.2