Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e0e2ea1 authored by Yishai Hadas's avatar Yishai Hadas Committed by Leon Romanovsky
Browse files

net/mlx5: Report EQE data upon CQ completion 



Report EQE data upon CQ completion to let upper layers use this data.

Signed-off-by: default avatarYishai Hadas <yishaih@mellanox.com>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 70a43d3f

drivers/infiniband/hw/mlx5/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "mlx5_ib.h"

#include "srq.h"



static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq)

static void mlx5_ib_cq_comp(struct mlx5_core_cq *cq, struct mlx5_eqe *eqe)

{

	struct ib_cq *ibcq = &to_mibcq(cq)->ibcq;

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -4492,7 +4492,7 @@ static void mlx5_ib_handle_internal_error(struct mlx5_ib_dev *ibdev) 
	 * lock/unlock above locks Now need to arm all involved CQs.

	 */

	list_for_each_entry(mcq, &cq_armed_list, reset_notify) {

		mcq->comp(mcq);

		mcq->comp(mcq, NULL);

	}

	spin_unlock_irqrestore(&ibdev->reset_flow_resource_lock, flags);

}

drivers/infiniband/hw/mlx5/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -6297,7 +6297,7 @@ static void handle_drain_completion(struct ib_cq *cq, 
		/* Run the CQ handler - this makes sure that the drain WR will

		 * be processed if wasn't processed yet.

		 */

		mcq->mcq.comp(&mcq->mcq);

		mcq->mcq.comp(&mcq->mcq, NULL);

	}



	wait_for_completion(&sdrain->done);

drivers/net/ethernet/mellanox/mlx5/core/cq.c

+3 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void mlx5_cq_tasklet_cb(unsigned long data) 
	list_for_each_entry_safe(mcq, temp, &ctx->process_list,

				 tasklet_ctx.list) {

		list_del_init(&mcq->tasklet_ctx.list);

		mcq->tasklet_ctx.comp(mcq);

		mcq->tasklet_ctx.comp(mcq, NULL);

		mlx5_cq_put(mcq);

		if (time_after(jiffies, end))

			break;
@@ -68,7 +68,8 @@ void mlx5_cq_tasklet_cb(unsigned long data) 
		tasklet_schedule(&ctx->task);

}



static void mlx5_add_cq_to_tasklet(struct mlx5_core_cq *cq)

static void mlx5_add_cq_to_tasklet(struct mlx5_core_cq *cq,

				   struct mlx5_eqe *eqe)

{

	unsigned long flags;

	struct mlx5_eq_tasklet *tasklet_ctx = cq->tasklet_ctx.priv;

drivers/net/ethernet/mellanox/mlx5/core/en.h

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ netdev_tx_t mlx5e_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
			  struct mlx5e_tx_wqe *wqe, u16 pi, bool xmit_more);



void mlx5e_trigger_irq(struct mlx5e_icosq *sq);

void mlx5e_completion_event(struct mlx5_core_cq *mcq);

void mlx5e_completion_event(struct mlx5_core_cq *mcq, struct mlx5_eqe *eqe);

void mlx5e_cq_error_event(struct mlx5_core_cq *mcq, enum mlx5_event event);

int mlx5e_napi_poll(struct napi_struct *napi, int budget);

bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget);