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

Commit 9510b066 authored by Shiraz Saleem's avatar Shiraz Saleem Committed by Doug Ledford
Browse files

RDMA/i40iw: Fixes for WQE alignment 



Invalidation after every WQE write is changed to invalidate
only if required. NOPs are padded so that WQE writes are
aligned to 64B boundary.

Signed-off-by: default avatarTatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: default avatarFaisal Latif <faisal.latif@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent c2b75ef7

drivers/infiniband/hw/i40iw/i40iw_d.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1512,6 +1512,8 @@ enum i40iw_alignment { 
	I40IW_SD_BUF_ALIGNMENT =	0x100

	I40IW_SD_BUF_ALIGNMENT =	0x100

};

};





#define I40IW_WQE_SIZE_64	64



#define I40IW_QP_WQE_MIN_SIZE	32

#define I40IW_QP_WQE_MIN_SIZE	32

#define I40IW_QP_WQE_MAX_SIZE	128

#define I40IW_QP_WQE_MAX_SIZE	128

drivers/infiniband/hw/i40iw/i40iw_uk.c

+16 −2
Original line number Original line Diff line number Diff line
@@ -162,6 +162,17 @@ u64 *i40iw_qp_get_next_send_wqe(struct i40iw_qp_uk *qp, 
		if (!*wqe_idx)

		if (!*wqe_idx)

			qp->swqe_polarity = !qp->swqe_polarity;

			qp->swqe_polarity = !qp->swqe_polarity;

	}

	}



	if (((*wqe_idx & 3) == 1) && (wqe_size == I40IW_WQE_SIZE_64)) {

		i40iw_nop_1(qp);

		I40IW_RING_MOVE_HEAD(qp->sq_ring, ret_code);

		if (ret_code)

			return NULL;

		*wqe_idx = I40IW_RING_GETCURRENT_HEAD(qp->sq_ring);

		if (!*wqe_idx)

			qp->swqe_polarity = !qp->swqe_polarity;

	}



	for (i = 0; i < wqe_size / I40IW_QP_WQE_MIN_SIZE; i++) {

	for (i = 0; i < wqe_size / I40IW_QP_WQE_MIN_SIZE; i++) {

		I40IW_RING_MOVE_HEAD(qp->sq_ring, ret_code);

		I40IW_RING_MOVE_HEAD(qp->sq_ring, ret_code);

		if (ret_code)

		if (ret_code)
@@ -172,8 +183,11 @@ u64 *i40iw_qp_get_next_send_wqe(struct i40iw_qp_uk *qp, 




	peek_head = I40IW_RING_GETCURRENT_HEAD(qp->sq_ring);

	peek_head = I40IW_RING_GETCURRENT_HEAD(qp->sq_ring);

	wqe_0 = qp->sq_base[peek_head].elem;

	wqe_0 = qp->sq_base[peek_head].elem;

	if (peek_head & 0x3)



	if (((peek_head & 3) == 1) || ((peek_head & 3) == 3)) {

		if (RS_64(wqe_0[3], I40IWQPSQ_VALID) != !qp->swqe_polarity)

			wqe_0[3] = LS_64(!qp->swqe_polarity, I40IWQPSQ_VALID);

			wqe_0[3] = LS_64(!qp->swqe_polarity, I40IWQPSQ_VALID);

	}





	qp->sq_wrtrk_array[*wqe_idx].wrid = wr_id;

	qp->sq_wrtrk_array[*wqe_idx].wrid = wr_id;

	qp->sq_wrtrk_array[*wqe_idx].wr_len = total_size;

	qp->sq_wrtrk_array[*wqe_idx].wr_len = total_size;