Commit e535c699 authored by Roland Dreier's avatar Roland Dreier
Browse files

IB/mthca: Factor out setting WQE UD segment entries 


    
Factor code to set UD entries out of the work request posting
functions into inline functions set_tavor_ud_seg() and
set_arbel_ud_seg().  This doesn't change the generated code in any
significant way, and makes the source easier on the eyes.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 400ddc11

drivers/infiniband/hw/mthca/mthca_qp.c

+22 −18
Original line number Diff line number Diff line
@@ -1599,6 +1599,24 @@ static __always_inline void set_atomic_seg(struct mthca_atomic_seg *aseg, 


}



static void set_tavor_ud_seg(struct mthca_tavor_ud_seg *useg,

			     struct ib_send_wr *wr)

{

	useg->lkey    = cpu_to_be32(to_mah(wr->wr.ud.ah)->key);

	useg->av_addr =	cpu_to_be64(to_mah(wr->wr.ud.ah)->avdma);

	useg->dqpn    =	cpu_to_be32(wr->wr.ud.remote_qpn);

	useg->qkey    =	cpu_to_be32(wr->wr.ud.remote_qkey);



}



static void set_arbel_ud_seg(struct mthca_arbel_ud_seg *useg,

			     struct ib_send_wr *wr)

{

	memcpy(useg->av, to_mah(wr->wr.ud.ah)->av, MTHCA_AV_SIZE);

	useg->dqpn = cpu_to_be32(wr->wr.ud.remote_qpn);

	useg->qkey = cpu_to_be32(wr->wr.ud.remote_qkey);

}



int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,

			  struct ib_send_wr **bad_wr)

{
@@ -1707,15 +1725,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			break;



		case UD:

			((struct mthca_tavor_ud_seg *) wqe)->lkey =

				cpu_to_be32(to_mah(wr->wr.ud.ah)->key);

			((struct mthca_tavor_ud_seg *) wqe)->av_addr =

				cpu_to_be64(to_mah(wr->wr.ud.ah)->avdma);

			((struct mthca_tavor_ud_seg *) wqe)->dqpn =

				cpu_to_be32(wr->wr.ud.remote_qpn);

			((struct mthca_tavor_ud_seg *) wqe)->qkey =

				cpu_to_be32(wr->wr.ud.remote_qkey);



			set_tavor_ud_seg(wqe, wr);

			wqe  += sizeof (struct mthca_tavor_ud_seg);

			size += sizeof (struct mthca_tavor_ud_seg) / 16;

			break;
@@ -2064,13 +2074,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
			break;



		case UD:

			memcpy(((struct mthca_arbel_ud_seg *) wqe)->av,

			       to_mah(wr->wr.ud.ah)->av, MTHCA_AV_SIZE);

			((struct mthca_arbel_ud_seg *) wqe)->dqpn =

				cpu_to_be32(wr->wr.ud.remote_qpn);

			((struct mthca_arbel_ud_seg *) wqe)->qkey =

				cpu_to_be32(wr->wr.ud.remote_qkey);



			set_arbel_ud_seg(wqe, wr);

			wqe  += sizeof (struct mthca_arbel_ud_seg);

			size += sizeof (struct mthca_arbel_ud_seg) / 16;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE