lkml.org 
[lkml]   [2020]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 52/86] net/mlx5: Fix driver load error flow when firmware is stuck
    Date
    From: Gal Pressman <galp@mellanox.com>

    [ Upstream commit 8ce59b16b4b6eacedaec1f7b652b4781cdbfe15f ]

    When wait for firmware init fails, previous code would mistakenly
    return success and cause inconsistency in the driver state.

    Fixes: 6c780a0267b8 ("net/mlx5: Wait for FW readiness before initializing command interface")
    Signed-off-by: Gal Pressman <galp@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
    index bf4447581072f..e88605de84cca 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
    @@ -933,7 +933,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv)
    if (err) {
    dev_err(&dev->pdev->dev, "Firmware over %d MS in pre-initializing state, aborting\n",
    FW_PRE_INIT_TIMEOUT_MILI);
    - goto out;
    + goto out_err;
    }

    err = mlx5_cmd_init(dev);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-05-18 20:32    [W:3.362 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site