From a5e1521727d05de96d28cdb6f5e52bdefc8bd14e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <ffidencio@nvidia.com>
Date: Tue, 28 Apr 2026 11:02:28 +0200
Subject: [PATCH] kernel: bake in Mellanox MLX5 Ethernet support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The MLX5 Ethernet driver is useful well beyond the DPU/SmartNIC use case
(any guest sitting on top of a Mellanox/ConnectX NIC benefits from it),
yet the existing config fragment lived under dpu/ and was only pulled in
when the kernel was built with `-D nvidia`.

Promote it to a first-class common fragment so every Kata kernel gets
MLX5 Ethernet built in.

Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
---
 tools/packaging/kernel/build-kernel.sh           | 16 +---------------
 .../{dpu/nvidia.conf => common/mlx5.conf}        |  0
 tools/packaging/kernel/kata_config_version       |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)
 rename tools/packaging/kernel/configs/fragments/{dpu/nvidia.conf => common/mlx5.conf} (100%)

diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh
index 8cb694d94a..b82cc393a7 100755
--- a/tools/packaging/kernel/build-kernel.sh
+++ b/tools/packaging/kernel/build-kernel.sh
@@ -44,8 +44,6 @@ build_type=""
 force_setup_generate_config="false"
 #GPU kernel support
 gpu_vendor=""
-#DPU kernel support
-dpu_vendor=""
 #Confidential guest type
 conf_guest=""
 #
@@ -101,7 +99,6 @@ Options:
 	-a <arch>   	: Arch target to build the kernel, such as aarch64/ppc64le/riscv64/s390x/x86_64.
 	-b <type>    	: Enable optional config type.
 	-c <path>   	: Path to config file to build the kernel.
-	-D <vendor> 	: DPU/SmartNIC vendor, only nvidia.
 	-d          	: Enable bash debug.
 	-e          	: Enable experimental kernel.
 	-E          	: Enable arch-specific experimental kernel, arch info offered by "-a".
@@ -239,7 +236,6 @@ get_kernel_frag_path() {
 	local arch_path="$1"
 	local common_path="${arch_path}/../common"
 	local gpu_path="${arch_path}/../gpu"
-	local dpu_path="${arch_path}/../dpu"
 
 	local kernel_path="$2"
 	local arch="$3"
@@ -300,12 +296,6 @@ get_kernel_frag_path() {
 		all_configs="${all_configs} ${gpu_configs}"
 	fi
 
-	if [[ "${dpu_vendor}" != "" ]]; then
-		info "Add kernel config for DPU/SmartNIC due to '-n ${dpu_vendor}'"
-		local dpu_configs="${dpu_path}/${dpu_vendor}.conf"
-		all_configs="${all_configs} ${dpu_configs}"
-	fi
-
 	if [[ "${measured_rootfs}" == "true" ]]; then
 		info "Enabling config for confidential guest trust storage protection"
 		local cryptsetup_configs
@@ -649,7 +639,7 @@ install_kata() {
 }
 
 main() {
-	while getopts "a:b:c:dD:eEfg:hH:k:mp:r:st:u:v:x" opt; do
+	while getopts "a:b:c:deEfg:hH:k:mp:r:st:u:v:x" opt; do
 		case "${opt}" in
 			a)
 				arch_target="${OPTARG}"
@@ -664,10 +654,6 @@ main() {
 				PS4=' Line ${LINENO}: '
 				set -x
 				;;
-			D)
-				dpu_vendor="${OPTARG}"
-				[[ "${dpu_vendor}" == "${VENDOR_NVIDIA}" ]] || die "DPU vendor only support nvidia"
-				;;
 			e)
 				build_type="experimental"
 				;;
diff --git a/tools/packaging/kernel/configs/fragments/dpu/nvidia.conf b/tools/packaging/kernel/configs/fragments/common/mlx5.conf
similarity index 100%
rename from tools/packaging/kernel/configs/fragments/dpu/nvidia.conf
rename to tools/packaging/kernel/configs/fragments/common/mlx5.conf
diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version
index 598ed30e89..88b2e78342 100644
--- a/tools/packaging/kernel/kata_config_version
+++ b/tools/packaging/kernel/kata_config_version
@@ -1 +1 @@
-190
+191