Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 949a49c8 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Greg Kroah-Hartman
Browse files

net/mlx5: Properly convey driver version to firmware 



[ Upstream commit 907af0f0cab4ee5d5604f182ecec2c5b5119d294 ]

mlx5 firmware expects driver version in specific format X.X.X, so
make it always correct and based on real kernel version aligned with
the driver.

Fixes: 012e50e1 ("net/mlx5: Set driver version into firmware")
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f1275c00

drivers/net/ethernet/mellanox/mlx5/core/main.c

+5 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#ifdef CONFIG_RFS_ACCEL

#include <linux/cpu_rmap.h>

#endif

#include <linux/version.h>

#include <net/devlink.h>

#include "mlx5_core.h"

#include "fs_core.h"
@@ -211,7 +212,10 @@ static void mlx5_set_driver_version(struct mlx5_core_dev *dev) 
	strncat(string, ",", remaining_size);



	remaining_size = max_t(int, 0, driver_ver_sz - strlen(string));

	strncat(string, DRIVER_VERSION, remaining_size);



	snprintf(string + strlen(string), remaining_size, "%u.%u.%u",

		 (u8)((LINUX_VERSION_CODE >> 16) & 0xff), (u8)((LINUX_VERSION_CODE >> 8) & 0xff),

		 (u16)(LINUX_VERSION_CODE & 0xffff));



	/*Send the command*/

	MLX5_SET(set_driver_version_in, in, opcode,