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

Commit e463c7b1 authored by Yevgeny Petrilin's avatar Yevgeny Petrilin Committed by Roland Dreier
Browse files

mlx4_core: Add a way to set the "collapsed" CQ flag 



Extend the mlx4_cq_resize() API with a way to set the "collapsed" flag
for the CQ being created.

Signed-off-by: default avatarYevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 7663c1e2

drivers/infiniband/hw/mlx4/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ struct ib_cq *mlx4_ib_create_cq(struct ib_device *ibdev, int entries, int vector 
	}



	err = mlx4_cq_alloc(dev->dev, entries, &cq->buf.mtt, uar,

			    cq->db.dma, &cq->mcq);

			    cq->db.dma, &cq->mcq, 0);

	if (err)

		goto err_dbmap;

drivers/net/mlx4/cq.c

+3 −1
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ int mlx4_cq_resize(struct mlx4_dev *dev, struct mlx4_cq *cq, 
EXPORT_SYMBOL_GPL(mlx4_cq_resize);



int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,

		  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq)

		  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,

		  int collapsed)

{

	struct mlx4_priv *priv = mlx4_priv(dev);

	struct mlx4_cq_table *cq_table = &priv->cq_table;
@@ -224,6 +225,7 @@ int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt, 
	cq_context = mailbox->buf;

	memset(cq_context, 0, sizeof *cq_context);



	cq_context->flags	    = cpu_to_be32(!!collapsed << 18);

	cq_context->logsize_usrpage = cpu_to_be32((ilog2(nent) << 24) | uar->index);

	cq_context->comp_eqn        = priv->eq_table.eq[MLX4_EQ_COMP].eqn;

	cq_context->log_page_size   = mtt->page_shift - MLX4_ICM_PAGE_SHIFT;

include/linux/mlx4/device.h

+2 −1
Original line number Diff line number Diff line
@@ -382,7 +382,8 @@ void mlx4_free_hwq_res(struct mlx4_dev *mdev, struct mlx4_hwq_resources *wqres, 
		       int size);



int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,

		  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq);

		  struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,

		  int collapsed);

void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq);



int mlx4_qp_alloc(struct mlx4_dev *dev, int sqpn, struct mlx4_qp *qp);