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

Commit 649fe4ae authored by Chien Tung's avatar Chien Tung Committed by Roland Dreier
Browse files

RDMA/nes: Add support for IB_WR_*INV 



Add support for IB_WR_SEND_WITH_INV, IB_WR_RDMA_READ_WITH_INV
and IB_WR_LOCAL_INV.

Signed-off-by: default avatarChien Tung <chien.tin.tung@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 4293fdc1

drivers/infiniband/hw/nes/nes_verbs.c

+113 −90
Original line number Diff line number Diff line
@@ -3373,18 +3373,12 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
	struct nes_device *nesdev = nesvnic->nesdev;

	struct nes_qp *nesqp = to_nesqp(ibqp);

	struct nes_hw_qp_wqe *wqe;

	int err;

	int err = 0;

	u32 qsize = nesqp->hwqp.sq_size;

	u32 head;

	u32 wqe_misc;

	u32 wqe_count;

	u32 wqe_misc = 0;

	u32 wqe_count = 0;

	u32 counter;

	u32 total_payload_length;



	err = 0;

	wqe_misc = 0;

	wqe_count = 0;

	total_payload_length = 0;



	if (nesqp->ibqp_state > IB_QPS_RTS) {

		err = -EINVAL;
@@ -3417,18 +3411,30 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
					u64temp);

		switch (ib_wr->opcode) {

		case IB_WR_SEND:

					if (ib_wr->send_flags & IB_SEND_SOLICITED) {

		case IB_WR_SEND_WITH_INV:

			if (IB_WR_SEND == ib_wr->opcode) {

				if (ib_wr->send_flags & IB_SEND_SOLICITED)

					wqe_misc = NES_IWARP_SQ_OP_SENDSE;

					} else {

				else

					wqe_misc = NES_IWARP_SQ_OP_SEND;

			} else {

				if (ib_wr->send_flags & IB_SEND_SOLICITED)

					wqe_misc = NES_IWARP_SQ_OP_SENDSEINV;

				else

					wqe_misc = NES_IWARP_SQ_OP_SENDINV;



				set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_INV_STAG_LOW_IDX,

						    ib_wr->ex.invalidate_rkey);

			}



			if (ib_wr->num_sge > nesdev->nesadapter->max_sge) {

				err = -EINVAL;

				break;

			}

					if (ib_wr->send_flags & IB_SEND_FENCE) {



			if (ib_wr->send_flags & IB_SEND_FENCE)

				wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;

					}



			if ((ib_wr->send_flags & IB_SEND_INLINE) &&

			    ((nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) == 0) &&

			     (ib_wr->sg_list[0].length <= 64)) {
@@ -3446,14 +3452,13 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
			wqe_misc = NES_IWARP_SQ_OP_RDMAW;

			if (ib_wr->num_sge > nesdev->nesadapter->max_sge) {

				nes_debug(NES_DBG_IW_TX, "Exceeded max sge, ib_wr=%u, max=%u\n",

								ib_wr->num_sge,

								nesdev->nesadapter->max_sge);

					  ib_wr->num_sge, nesdev->nesadapter->max_sge);

				err = -EINVAL;

				break;

			}

					if (ib_wr->send_flags & IB_SEND_FENCE) {



			if (ib_wr->send_flags & IB_SEND_FENCE)

				wqe_misc |= NES_IWARP_SQ_WQE_LOCAL_FENCE;

					}



			set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,

					    ib_wr->wr.rdma.rkey);
@@ -3471,10 +3476,12 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
			} else {

				fill_wqe_sg_send(wqe, ib_wr, 1);

			}



			wqe->wqe_words[NES_IWARP_SQ_WQE_RDMA_LENGTH_IDX] =

				wqe->wqe_words[NES_IWARP_SQ_WQE_TOTAL_PAYLOAD_IDX];

			break;

		case IB_WR_RDMA_READ:

		case IB_WR_RDMA_READ_WITH_INV:

			/* iWARP only supports 1 sge for RDMA reads */

			if (ib_wr->num_sge > 1) {

				nes_debug(NES_DBG_IW_TX, "Exceeded max sge, ib_wr=%u, max=1\n",
@@ -3482,7 +3489,14 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
				err = -EINVAL;

				break;

			}

			if (ib_wr->opcode == IB_WR_RDMA_READ) {

				wqe_misc = NES_IWARP_SQ_OP_RDMAR;

			} else {

				wqe_misc = NES_IWARP_SQ_OP_RDMAR_LOCINV;

				set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_INV_STAG_LOW_IDX,

						    ib_wr->ex.invalidate_rkey);

			}



			set_wqe_64bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_TO_LOW_IDX,

					    ib_wr->wr.rdma.remote_addr);

			set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_RDMA_STAG_IDX,
@@ -3494,6 +3508,12 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
			set_wqe_32bit_value(wqe->wqe_words, NES_IWARP_SQ_WQE_STAG0_IDX,

					    ib_wr->sg_list->lkey);

			break;

		case IB_WR_LOCAL_INV:

			wqe_misc = NES_IWARP_SQ_OP_LOCINV;

			set_wqe_32bit_value(wqe->wqe_words,

					    NES_IWARP_SQ_LOCINV_WQE_INV_STAG_IDX,

					    ib_wr->ex.invalidate_rkey);

			break;

		default:

			/* error */

			err = -EINVAL;
@@ -3729,6 +3749,9 @@ static int nes_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *entry) 
						nes_debug(NES_DBG_CQ, "Operation = Send.\n");

						entry->opcode = IB_WC_SEND;

						break;

					case NES_IWARP_SQ_OP_LOCINV:

						entry->opcode = IB_WR_LOCAL_INV;

						break;

				}



				nesqp->hwqp.sq_tail = (wqe_index+1)&(nesqp->hwqp.sq_size - 1);