]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net/mlx5e: Fix return value from timeout recover function
authorAya Levin <ayal@mellanox.com>
Mon, 17 Jun 2019 09:01:45 +0000 (12:01 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 28 Jul 2019 06:28:35 +0000 (08:28 +0200)
[ Upstream commit 39825350ae2a52f8513741b36e42118bd80dd689 ]

Fix timeout recover function to return a meaningful return value.
When an interrupt was not sent by the FW, return IO error instead of
'true'.

Fixes: c7981bea48fb ("net/mlx5e: Fix return status of TX reporter timeout recover")
Signed-off-by: Aya Levin <ayal@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c

index 476dd97f7f2f25a4c0697a6ac2b34c0b5985034e..a778c15e53241ccb3561d9221ac830c444a51502 100644 (file)
@@ -142,22 +142,20 @@ static int mlx5e_tx_reporter_timeout_recover(struct mlx5e_txqsq *sq)
 {
        struct mlx5_eq_comp *eq = sq->cq.mcq.eq;
        u32 eqe_count;
-       int ret;
 
        netdev_err(sq->channel->netdev, "EQ 0x%x: Cons = 0x%x, irqn = 0x%x\n",
                   eq->core.eqn, eq->core.cons_index, eq->core.irqn);
 
        eqe_count = mlx5_eq_poll_irq_disabled(eq);
-       ret = eqe_count ? false : true;
        if (!eqe_count) {
                clear_bit(MLX5E_SQ_STATE_ENABLED, &sq->state);
-               return ret;
+               return -EIO;
        }
 
        netdev_err(sq->channel->netdev, "Recover %d eqes on EQ 0x%x\n",
                   eqe_count, eq->core.eqn);
        sq->channel->stats->eq_rearm++;
-       return ret;
+       return 0;
 }
 
 int mlx5e_tx_reporter_timeout(struct mlx5e_txqsq *sq)