net/mlx5e: Remove redundant RQ state query

When received a CQE error, the driver inspect the syndrome given by the
firmware. RQ recovery is initiated only as a result of a fatal syndrome;
syndrome which set the RQ into an error state. Hence no need to query
the RQ state at the beginning of the recovery process. Add additional
debug prints before recovering.

Signed-off-by: Aya Levin <ayal@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index 495a3e6..b8b32ae 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -124,25 +124,9 @@ static int mlx5e_rq_to_ready(struct mlx5e_rq *rq, int curr_state)
 
 static int mlx5e_rx_reporter_err_rq_cqe_recover(void *ctx)
 {
-       struct mlx5_core_dev *mdev;
-       struct net_device *dev;
-       struct mlx5e_rq *rq;
-       u8 state;
+       struct mlx5e_rq *rq = ctx;
        int err;
 
-       rq = ctx;
-       mdev = rq->mdev;
-       dev = rq->netdev;
-       err = mlx5e_query_rq_state(mdev, rq->rqn, &state);
-       if (err) {
-               netdev_err(dev, "Failed to query RQ 0x%x state. err = %d\n",
-                          rq->rqn, err);
-               goto out;
-       }
-
-       if (state != MLX5_RQC_STATE_ERR)
-               goto out;
-
        mlx5e_deactivate_rq(rq);
        mlx5e_free_rx_descs(rq);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
index e9d4a61..be76928 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
@@ -268,7 +268,7 @@ static inline void mlx5e_rqwq_reset(struct mlx5e_rq *rq)
        }
 }
 
-static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 sqn,
+static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 qn,
                                        struct mlx5_err_cqe *err_cqe)
 {
        struct mlx5_cqwq *wq = &cq->wq;
@@ -277,8 +277,8 @@ static inline void mlx5e_dump_error_cqe(struct mlx5e_cq *cq, u32 sqn,
        ci = mlx5_cqwq_ctr2ix(wq, wq->cc - 1);
 
        netdev_err(cq->channel->netdev,
-                  "Error cqe on cqn 0x%x, ci 0x%x, sqn 0x%x, opcode 0x%x, syndrome 0x%x, vendor syndrome 0x%x\n",
-                  cq->mcq.cqn, ci, sqn,
+                  "Error cqe on cqn 0x%x, ci 0x%x, qn 0x%x, opcode 0x%x, syndrome 0x%x, vendor syndrome 0x%x\n",
+                  cq->mcq.cqn, ci, qn,
                   get_cqe_opcode((struct mlx5_cqe64 *)err_cqe),
                   err_cqe->syndrome, err_cqe->vendor_err_synd);
        mlx5_dump_err_cqe(cq->mdev, err_cqe);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 8b42f72..350f9c5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -1187,8 +1187,10 @@ static void trigger_report(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
        struct mlx5_err_cqe *err_cqe = (struct mlx5_err_cqe *)cqe;
 
        if (cqe_syndrome_needs_recover(err_cqe->syndrome) &&
-           !test_and_set_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state))
+           !test_and_set_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state)) {
+               mlx5e_dump_error_cqe(&rq->cq, rq->rqn, err_cqe);
                queue_work(rq->channel->priv->wq, &rq->recover_work);
+       }
 }
 
 void mlx5e_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)