Commit 8e37210b authored by Matan Barak's avatar Matan Barak Committed by Doug Ledford
Browse files

IB/core: Change ib_create_cq to use struct ib_cq_init_attr 



Currently, ib_create_cq uses cqe and comp_vecotr instead
of the extendible ib_cq_init_attr struct.

Earlier patches already changed the vendors to work with
ib_cq_init_attr. This patch changes the consumers too.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bcf4c1ea

drivers/infiniband/core/mad.c

+3 −1
Original line number Diff line number Diff line
@@ -2923,6 +2923,7 @@ static int ib_mad_port_open(struct ib_device *device, 
	unsigned long flags;

	char name[sizeof "ib_mad123"];

	int has_smi;

	struct ib_cq_init_attr cq_attr = {};



	/* Create new device info */

	port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);
@@ -2943,9 +2944,10 @@ static int ib_mad_port_open(struct ib_device *device, 
	if (has_smi)

		cq_size *= 2;



	cq_attr.cqe = cq_size;

	port_priv->cq = ib_create_cq(port_priv->device,

				     ib_mad_thread_completion_handler,

				     NULL, port_priv, cq_size, 0);

				     NULL, port_priv, &cq_attr);

	if (IS_ERR(port_priv->cq)) {

		dev_err(&device->dev, "Couldn't create ib_mad CQ\n");

		ret = PTR_ERR(port_priv->cq);

drivers/infiniband/core/verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -1076,12 +1076,12 @@ EXPORT_SYMBOL(ib_destroy_qp); 
struct ib_cq *ib_create_cq(struct ib_device *device,

			   ib_comp_handler comp_handler,

			   void (*event_handler)(struct ib_event *, void *),

			   void *cq_context, int cqe, int comp_vector)

			   void *cq_context,

			   const struct ib_cq_init_attr *cq_attr)

{

	struct ib_cq *cq;

	struct ib_cq_init_attr attr = {.cqe = cqe, .comp_vector = comp_vector};



	cq = device->create_cq(device, &attr, NULL, NULL);

	cq = device->create_cq(device, cq_attr, NULL, NULL);



	if (!IS_ERR(cq)) {

		cq->device        = device;

drivers/infiniband/hw/ehca/ehca_main.c

+4 −1
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port) 
	struct ib_cq *ibcq;

	struct ib_qp *ibqp;

	struct ib_qp_init_attr qp_init_attr;

	struct ib_cq_init_attr cq_attr = {};

	int ret;



	if (sport->ibcq_aqp1) {
@@ -559,7 +560,9 @@ static int ehca_create_aqp1(struct ehca_shca *shca, u32 port) 
		return -EPERM;

	}



	ibcq = ib_create_cq(&shca->ib_device, NULL, NULL, (void *)(-1), 10, 0);

	cq_attr.cqe = 10;

	ibcq = ib_create_cq(&shca->ib_device, NULL, NULL, (void *)(-1),

			    &cq_attr);

	if (IS_ERR(ibcq)) {

		ehca_err(&shca->ib_device, "Cannot create AQP1 CQ.");

		return PTR_ERR(ibcq);

drivers/infiniband/hw/mlx4/mad.c

+3 −1
Original line number Diff line number Diff line
@@ -1774,6 +1774,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, 
			       int create_tun, struct mlx4_ib_demux_pv_ctx *ctx)

{

	int ret, cq_size;

	struct ib_cq_init_attr cq_attr = {};



	if (ctx->state != DEMUX_PV_STATE_DOWN)

		return -EEXIST;
@@ -1802,8 +1803,9 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port, 
	if (ctx->has_smi)

		cq_size *= 2;



	cq_attr.cqe = cq_size;

	ctx->cq = ib_create_cq(ctx->ib_dev, mlx4_ib_tunnel_comp_handler,

			       NULL, ctx, cq_size, 0);

			       NULL, ctx, &cq_attr);

	if (IS_ERR(ctx->cq)) {

		ret = PTR_ERR(ctx->cq);

		pr_err("Couldn't create tunnel CQ (%d)\n", ret);

drivers/infiniband/hw/mlx4/main.c

+3 −1
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct ib_device *ibdev, 
					  struct ib_udata *udata)

{

	struct mlx4_ib_xrcd *xrcd;

	struct ib_cq_init_attr cq_attr = {};

	int err;



	if (!(to_mdev(ibdev)->dev->caps.flags & MLX4_DEV_CAP_FLAG_XRC))
@@ -777,7 +778,8 @@ static struct ib_xrcd *mlx4_ib_alloc_xrcd(struct ib_device *ibdev, 
		goto err2;

	}



	xrcd->cq = ib_create_cq(ibdev, NULL, NULL, xrcd, 1, 0);

	cq_attr.cqe = 1;

	xrcd->cq = ib_create_cq(ibdev, NULL, NULL, xrcd, &cq_attr);

	if (IS_ERR(xrcd->cq)) {

		err = PTR_ERR(xrcd->cq);

		goto err3;

CRA Git | Maintained and supported by SUSTech CRA and CCSE