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

Commit a25d112f authored by Eddie Wai's avatar Eddie Wai Committed by Doug Ledford
Browse files

RDMA/bnxt_re: Fixed the max_rd_atomic support for initiator and destination QP 



There's a couple of bugs in the support of max_rd_atomic and
max_dest_rd_atomic. In the modify_qp, if the requested max_rd_atomic,
which is the ORRQ size, is greater than what the chip can support,
then we have to cap the request to chip max as we can't have the HW
overflow the ORRQ. Capping the max_rd_atomic support internally is okay
to do as the remaining read/atomic WRs will still be sitting in the SQ.
However, for the max_dest_rd_atomic, the driver has to error out as
this dictates the IRRQ size and we can't control what the remote
side sends.

Signed-off-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 58d4a671

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+13 −2
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ int bnxt_re_query_device(struct ib_device *ibdev, 
	ib_attr->max_mr = dev_attr->max_mr;

	ib_attr->max_pd = dev_attr->max_pd;

	ib_attr->max_qp_rd_atom = dev_attr->max_qp_rd_atom;

	ib_attr->max_qp_init_rd_atom = dev_attr->max_qp_rd_atom;

	ib_attr->max_qp_init_rd_atom = dev_attr->max_qp_init_rd_atom;

	ib_attr->atomic_cap = IB_ATOMIC_HCA;

	ib_attr->masked_atomic_cap = IB_ATOMIC_HCA;
@@ -1512,13 +1512,24 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
	if (qp_attr_mask & IB_QP_MAX_QP_RD_ATOMIC) {

		qp->qplib_qp.modify_flags |=

				CMDQ_MODIFY_QP_MODIFY_MASK_MAX_RD_ATOMIC;

		qp->qplib_qp.max_rd_atomic = qp_attr->max_rd_atomic;

		/* Cap the max_rd_atomic to device max */

		qp->qplib_qp.max_rd_atomic = min_t(u32, qp_attr->max_rd_atomic,

						   dev_attr->max_qp_rd_atom);

	}

	if (qp_attr_mask & IB_QP_SQ_PSN) {

		qp->qplib_qp.modify_flags |= CMDQ_MODIFY_QP_MODIFY_MASK_SQ_PSN;

		qp->qplib_qp.sq.psn = qp_attr->sq_psn;

	}

	if (qp_attr_mask & IB_QP_MAX_DEST_RD_ATOMIC) {

		if (qp_attr->max_dest_rd_atomic >

		    dev_attr->max_qp_init_rd_atom) {

			dev_err(rdev_to_dev(rdev),

				"max_dest_rd_atomic requested%d is > dev_max%d",

				qp_attr->max_dest_rd_atomic,

				dev_attr->max_qp_init_rd_atom);

			return -EINVAL;

		}



		qp->qplib_qp.modify_flags |=

				CMDQ_MODIFY_QP_MODIFY_MASK_MAX_DEST_RD_ATOMIC;

		qp->qplib_qp.max_dest_rd_atomic = qp_attr->max_dest_rd_atomic;