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

Commit 634c5796 authored by Mahesh Vardhamanaiah's avatar Mahesh Vardhamanaiah Committed by Roland Dreier
Browse files

RDMA/ocrdma: Correct queue SGE calculation 



Fix max sge calculation for sq, rq, srq for all hardware types.

Signed-off-by: default avatarMahesh Vardhamanaiah <mahesh.vardhamanaiah@emulex.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 07bb5424

drivers/infiniband/hw/ocrdma/ocrdma.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct ocrdma_dev_attr { 
	u32 max_inline_data;

	int max_send_sge;

	int max_recv_sge;

	int max_srq_sge;

	int max_mr;

	u64 max_mr_size;

	u32 max_num_mr_pbl;

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,9 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, 
	attr->max_recv_sge = (rsp->max_write_send_sge &

			      OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >>

	    OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT;

	attr->max_srq_sge = (rsp->max_srq_rqe_sge &

			      OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_MASK) >>

	    OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET;

	attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp &

				OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >>

	    OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT;

drivers/infiniband/hw/ocrdma/ocrdma_sli.h

+3 −0
Original line number Diff line number Diff line
@@ -418,6 +418,9 @@ enum { 


	OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT		= 0,

	OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK		= 0xFFFF,

	OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT	= 16,

	OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_MASK		= 0xFFFF <<

				OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT,



	OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT	= 0,

	OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK	= 0xFFFF,

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

+3 −3
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr) 
					IB_DEVICE_SHUTDOWN_PORT |

					IB_DEVICE_SYS_IMAGE_GUID |

					IB_DEVICE_LOCAL_DMA_LKEY;

	attr->max_sge = dev->attr.max_send_sge;

	attr->max_sge_rd = dev->attr.max_send_sge;

	attr->max_sge = min(dev->attr.max_send_sge, dev->attr.max_srq_sge);

	attr->max_sge_rd = 0;

	attr->max_cq = dev->attr.max_cq;

	attr->max_cqe = dev->attr.max_cqe;

	attr->max_mr = dev->attr.max_mr;
@@ -97,7 +97,7 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr) 
	    min(dev->attr.max_ord_per_qp, dev->attr.max_ird_per_qp);

	attr->max_qp_init_rd_atom = dev->attr.max_ord_per_qp;

	attr->max_srq = (dev->attr.max_qp - 1);

	attr->max_srq_sge = attr->max_sge;

	attr->max_srq_sge = attr->max_srq_sge;

	attr->max_srq_wr = dev->attr.max_rqe;

	attr->local_ca_ack_delay = dev->attr.local_ca_ack_delay;

	attr->max_fast_reg_page_list_len = 0;