Rebasing PR and addressing review comment

sonic-net · Nov 27, 2023 · 4a20ae4 · 4a20ae4
1 parent 2002665
commit 4a20ae4
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 40 deletions.
diff --git a/files/dsc/install_debian.j2 b/files/dsc/install_debian.j2
@@ -244,8 +244,8 @@ cat <<EOF >> $root_mnt/$BL_CONF
 default main
 
 label main
-    kernel /$image_dir/boot/vmlinuz-5.10.0-18-2-arm64
-    initrd /$image_dir/boot/initrd.img-5.10.0-18-2-arm64
+    kernel /$image_dir/boot/vmlinuz-6.1.0-11-2-arm64
+    initrd /$image_dir/boot/initrd.img-6.1.0-11-2-arm64
     devicetree /$image_dir/boot/elba-asic-psci.dtb
     append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
 }

diff --git a/platform/pensando/docker-dpu.mk b/platform/pensando/docker-dpu.mk
@@ -3,18 +3,15 @@ DOCKER_DPU_STEM = docker-dpu
 
 DOCKER_DPU = $(DOCKER_DPU_STEM).gz
 
+$(DOCKER_DPU)_SQUASH = n
 $(DOCKER_DPU)_PATH = $(PLATFORM_PATH)/$(DOCKER_DPU_STEM)
 
 $(DOCKER_DPU)_LOAD_DOCKERS = $(DOCKER_DPU_BASE)
 
-$(DOCKER_DPU)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
-
-$(DOCKER_DPU)_DBG_DEPENDS += $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
-
-$(DOCKER_DPU)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)
-
 SONIC_DOCKER_IMAGES += $(DOCKER_DPU)
 
+$(DOCKER_DPU)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BULLSEYE)
+
 $(DOCKER_DPU)_PACKAGE_NAME = dpu
 $(DOCKER_DPU)_CONTAINER_NAME = dpu
 $(DOCKER_DPU)_VERSION = 1.0.0

diff --git a/platform/pensando/docker-dpu/Dockerfile.j2 b/platform/pensando/docker-dpu/Dockerfile.j2
@@ -1,15 +1,2 @@
 FROM docker-dpu-base
-# Auto-Generated for buildinfo
-ARG SONIC_VERSION_CACHE
-ARG SONIC_VERSION_CONTROL_COMPONENTS
-COPY ["buildinfo", "/usr/local/share/buildinfo"]
-COPY vcache/ /sonic/target/vcache/docker-dpu
-ENV IMAGENAME=docker-dpu
-ENV DISTRO=jessie
-RUN pre_run_buildinfo docker-dpu
-
-RUN echo "docker-dpu-base"
-
-RUN post_run_buildinfo docker-dpu 
-
-RUN post_run_cleanup docker-dpu 
+# SKIP_HOOK
diff --git a/platform/pensando/docker-syncd-pensando.mk b/platform/pensando/docker-syncd-pensando.mk
@@ -1,19 +1,20 @@
 # docker image for centec syncd
 
 DOCKER_SYNCD_PLATFORM_CODE = pensando
