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

Commit 4eadd8ff authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/qib,rdmavt: Move smi_ah to qib 



Rdmavt adopted an smi_ah from qib which is not needed by hfi1. Move this
back to qib and get it out of the common library.

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarJubin John <jubin.john@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 611ac099

drivers/infiniband/hw/qib/qib_iba7322.c

+5 −5
Original line number Diff line number Diff line
@@ -2910,8 +2910,8 @@ static void qib_setup_7322_cleanup(struct qib_devdata *dd) 
			spin_unlock_irqrestore(&dd->cspec->gpio_lock, flags);

			qib_qsfp_deinit(&dd->pport[i].cpspec->qsfp_data);

		}

		if (dd->pport[i].ibport_data.rvp.smi_ah)

			ib_destroy_ah(&dd->pport[i].ibport_data.rvp.smi_ah->ibah);

		if (dd->pport[i].ibport_data.smi_ah)

			ib_destroy_ah(&dd->pport[i].ibport_data.smi_ah->ibah);

	}

}
@@ -5507,7 +5507,7 @@ static void try_7322_ipg(struct qib_pportdata *ppd) 
	if (IS_ERR(send_buf))

		goto retry;



	if (!ibp->rvp.smi_ah) {

	if (!ibp->smi_ah) {

		struct ib_ah *ah;



		ah = qib_create_qp0_ah(ibp, be16_to_cpu(IB_LID_PERMISSIVE));
@@ -5515,11 +5515,11 @@ static void try_7322_ipg(struct qib_pportdata *ppd) 
			ret = PTR_ERR(ah);

		else {

			send_buf->ah = ah;

			ibp->rvp.smi_ah = ibah_to_rvtah(ah);

			ibp->smi_ah = ibah_to_rvtah(ah);

			ret = 0;

		}

	} else {

		send_buf->ah = &ibp->rvp.smi_ah->ibah;

		send_buf->ah = &ibp->smi_ah->ibah;

		ret = 0;

	}

drivers/infiniband/hw/qib/qib_verbs.h

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ struct qib_pma_counters { 


struct qib_ibport {

	struct rvt_ibport rvp;

	struct rvt_ah *smi_ah;

	__be64 guids[QIB_GUIDS_PER_PORT	- 1];	/* writable GUIDs */

	struct qib_pma_counters __percpu *pmastats;

	u64 z_unicast_xmit;     /* starting count for PMA */

include/rdma/rdma_vt.h

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct rvt_ibport { 
	u16 *pkey_table;



	struct rvt_ah *sm_ah;

	struct rvt_ah *smi_ah;

};



#define RVT_CQN_MAX 16 /* maximum length of cq name */