RE: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Long Li]

> Subject: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the
> device type
> 
> From: Konstantin Taranov <kotaranov@xxxxxxxxxxxxx>
> 
> Get CQ type from the used gdma device. The MANA_IB_CREATE_RNIC_CQ flag
> is ignored. It was used in older kernel versions where the mana_ib was shared
> between ethernet and rnic.
> 
> Fixes: d4293f96ce0b ("RDMA/mana_ib: unify mana_ib functions to support
> any gdma device")
> Signed-off-by: Konstantin Taranov <kotaranov@xxxxxxxxxxxxx>

Reviewed-by: Long Li <longli@xxxxxxxxxxxxx>

> ---
>  drivers/infiniband/hw/mana/cq.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mana/cq.c
> b/drivers/infiniband/hw/mana/cq.c index 1becc8779..2dce1b677 100644
> --- a/drivers/infiniband/hw/mana/cq.c
> +++ b/drivers/infiniband/hw/mana/cq.c
> @@ -24,6 +24,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
> 
>  	cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
>  	cq->cq_handle = INVALID_MANA_HANDLE;
> +	is_rnic_cq = mana_ib_is_rnic(mdev);
> 
>  	if (udata) {
>  		if (udata->inlen < offsetof(struct mana_ib_create_cq, flags))
> @@ -35,8 +36,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
>  			return err;
>  		}
> 
> -		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
> -
>  		if ((!is_rnic_cq && attr->cqe > mdev-
> >adapter_caps.max_qp_wr) ||
>  		    attr->cqe > U32_MAX / COMP_ENTRY_SIZE) {
>  			ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-
> >cqe); @@ -55,7 +54,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const
> struct ib_cq_init_attr *attr,
>  							  ibucontext);
>  		doorbell = mana_ucontext->doorbell;
>  	} else {
> -		is_rnic_cq = true;
>  		buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
> >cqe * COMP_ENTRY_SIZE));
>  		cq->cqe = buf_size / COMP_ENTRY_SIZE;
>  		err = mana_ib_create_kernel_queue(mdev, buf_size,
> GDMA_CQ, &cq->queue);
> --
> 2.43.0