net/mlx5e: Add helper to get RQ WQE's head

Add helper which retrieves the RQ WQE's head. Use this helper in RX
reporter diagnose callback.

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 bfdf9c185f02dc8d30243d788488692031b665bf..f0e639ef4ec5fdcc28df9f40f69d6a657d285282 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -181,7 +181,6 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,
                                                   struct devlink_fmsg *fmsg)
 {
        struct mlx5e_priv *priv = rq->channel->priv;
-       struct mlx5e_params *params;
        struct mlx5e_icosq *icosq;
        u8 icosq_hw_state;
        int wqes_sz;
@@ -189,7 +188,6 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,
        u16 wq_head;
        int err;
 
-       params = &priv->channels.params;
        icosq = &rq->channel->icosq;
        err = mlx5e_query_rq_state(priv->mdev, rq->rqn, &hw_state);
        if (err)
@@ -200,8 +198,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,
                return err;
 
        wqes_sz = mlx5e_rqwq_get_cur_sz(rq);
-       wq_head = params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ ?
-                 rq->mpwqe.wq.head : mlx5_wq_cyc_get_head(&rq->wqe.wq);
+       wq_head = mlx5e_rqwq_get_head(rq);
 
        err = devlink_fmsg_obj_nest_start(fmsg);
        if (err)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
index ed9e0b8a6f9e49fee15c705f410296fc2350fb96..d787e8fc2e99107a0ad66519f50c3e2ef30392a6 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
@@ -304,6 +304,16 @@ static inline u32 mlx5e_rqwq_get_cur_sz(struct mlx5e_rq *rq)
        }
 }
 
+static inline u16 mlx5e_rqwq_get_head(struct mlx5e_rq *rq)
+{
+       switch (rq->wq_type) {
+       case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ:
+               return mlx5_wq_ll_get_head(&rq->mpwqe.wq);
+       default:
+               return mlx5_wq_cyc_get_head(&rq->wqe.wq);
+       }
+}
+
 /* SW parser related functions */
 
 struct mlx5e_swp_spec {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
index 4cadc336593f1cf76321ff6f85e940ea35297a10..27dece35df7e141568847d58dc2302139b7c719c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
@@ -290,4 +290,8 @@ static inline void mlx5_wq_ll_update_db_record(struct mlx5_wq_ll *wq)
        *wq->db = cpu_to_be32(wq->wqe_ctr);
 }
 
+static inline u16 mlx5_wq_ll_get_head(struct mlx5_wq_ll *wq)
+{
+       return wq->head;
+}
 #endif /* __MLX5_WQ_H__ */