Bluefield drivers/packages/debs updated to Debian 11 (#7)

* BF drivers/pkgs/debs updated to Debian 11 * Packages added for mlx-openipmi * Unnecessary drivers for BF2/3 removed * Added the Derived Deb for OpenIPMI * MFT compilation made generic * Made the platform module deb installation at build time * Added a udev rule for oob port * Removed Trailing Whitespace * Add the derived package hook in openIPMI * Mistake resolved in mft.mk * Update 92-oob_net.rules Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com> Co-authored-by: Vivek Reddy Karri <vkarri@nvidia.com>
vivekrnv · Dec 9, 2021 · f9c71c9 · f9c71c9
1 parent 6eb5b6c
commit f9c71c9
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 230 deletions.
diff --git a/platform/nvidia-bluefield/gpio-mlxbf/.gitignore b/platform/nvidia-bluefield/gpio-mlxbf/.gitignore
diff --git a/platform/nvidia-bluefield/gpio-mlxbf/Makefile b/platform/nvidia-bluefield/gpio-mlxbf/Makefile
diff --git a/platform/nvidia-bluefield/mft/Makefile b/platform/nvidia-bluefield/mft/Makefile
@@ -21,8 +21,9 @@ SHELL = /bin/bash
 MFT_NAME = mft-$(MFT_VERSION)-$(MFT_REVISION)-arm64-deb
 MFT_TGZ = $(MFT_NAME).tgz
 
+BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 SRC_DEB = kernel-mft-dkms_$(MFT_VERSION)-$(MFT_REVISION)_all.deb
-MOD_DEB = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_arm64.deb
+MOD_DEB = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_$(BUILD_ARCH).deb
 
 MAIN_TARGET = mft_$(MFT_VERSION)-$(MFT_REVISION)_arm64.deb
 DERIVED_TARGETS = $(MOD_DEB) mft-oem_$(MFT_VERSION)-$(MFT_REVISION)_arm64.deb

diff --git a/platform/nvidia-bluefield/mlx-cpld/.gitignore b/platform/nvidia-bluefield/mlx-cpld/.gitignore
diff --git a/platform/nvidia-bluefield/mlx-cpld/Makefile b/platform/nvidia-bluefield/mlx-cpld/Makefile
diff --git a/platform/nvidia-bluefield/mlx-openipmi/Makefile b/platform/nvidia-bluefield/mlx-openipmi/Makefile
@@ -22,7 +22,10 @@ SHELL = /bin/bash
 MLX_OPENIPMI = mlx-OpenIPMI-${MLX_OPENIPMI_DRIVER_VERSION}
 MLX_OPENIPMI_TAR = ${MLX_OPENIPMI}.tar.gz
 
-$(addprefix $(DEST)/, $(MLX_OPENIPMI_DEB)): $(DEST)/% :
+MAIN_TARGET = $(MLX_OPENIPMI_DEB)
+DERIVED_TARGETS = $(MLX_OPENIPMI_SERVER_DEB)
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	rm -rf ${MLX_OPENIPMI} ${MLX_OPENIPMI_TAR} *.buildinfo *.changes *.deb
 	wget -N "https://linux.mellanox.com/public/repo/bluefield/${BSD_VER}/extras/SOURCES/$(MLX_OPENIPMI_TAR)"
 	tar -z -f $(MLX_OPENIPMI_TAR) -x
@@ -31,10 +34,12 @@ $(addprefix $(DEST)/, $(MLX_OPENIPMI_DEB)): $(DEST)/% :
 
 	# Build the package
 ifeq ($(CROSS_BUILD_ENVIRON), y)	
-	CONFIG_SITE=/etc/dpkg-cross/cross-config.$(CONFIGURED_ARCH) LD_LIBRARY_PATH=$(CROSS_LIB_PATH) dpkg-buildpackage -rfakeroot -us -uc -b -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	dpkg-buildpackage -rfakeroot -us -uc -b -d -a$(CONFIGURED_ARCH) -Pcross,nocheck -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 else
-	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
+	DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -rfakeroot -us -uc -b -d -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
 endif
 	popd
 
 	mv $* $(DEST)/
+
+$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
diff --git a/platform/nvidia-bluefield/recipes/gpio-mlxbf.dep b/platform/nvidia-bluefield/recipes/gpio-mlxbf.dep
diff --git a/platform/nvidia-bluefield/recipes/gpio-mlxbf.mk b/platform/nvidia-bluefield/recipes/gpio-mlxbf.mk
diff --git a/platform/nvidia-bluefield/recipes/installer-image.mk b/platform/nvidia-bluefield/recipes/installer-image.mk
@@ -21,14 +21,19 @@ SONIC_BF2_IMAGE_BASE = sonic-nvidia-bluefield
 $(SONIC_BF2_IMAGE_BASE)_MACHINE = nvidia-bluefield
 
 # Install the packages during the build_debian phase
-$(SONIC_BF2_IMAGE_BASE)_INSTALLS += $(ETHTOOL) $(LIBPKA_DEB) $(SYSTEMD_SONIC_GENERATOR) $(KERNEL_MFT) $(MFT_OEM) $(MFT)
+$(SONIC_BF2_IMAGE_BASE)_INSTALLS += $(ETHTOOL) \
+                                    $(LIBPKA_DEB) \
+                                    $(KERNEL_MFT) \
+                                    $(MFT_OEM) \
+                                    $(MFT) \
+                                    $(MLX_OPENIPMI_DEB) \
+                                    $(MLX_OPENIPMI_SERVER_DEB) \
+                                    $(BF2_PLATFORM_MODULE)
 
 # Required Dockers
 # TODO: Add swss, syncd and pmon later
 $(SONIC_BF2_IMAGE_BASE)_DOCKERS = $(filter-out $(DOCKER_ORCHAGENT) $(DOCKER_PLATFORM_MONITOR),$(SONIC_INSTALL_DOCKER_IMAGES))
 
-# Platform Specific Packages
-$(SONIC_BF2_IMAGE_BASE)_LAZY_INSTALLS += $(BF2_PLATFORM_MODULE)
 
 # TODO:
 # INSTALLS: $(MLNX_BLUEFIELD_BUILD_SCRIPTS) $(MLXBF_BOOTCTL_DEB)
@@ -62,6 +67,4 @@ $(SONIC_BF2_IMAGE_BFB)_DEPENDS += $($(SONIC_BF2_IMAGE_BASE)_DEPENDS)
 $(SONIC_BF2_IMAGE_BFB)_DOCKERS += $($(SONIC_BF2_IMAGE_BASE)_DOCKERS)
 $(SONIC_BF2_IMAGE_BFB)_LAZY_INSTALLS += $($(SONIC_BF2_IMAGE_BASE)_LAZY_INSTALLS)
 
-SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_PXE)
-SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_BIN)
-SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_BFB)
+SONIC_INSTALLERS += $(SONIC_BF2_IMAGE_PXE) $(SONIC_BF2_IMAGE_BIN) $(SONIC_BF2_IMAGE_BFB)
diff --git a/platform/nvidia-bluefield/recipes/mft.mk b/platform/nvidia-bluefield/recipes/mft.mk
@@ -26,7 +26,8 @@ SONIC_MAKE_DEBS += $(MFT)
 ifeq ($(BLDENV), bullseye)
 $(MFT)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
 
-KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_arm64.deb
+BUILD_ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+KERNEL_MFT = kernel-mft-dkms-modules-$(KVERSION)_$(MFT_VERSION)_$(BUILD_ARCH).deb
 $(eval $(call add_derived_package,$(MFT),$(KERNEL_MFT)))
 endif
 

diff --git a/platform/nvidia-bluefield/recipes/mlx-bootctl.mk b/platform/nvidia-bluefield/recipes/mlx-bootctl.mk
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-MLX_BOOTCTL_DRIVER_VERSION = 1.3
+MLX_BOOTCTL_DRIVER_VERSION = 1.5
 MLX_BOOTCTL_DRIVER = mlx-bootctl.ko
 
 $(MLX_BOOTCTL_DRIVER)_SRC_PATH = $(PLATFORM_PATH)/mlx-bootctl

diff --git a/platform/nvidia-bluefield/recipes/mlx-cpld.dep b/platform/nvidia-bluefield/recipes/mlx-cpld.dep
diff --git a/platform/nvidia-bluefield/recipes/mlx-cpld.mk b/platform/nvidia-bluefield/recipes/mlx-cpld.mk
diff --git a/platform/nvidia-bluefield/recipes/mlx-openipmi.mk b/platform/nvidia-bluefield/recipes/mlx-openipmi.mk
@@ -16,11 +16,15 @@
 #
 
 MLX_OPENIPMI_DRIVER_VERSION = 2.0.25
