This is a note to let you know that I've just added the patch titled
net/mlx5: Fix driver load error flow when firmware is stuck
to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-mlx5-fix-driver-load-error-flow-when-firmware-is-stuck.patch
and it can be found in the queue-4.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Mon Jul 17 18:46:41 CEST 2017
From: Gal Pressman <galp@xxxxxxxxxxxx>
Date: Mon, 19 Jun 2017 18:25:59 +0300
Subject: net/mlx5: Fix driver load error flow when firmware is stuck
From: Gal Pressman <galp@xxxxxxxxxxxx>
[ 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@xxxxxxxxxxxx>
Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1020,7 +1020,7 @@ static int mlx5_load_one(struct mlx5_cor
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);
Patches currently in stable-queue which might be from galp@xxxxxxxxxxxx are
queue-4.12/net-mlx5e-fix-tx-carrier-errors-report-in-get-stats-ndo.patch
queue-4.12/net-mlx5-fix-driver-load-error-flow-when-firmware-is-stuck.patch