lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 135/242] net/mlx5: Properly convey driver version to firmware
    Date
    From: Leon Romanovsky <leonro@nvidia.com>

    [ 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: 012e50e109fd ("net/mlx5: Set driver version into firmware")
    Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
    index 1ac0e173da12c..049d9d19c66d9 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
    @@ -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"
    @@ -204,7 +205,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,
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:14    [W:4.144 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site