-MLX_OPENIPMI_DEB = mlx-openipmi_${MLX_OPENIPMI_DRIVER_VERSION}-1_arm64.deb
+MLX_OPENIPMI_DEB = mlx-libopenipmi0_${MLX_OPENIPMI_DRIVER_VERSION}-3_arm64.deb
+MLX_OPENIPMI_SERVER_DEB = mlx-openipmi_${MLX_OPENIPMI_DRIVER_VERSION}-3_arm64.deb
+
 
 $(MLX_OPENIPMI_DEB)_SRC_PATH = $(PLATFORM_PATH)/mlx-openipmi
 $(MLX_OPENIPMI_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) libsnmp-dev_$(SNMPD_VERSION_FULL)_$(CONFIGURED_ARCH).deb
 SONIC_MAKE_DEBS += $(MLX_OPENIPMI_DEB)
+$(eval $(call add_derived_package,$(MLX_OPENIPMI_DEB),$(MLX_OPENIPMI_SERVER_DEB)))
 
 export MLX_OPENIPMI_DRIVER_VERSION
 export MLX_OPENIPMI_DEB
+export MLX_OPENIPMI_SERVER_DEB
diff --git a/platform/nvidia-bluefield/recipes/platform-modules-bf2.mk b/platform/nvidia-bluefield/recipes/platform-modules-bf2.mk
@@ -8,12 +8,10 @@ BF2_PLATFORM_MODULE = platform-modules-bf2_$(BF2_PLATFORM_MODULE_VERSION)_arm64.
 $(BF2_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-bf2
 
 # Bluefield Drivers
-BF2_PLATFORM_DRIVERS = $(MLXBF_GIGE_DRIVER) $(MLXBF2_GPIO_DRIVER) $(BLUEFIELD_EDAC_DRIVER)
-BF2_PLATFORM_DRIVERS += $(MLX_TRIO_DRIVER)  $(MLXBF_LIVEFISH_DRIVER) $(IPMB_HOST_DRIVER)
-BF2_PLATFORM_DRIVERS += $(MLXBF_PKA_DRIVER) $(MLXBF_PMC_DRIVER) $(TMFIFO_DRIVER) 
-BF2_PLATFORM_DRIVERS += $(MLX_BOOTCTL_DRIVER) $(MLXBF_I2C_DRIVER) $(IPMB_DEV_INT_DRIVER)
-
-# $(MLX_CPLD_DRIVER)
+BF2_PLATFORM_DRIVERS = $(MLXBF_GIGE_DRIVER) $(IPMB_HOST_DRIVER) $(MLXBF_I2C_DRIVER)
+BF2_PLATFORM_DRIVERS += $(MLX_TRIO_DRIVER) $(MLXBF_LIVEFISH_DRIVER) $(MLXBF_PMC_DRIVER)
+BF2_PLATFORM_DRIVERS += $(TMFIFO_DRIVER) $(MLXBF2_GPIO_DRIVER) $(BLUEFIELD_EDAC_DRIVER)
+BF2_PLATFORM_DRIVERS += $(MLX_BOOTCTL_DRIVER) $(IPMB_DEV_INT_DRIVER) $(MLXBF_PKA_DRIVER)
 
 $(BF2_PLATFORM_MODULE)_FILES = $(BF2_PLATFORM_DRIVERS)
 $(BF2_PLATFORM_MODULE)_PLATFORM = arm64-nvda_bf-mbf2m516a arm64-nvda_bf-mbf2h536c

diff --git a/platform/nvidia-bluefield/rshim/.gitignore b/platform/nvidia-bluefield/rshim/.gitignore
diff --git a/platform/nvidia-bluefield/rshim/Makefile b/platform/nvidia-bluefield/rshim/Makefile
diff --git a/platform/nvidia-bluefield/rules.mk b/platform/nvidia-bluefield/rules.mk
@@ -18,20 +18,18 @@
 RECIPE_DIR = recipes
 
 # Bluefied Software Distribution Version
-BSD_VER = "3.7.1"
+BSD_VER=3.8.0
 export BSD_VER
 
+
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/tmfifo.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlxbf-gige.mk
-include $(PLATFORM_PATH)/$(RECIPE_DIR)/gpio-mlxbf.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/gpio-mlxbf2.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/i2c-mlxbf.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/bluefield-edac.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/ipmb-dev-int.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/ipmb-host.mk
-include $(PLATFORM_PATH)/$(RECIPE_DIR)/libpka.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-bootctl.mk
-include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-cpld.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-trio.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlxbf-bootctl.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlxbf-livefish.mk
@@ -42,8 +40,7 @@ include $(PLATFORM_PATH)/$(RECIPE_DIR)/bootimages.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/bfscripts.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/platform-modules-bf2.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/mft.mk
+include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-openipmi.mk
+# include $(PLATFORM_PATH)/$(RECIPE_DIR)/libpka.mk
 include $(PLATFORM_PATH)/$(RECIPE_DIR)/installer-image.mk
 
-# TODO: This deb has dependency issues, skipped for now
-# include $(PLATFORM_PATH)/$(RECIPE_DIR)/mlx-openipmi.mk
-
diff --git a/...rm/nvidia-bluefield/sonic-platform-modules-bf2/templates/platform-modules-bf2.postinst.j2 b/...rm/nvidia-bluefield/sonic-platform-modules-bf2/templates/platform-modules-bf2.postinst.j2
@@ -11,10 +11,8 @@ modprobe {{ k_module.split(".")[0] }}
 
 sync
 
-systemctl restart ssh
-systemctl restart systemd-logind
 systemctl enable serial-getty@hvc0.service
 systemctl enable serial-getty@ttyAMA0.service
 systemctl enable serial-getty@ttyAMA1.service
 
-#DEBHELPER#
+#DEBHELPER#
diff --git a/platform/nvidia-bluefield/sonic-platform-modules-bf2/udev/92-oob_net.rules b/platform/nvidia-bluefield/sonic-platform-modules-bf2/udev/92-oob_net.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="net", ACTION=="add", DEVPATH=="/devices/platform/MLNXBF17:00/net/e*", NAME="eth0"
diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
@@ -344,6 +344,9 @@ RUN apt-get update && apt-get install -y \
         googletest \
         libgtest-dev \
         libgcc-10-dev \
+# For mlx-openIPMI
+	libopt0 \
+	libopt-dev \
 # For sonic-host-services build
         libcairo2-dev \
         libdbus-1-dev \
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		SUBSYSTEM=="net", ACTION=="add", DEVPATH=="/devices/platform/MLNXBF17:00/net/e*", NAME="eth0"