-include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
+include $(PLATFORM_PATH)/../template/docker-syncd-bullseye.mk
 
 $(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
 
-$(DOCKER_SYNCD_PENSANDO)_DEPENDS += $(SYNCD_DBG) \
+$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \
                                   $(LIBSWSSCOMMON_DBG) \
                                   $(LIBSAIMETADATA_DBG) \
                                   $(LIBSAIREDIS_DBG)
 
 $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
 
-$(DOCKER_SYNCD_PENSANDO)_RUN_OPT += --privileged -t
-$(DOCKER_SYNCD_PENSANDO)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
-$(DOCKER_SYNCD_PENSANDO)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
-$(DOCKER_SYNCD_PENSANDO)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
+$(DOCKER_SYNCD_BASE)_RUN_OPT += --privileged -t
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
+$(DOCKER_SYNCD_BASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
diff --git a/platform/pensando/docker-syncd-pensando/Dockerfile.j2 b/platform/pensando/docker-syncd-pensando/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-buster-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 

diff --git a/platform/pensando/dsc-drivers/debian/control b/platform/pensando/dsc-drivers/debian/control
@@ -10,5 +10,5 @@ Standards-Version: 3.9.3
 Package: ionic-modules
 Architecture: arm64
 Section: main
-Depends: linux-image-5.10.0-18-2-arm64-unsigned
+Depends: linux-image-6.1.0-11-2-arm64-unsigned
 Description: kernel modules for pensando elba
diff --git a/platform/pensando/dsc-drivers/debian/ionic-modules.install b/platform/pensando/dsc-drivers/debian/ionic-modules.install
@@ -1,4 +1,4 @@
-src/drivers/linux/build/mdev.ko lib/modules/5.10.0-18-2-arm64/extra
-src/drivers/linux/build/mnet_uio_pdrv_genirq.ko lib/modules/5.10.0-18-2-arm64/extra
-src/drivers/linux/build/ionic_mnic.ko lib/modules/5.10.0-18-2-arm64/extra
+src/drivers/linux/build/mdev.ko lib/modules/6.1.0-11-2-arm64/extra
+src/drivers/linux/build/mnet_uio_pdrv_genirq.ko lib/modules/6.1.0-11-2-arm64/extra
+src/drivers/linux/build/ionic_mnic.ko lib/modules/6.1.0-11-2-arm64/extra
 systemd/ionic-modules.service lib/systemd/system
diff --git a/platform/pensando/dsc-drivers/src/drivers/linux/eth/ionic/ionic_bus_platform.c b/platform/pensando/dsc-drivers/src/drivers/linux/eth/ionic/ionic_bus_platform.c
@@ -124,10 +124,10 @@ int ionic_bus_get_irq(struct ionic *ionic, unsigned int num)
 	struct msi_desc *desc;
 	int i = 0;
 
-	for_each_msi_entry(desc, ionic->dev) {
+	msi_for_each_desc(desc, ionic->dev, MSI_DESC_ALL) {
 		if (i == num) {
 			pr_info("[i = %d] msi_entry: %d.%d\n",
-				i, desc->platform.msi_index,
+				i, desc->msi_index,
 				desc->irq);
 
 			return desc->irq;
@@ -146,10 +146,10 @@ const char *ionic_bus_info(struct ionic *ionic)
 static void ionic_mnic_set_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
 {
 	dev_dbg(desc->dev, "msi_index: [%d] (msi_addr hi_lo): %x_%x msi_data: %x\n",
-		desc->platform.msi_index, msg->address_hi,
+		desc->msi_index, msg->address_hi,
 		msg->address_lo, msg->data);
 
-	ionic_intr_msixcfg(desc->dev, desc->platform.msi_index,
+	ionic_intr_msixcfg(desc->dev, desc->msi_index,
 		     (((u64)msg->address_hi << 32) | msg->address_lo),
 		     msg->data, 0/*vctrl*/);
 }

diff --git a/platform/pensando/platform.conf b/platform/pensando/platform.conf
@@ -172,8 +172,8 @@ cat <<EOF >> $bl_conf_path/$BL_CONF
 default main
 
 label main
-	kernel /$image_dir/boot/vmlinuz-5.10.0-18-2-arm64
-	initrd /$image_dir/boot/initrd.img-5.10.0-18-2-arm64
+	kernel /$image_dir/boot/vmlinuz-6.1.0-11-2-arm64
+	initrd /$image_dir/boot/initrd.img-6.1.0-11-2-arm64
 	devicetree /$image_dir/boot/elba-asic-psci.dtb
 	append softdog.soft_panic=1 FW_NAME=mainfwa root=/dev/mmcblk0p10 rw rootwait rootfstype=ext4 loopfstype=squashfs loop=/$image_dir/fs.squashfs
 }

diff --git a/scripts/prepare_docker_buildinfo.sh b/scripts/prepare_docker_buildinfo.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+grep "^# SKIP_HOOK" $2 && exit 0
+
 [[ ! -z "${DBGOPT}" && $0 =~ ${DBGOPT} ]] && set -x
 
 BUILDINFO_BASE=/usr/local/share/buildinfo

diff --git a/slave.mk b/slave.mk
@@ -1151,7 +1151,7 @@ $(addprefix $(TARGET_PATH)/, $(DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .platform
 		DBGOPT='$(DBGOPT)' \
 		scripts/prepare_docker_buildinfo.sh $* $($*.gz_PATH)/Dockerfile $(CONFIGURED_ARCH) $(LOG)
 		docker info $(LOG)
-		docker build --squash --no-cache \
+		docker build --no-cache $$( [[ "$($*.gz_SQUASH)" != n ]] && echo --squash)\
 			--build-arg http_proxy=$(HTTP_PROXY) \
 			--build-arg https_proxy=$(HTTPS_PROXY) \
 			--build-arg no_proxy=$(NO_PROXY) \