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

Commit 15723f06 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Use address handle in rdmavt and remove from hfi1 



Original patch from Kamal Heib <kamalh@mellanox.com>, split
apart from original and modified to accomodate recent changes
in rdmavt.

Remove AH from hfi1 and use rdmavt version.

Signed-off-by: default avatarKamal Heib <kamalh@mellanox.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 8859b4a6

drivers/staging/rdma/hfi1/common.h

+0 −2
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ struct hfi1_message_header { 
#define FULL_MGMT_P_KEY      0xFFFF



#define DEFAULT_P_KEY LIM_MGMT_P_KEY

#define HFI1_PERMISSIVE_LID 0xFFFF

#define HFI1_AETH_CREDIT_SHIFT 24

#define HFI1_AETH_CREDIT_MASK 0x1F

#define HFI1_AETH_CREDIT_INVAL 0x1F
@@ -353,7 +352,6 @@ struct hfi1_message_header { 
#define HFI1_BECN_SHIFT 30

#define HFI1_BECN_MASK 1

#define HFI1_BECN_SMASK BIT(HFI1_BECN_SHIFT)

#define HFI1_MULTICAST_LID_BASE 0xC000



static inline __u64 rhf_to_cpu(const __le32 *rbuf)

{

drivers/staging/rdma/hfi1/mad.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void send_trap(struct hfi1_ibport *ibp, void *data, unsigned len) 
				ret = PTR_ERR(ah);

			else {

				send_buf->ah = ah;

				ibp->sm_ah = to_iah(ah);

				ibp->sm_ah = ibah_to_rvtah(ah);

				ret = 0;

			}

		} else

drivers/staging/rdma/hfi1/qp.c

+3 −3
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ static void clear_mr_refs(struct hfi1_qp *qp, int clr_sends) 
			if (qp->ibqp.qp_type == IB_QPT_UD ||

			    qp->ibqp.qp_type == IB_QPT_SMI ||

			    qp->ibqp.qp_type == IB_QPT_GSI)

				atomic_dec(&to_iah(wqe->ud_wr.ah)->refcount);

				atomic_dec(&ibah_to_rvtah(wqe->ud_wr.ah)->refcount);

			if (++qp->s_last >= qp->s_size)

				qp->s_last = 0;

		}
@@ -642,7 +642,7 @@ int hfi1_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 


		if (attr->ah_attr.dlid >= be16_to_cpu(IB_MULTICAST_LID_BASE))

			goto inval;

		if (hfi1_check_ah(qp->ibqp.device, &attr->ah_attr))

		if (rvt_check_ah(qp->ibqp.device, &attr->ah_attr))

			goto inval;

		sc = ah_to_sc(ibqp->device, &attr->ah_attr);

		if (!qp_to_sdma_engine(qp, sc) &&
@@ -656,7 +656,7 @@ int hfi1_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		if (attr->alt_ah_attr.dlid >=

		    be16_to_cpu(IB_MULTICAST_LID_BASE))

			goto inval;

		if (hfi1_check_ah(qp->ibqp.device, &attr->alt_ah_attr))

		if (rvt_check_ah(qp->ibqp.device, &attr->alt_ah_attr))

			goto inval;

		if (attr->alt_pkey_index >= hfi1_get_npkeys(dd))

			goto inval;

drivers/staging/rdma/hfi1/ruc.c

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ void hfi1_send_complete(struct hfi1_qp *qp, struct hfi1_swqe *wqe, 
	if (qp->ibqp.qp_type == IB_QPT_UD ||

	    qp->ibqp.qp_type == IB_QPT_SMI ||

	    qp->ibqp.qp_type == IB_QPT_GSI)

		atomic_dec(&to_iah(wqe->ud_wr.ah)->refcount);

		atomic_dec(&ibah_to_rvtah(wqe->ud_wr.ah)->refcount);



	/* See ch. 11.2.4.1 and 10.7.3.1 */

	if (!(qp->s_flags & HFI1_S_SIGNAL_REQ_WR) ||

drivers/staging/rdma/hfi1/ud.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void ud_loopback(struct hfi1_qp *sqp, struct hfi1_swqe *swqe) 
		goto drop;

	}



	ah_attr = &to_iah(swqe->ud_wr.ah)->attr;

	ah_attr = &ibah_to_rvtah(swqe->ud_wr.ah)->attr;

	ppd = ppd_from_ibp(ibp);



	if (qp->ibqp.qp_num > 1) {
@@ -309,7 +309,7 @@ int hfi1_make_ud_req(struct hfi1_qp *qp) 
	/* Construct the header. */

	ibp = to_iport(qp->ibqp.device, qp->port_num);

	ppd = ppd_from_ibp(ibp);

	ah_attr = &to_iah(wqe->ud_wr.ah)->attr;

	ah_attr = &ibah_to_rvtah(wqe->ud_wr.ah)->attr;

	if (ah_attr->dlid < be16_to_cpu(IB_MULTICAST_LID_BASE) ||

	    ah_attr->dlid == be16_to_cpu(IB_LID_PERMISSIVE)) {

		lid = ah_attr->dlid & ~((1 << ppd->lmc) - 1);