Commit c239a5b5 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

staging/rdma/hfi1: remove s_rdma_mr 



It can be conveyed in the verbs_txreq.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent bb5df5f9

drivers/staging/rdma/hfi1/rc.c

+6 −6
Original line number Diff line number Diff line
@@ -266,9 +266,9 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
				goto bail;

			}

			/* Copy SGE state in case we need to resend */

			qp->s_rdma_mr = e->rdma_sge.mr;

			if (qp->s_rdma_mr)

				rvt_get_mr(qp->s_rdma_mr);

			ps->s_txreq->mr = e->rdma_sge.mr;

			if (ps->s_txreq->mr)

				rvt_get_mr(ps->s_txreq->mr);

			qp->s_ack_rdma_sge.sge = e->rdma_sge;

			qp->s_ack_rdma_sge.num_sge = 1;

			qp->s_cur_sge = &qp->s_ack_rdma_sge;
@@ -305,9 +305,9 @@ static int make_rc_ack(struct hfi1_ibdev *dev, struct rvt_qp *qp, 
		/* FALLTHROUGH */

	case OP(RDMA_READ_RESPONSE_MIDDLE):

		qp->s_cur_sge = &qp->s_ack_rdma_sge;

		qp->s_rdma_mr = qp->s_ack_rdma_sge.sge.mr;

		if (qp->s_rdma_mr)

			rvt_get_mr(qp->s_rdma_mr);

		ps->s_txreq->mr = qp->s_ack_rdma_sge.sge.mr;

		if (ps->s_txreq->mr)

			rvt_get_mr(ps->s_txreq->mr);

		len = qp->s_ack_rdma_sge.sge.sge_length;

		if (len > pmtu) {

			len = pmtu;

drivers/staging/rdma/hfi1/verbs.c

+0 −8
Original line number Diff line number Diff line
@@ -728,9 +728,6 @@ int hfi1_verbs_send_dma(struct rvt_qp *qp, struct hfi1_pkt_state *ps, 
		pbc = create_pbc(ppd, pbc_flags, qp->srate_mbps, vl, plen);

	}

	tx->wqe = qp->s_wqe;

	tx->mr = qp->s_rdma_mr;

	if (qp->s_rdma_mr)

		qp->s_rdma_mr = NULL;

	tx->hdr_dwords = hdrwords + 2;

	ret = build_verbs_tx_desc(tx->sde, ss, len, tx, ahdr, pbc);

	if (unlikely(ret))
@@ -889,11 +886,6 @@ int hfi1_verbs_send_pio(struct rvt_qp *qp, struct hfi1_pkt_state *ps, 
	trace_output_ibhdr(dd_from_ibdev(qp->ibqp.device),

			   &ps->s_txreq->phdr.hdr);



	if (qp->s_rdma_mr) {

		rvt_put_mr(qp->s_rdma_mr);

		qp->s_rdma_mr = NULL;

	}



pio_bail:

	if (qp->s_wqe) {

		spin_lock_irqsave(&qp->s_lock, flags);