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

Commit b496fe82 authored by Steve Wise's avatar Steve Wise Committed by Roland Dreier
Browse files

RDMA/cxgb3: Set the appropriate IO channel in rdma_init work requests 



Signed-off-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 3793d2fc

drivers/infiniband/hw/cxgb3/cxio_hal.c

+3 −1
Original line number Diff line number Diff line
@@ -852,7 +852,9 @@ int cxio_rdma_init(struct cxio_rdev *rdev_p, struct t3_rdma_init_attr *attr) 
	wqe->qpcaps = attr->qpcaps;

	wqe->ulpdu_size = cpu_to_be16(attr->tcp_emss);

	wqe->rqe_count = cpu_to_be16(attr->rqe_count);

	wqe->flags_rtr_type = cpu_to_be16(attr->flags|V_RTR_TYPE(attr->rtr_type));

	wqe->flags_rtr_type = cpu_to_be16(attr->flags |

					  V_RTR_TYPE(attr->rtr_type) |

					  V_CHAN(attr->chan));

	wqe->ord = cpu_to_be32(attr->ord);

	wqe->ird = cpu_to_be32(attr->ird);

	wqe->qp_dma_addr = cpu_to_be64(attr->qp_dma_addr);

drivers/infiniband/hw/cxgb3/cxio_wr.h

+6 −0
Original line number Diff line number Diff line
@@ -327,6 +327,11 @@ enum rdma_init_rtr_types { 
#define V_RTR_TYPE(x)	((x) << S_RTR_TYPE)

#define G_RTR_TYPE(x)	((((x) >> S_RTR_TYPE)) & M_RTR_TYPE)



#define S_CHAN		4

#define M_CHAN		0x3

#define V_CHAN(x)	((x) << S_CHAN)

#define G_CHAN(x)	((((x) >> S_CHAN)) & M_CHAN)



struct t3_rdma_init_attr {

	u32 tid;

	u32 qpid;
@@ -346,6 +351,7 @@ struct t3_rdma_init_attr { 
	u16 flags;

	u16 rqe_count;

	u32 irs;

	u32 chan;

};



struct t3_rdma_init_wr {

drivers/infiniband/hw/cxgb3/iwch_qp.c

+1 −0
Original line number Diff line number Diff line
@@ -889,6 +889,7 @@ static int rdma_init(struct iwch_dev *rhp, struct iwch_qp *qhp, 
	init_attr.qp_dma_size = (1UL << qhp->wq.size_log2);

	init_attr.rqe_count = iwch_rqes_posted(qhp);

	init_attr.flags = qhp->attr.mpa_attr.initiator ? MPA_INITIATOR : 0;

	init_attr.chan = qhp->ep->l2t->smt_idx;

	if (peer2peer) {

		init_attr.rtr_type = RTR_READ;

		if (init_attr.ord == 0 && qhp->attr.mpa_attr.initiator)