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

Commit 8859b4a6 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

staging/rdma/hfi1: Use correct rdmavt header files after move. 



Rdmavt split the header files to be based on ibta object. This patch
makes changes in hfi1 to account for the move.

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

drivers/staging/rdma/hfi1/driver.c

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <linux/vmalloc.h>

#include <linux/module.h>

#include <linux/prefetch.h>

#include <rdma/ib_verbs.h>



#include "hfi.h"

#include "trace.h"
@@ -316,7 +317,7 @@ static void rcv_hdrerr(struct hfi1_ctxtdata *rcd, struct hfi1_pportdata *ppd, 


		/* Get the destination QP number. */

		qp_num = be32_to_cpu(ohdr->bth[1]) & HFI1_QPN_MASK;

		if (lid < HFI1_MULTICAST_LID_BASE) {

		if (lid < be16_to_cpu(IB_MULTICAST_LID_BASE)) {

			struct hfi1_qp *qp;

			unsigned long flags;

drivers/staging/rdma/hfi1/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ static int __subn_set_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data, 


	/* Must be a valid unicast LID address. */

	if ((lid == 0 && ls_old > IB_PORT_INIT) ||

	     lid >= HFI1_MULTICAST_LID_BASE) {

	     lid >= be16_to_cpu(IB_MULTICAST_LID_BASE)) {

		smp->status |= IB_SMP_INVALID_FIELD;

		pr_warn("SubnSet(OPA_PortInfo) lid invalid 0x%x\n",

			lid);
@@ -1130,7 +1130,7 @@ static int __subn_set_opa_portinfo(struct opa_smp *smp, u32 am, u8 *data, 


	/* Must be a valid unicast LID address. */

	if ((smlid == 0 && ls_old > IB_PORT_INIT) ||

	     smlid >= HFI1_MULTICAST_LID_BASE) {

	     smlid >= be16_to_cpu(IB_MULTICAST_LID_BASE)) {

		smp->status |= IB_SMP_INVALID_FIELD;

		pr_warn("SubnSet(OPA_PortInfo) smlid invalid 0x%x\n", smlid);

	} else if (smlid != ibp->sm_lid || msl != ibp->sm_sl) {

drivers/staging/rdma/hfi1/qp.c

+3 −2
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ int hfi1_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	if (attr_mask & IB_QP_AV) {

		u8 sc;



		if (attr->ah_attr.dlid >= HFI1_MULTICAST_LID_BASE)

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

			goto inval;

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

			goto inval;
@@ -653,7 +653,8 @@ int hfi1_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	if (attr_mask & IB_QP_ALT_PATH) {

		u8 sc;



		if (attr->alt_ah_attr.dlid >= HFI1_MULTICAST_LID_BASE)

		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))

			goto inval;

drivers/staging/rdma/hfi1/ud.c

+7 −7
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static void ud_loopback(struct hfi1_qp *sqp, struct hfi1_swqe *swqe) 
	wc.slid = ppd->lid | (ah_attr->src_path_bits & ((1 << ppd->lmc) - 1));

	/* Check for loopback when the port lid is not set */

	if (wc.slid == 0 && sqp->ibqp.qp_type == IB_QPT_GSI)

		wc.slid = HFI1_PERMISSIVE_LID;

		wc.slid = be16_to_cpu(IB_LID_PERMISSIVE);

	wc.sl = ah_attr->sl;

	wc.dlid_path_bits = ah_attr->dlid & ((1 << ppd->lmc) - 1);

	wc.port_num = qp->port_num;
@@ -310,11 +310,11 @@ int hfi1_make_ud_req(struct hfi1_qp *qp) 
	ibp = to_iport(qp->ibqp.device, qp->port_num);

	ppd = ppd_from_ibp(ibp);

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

	if (ah_attr->dlid < HFI1_MULTICAST_LID_BASE ||

	    ah_attr->dlid == HFI1_PERMISSIVE_LID) {

	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);

		if (unlikely(!loopback && (lid == ppd->lid ||

		    (lid == HFI1_PERMISSIVE_LID &&

		    (lid == be16_to_cpu(IB_LID_PERMISSIVE) &&

		     qp->ibqp.qp_type == IB_QPT_GSI)))) {

			/*

			 * If DMAs are in progress, we can't generate
@@ -666,8 +666,8 @@ void hfi1_ud_rcv(struct hfi1_packet *packet) 
	qkey = be32_to_cpu(ohdr->u.ud.deth[0]);

	src_qp = be32_to_cpu(ohdr->u.ud.deth[1]) & HFI1_QPN_MASK;

	dlid = be16_to_cpu(hdr->lrh[1]);

	is_mcast = (dlid > HFI1_MULTICAST_LID_BASE) &&

			(dlid != HFI1_PERMISSIVE_LID);

	is_mcast = (dlid > be16_to_cpu(IB_MULTICAST_LID_BASE)) &&

			(dlid != be16_to_cpu(IB_LID_PERMISSIVE));

	bth1 = be32_to_cpu(ohdr->bth[1]);

	if (unlikely(bth1 & HFI1_BECN_SMASK)) {

		/*
@@ -874,7 +874,7 @@ void hfi1_ud_rcv(struct hfi1_packet *packet) 
	/*

	 * Save the LMC lower bits if the destination LID is a unicast LID.

	 */

	wc.dlid_path_bits = dlid >= HFI1_MULTICAST_LID_BASE ? 0 :

	wc.dlid_path_bits = dlid >= be16_to_cpu(IB_MULTICAST_LID_BASE) ? 0 :

		dlid & ((1 << ppd_from_ibp(ibp)->lmc) - 1);

	wc.port_num = qp->port_num;

	/* Signal completion event if the solicited bit is set. */

drivers/staging/rdma/hfi1/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -646,8 +646,8 @@ void hfi1_ib_rcv(struct hfi1_packet *packet) 
	/* Get the destination QP number. */

	qp_num = be32_to_cpu(packet->ohdr->bth[1]) & HFI1_QPN_MASK;

	lid = be16_to_cpu(hdr->lrh[1]);

	if (unlikely((lid >= HFI1_MULTICAST_LID_BASE) &&

	    (lid != HFI1_PERMISSIVE_LID))) {

	if (unlikely((lid >= be16_to_cpu(IB_MULTICAST_LID_BASE)) &&

		     (lid != be16_to_cpu(IB_LID_PERMISSIVE)))) {

		struct hfi1_mcast *mcast;

		struct hfi1_mcast_qp *p;