Rebasing and push

Signed-off-by: Shantanu Shrivastava <[email protected]>
Signed-off-by: Sahil Chaudhari <[email protected]>

Author: shanshri

build_debian.sh

@@ -524,10 +524,6 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docke
 # Install scapy
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
 
-# Install grpcio
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'grpcio==1.58.0'
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'grpcio-tools==1.58.0'
-
 # The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation
 

device/pensando/arm64-elba-asic-flash128-r0/chassisdb.conf

@@ -0,0 +1,4 @@
+{
+	"interfaces": {},
+	"DPU":{}
+}

device/pensando/arm64-elba-asic-flash128-r0/platform.json

@@ -13,4 +13,38 @@ function StopDpuDocker() {
     sync ; sync
 }
 
+function SetUboota() {
+    # Extract the "Next" image name
+    dirnext=$(sonic-installer list | grep "^Next:" | awk '{print $2}' | sed 's/SONiC-OS-/image-/')
+
+    # Extract the "Current" image name
+    dircurrent=$(sonic-installer list | grep "^Current:" | awk '{print $2}' | sed 's/SONiC-OS-/image-/' | sed 's/\///')
+
+    idx=$(fw_printenv boot_once | awk '{print $2}' | awk -F'_' '{print $3}')
+    if [ ! -z "$idx" ]; then
+        echo "boot_once is set so using that image as next"
+        dirnext=$(eval fw_printenv sonic_dir_$idx | awk -F'=' '{print $2}')
+    fi
+
+    echo "Current image : $dircurrent"
+    echo "Next image : $dirnext"
+    # Check if the "Next" and "Current" image names are the same
+    if [ "$dirnext" != "$dircurrent" ]; then
+        # Define the command
+        command="/host/$dirnext/boot/install_file uboota /host/$dirnext/boot/uboota.img"
+        # Echo the command to be run
+        echo "Running command: $command"
+        # Execute the command with exception handling
+        if $command; then
+            echo "Command executed successfully."
+        else
+            echo "Error: Command execution failed." >&2
+            exit 1
+        fi
+    else
+        echo "Next and Current images are the same. No action taken."
+    fi
+}
+
+SetUboota
 StopDpuDocker

device/pensando/arm64-elba-asic-flash128-r0/platform_reboot

@@ -4,7 +4,7 @@
     "skip_ledd": true,
     "skip_psud": true,
     "skip_syseepromd": false,
-    "skip_xcvrd": false,
+    "skip_xcvrd": true,
     "skip_chassis_db_init": false,
     "skip_chassisd": true,
     "skip_pcied": false,

device/pensando/arm64-elba-asic-flash128-r0/pmon_daemon_control.json

@@ -0,0 +1 @@
+rudra

device/pensando/arm64-elba-asic-r0/default_pipeline

@@ -144,9 +144,9 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install blkinf
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install ipaddr
 
 # Install Python module for grpcio and grpcio-toole
-if [[ $CONFIGURED_ARCH == amd64 ]]; then
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio==1.51.1"
-    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio-tools==1.51.1"
+if [[ $CONFIGURED_ARCH == amd64 || $CONFIGURED_ARCH == arm64 ]]; then
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio==1.58.0"
+    sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install "grpcio-tools==1.58.0"
 fi
 
 # Install sonic-py-common Python 3 package

files/build_templates/sonic_debian_extension.j2

@@ -33,6 +33,7 @@ function start_polaris()
     modprobe mnet_uio_pdrv_genirq
     modprobe mdev
     modprobe pciesvc
+    insmod /usr/lib/modules/6.1.0-22-2-arm64/kernel/drivers/watchdog/softdog.ko soft_panic=1 soft_noboot=0
 
     mkdir -p $HOST_DIR_POLARIS/update
     mkdir -p $HOST_DIR_POLARIS/sysconfig/config0

files/dsc/dpu.init

@@ -16,14 +16,14 @@ kpci += $(pciesvc-obj)
 INCLUDES = -I/sonic/platform/pensando/dsc-drivers/src/drivers/linux/pciesvc \
 	   -I/sonic/platform/pensando/dsc-drivers/src/drivers/linux/pciesvc/pciesvc/include \
 	   -I/sonic/platform/pensando/dsc-drivers/src/drivers/linux/pciesvc/pciesvc/src \
-	   -I/sonic/src/sonic-linux-kernel/linux-6.1.38/include/linux
+	   -I/sonic/src/sonic-linux-kernel/linux-6.1.94/include/linux
 	   #-I/usr/include \
 	   #-I$(PWD) \
-	   #-I/sonic/src/sonic-linux-kernel/linux-6.1.38/debian/build/build_arm64_none_arm64
+	   #-I/sonic/src/sonic-linux-kernel/linux-6.1.94/debian/build/build_arm64_none_arm64
 $(MODNAME)-y := $(kpci) kpci_get_entry.o kpcimgr_module.o kpcinterface.o \
 	     kpci_entry.o kpci_kexec.o kpci_test.o pciesvc_end.o
 
-KDIR := /sonic/src/sonic-linux-kernel/linux-6.1.38/debian/build/build_arm64_none_arm64
+KDIR := /sonic/src/sonic-linux-kernel/linux-6.1.94/debian/build/build_arm64_none_arm64
 PWD := $(shell pwd)
 UTS := X$(shell grep UTS_RELEASE $(KDIR)/include/generated/utsrelease.h)
 REL := $(shell echo $(UTS) | awk '{ print $$3 }' | sed -e 's/"//g')

platform/pensando/dsc-drivers/src/drivers/linux/pciesvc/Makefile

@@ -176,7 +176,7 @@ static ssize_t run_store(struct device *dev,
 	mod.core_layout.size = bin_valid_bytes;
 	mod.init_layout.base = 0;
 	mod.init_layout.size = 0;
-	strcpy(mod.name, "pciesvc.lib");
+	strcpy_s(mod.name, sizeof(mod.name), "pciesvc.lib");
 
 	ret = kpcimgr_module_register(&mod, ep, 1);
 	if (ret) {