Commit 5190f052 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Jason Gunthorpe
Browse files

IB/hfi1: Allow the driver to initialize QP priv struct 



This patch adds an interface to allow the driver to initialize the QP priv
struct when the QP is created and after the qpn has been assigned.  A
field is added to the QP priv struct to reference the rcd and two new
files are added to contain the function to initialize the rcd field so
that more TID RDMA related code can be added here later.

Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarKaike Wan <kaike.wan@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent d2e9ace4

drivers/infiniband/hw/hfi1/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ hfi1-y := \ 
	ruc.o \

	sdma.o \

	sysfs.o \

	tid_rdma.o \

	trace.o \

	uc.o \

	ud.o \

drivers/infiniband/hw/hfi1/tid_rdma.c

0 → 100644
+48 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)

/*

 * Copyright(c) 2018 Intel Corporation.

 *

 */



#include "hfi.h"

#include "verbs.h"

#include "tid_rdma.h"



/**

 * qp_to_rcd - determine the receive context used by a qp

 * @qp - the qp

 *

 * This routine returns the receive context associated

 * with a a qp's qpn.

 *

 * Returns the context.

 */

static struct hfi1_ctxtdata *qp_to_rcd(struct rvt_dev_info *rdi,

				       struct rvt_qp *qp)

{

	struct hfi1_ibdev *verbs_dev = container_of(rdi,

						    struct hfi1_ibdev,

						    rdi);

	struct hfi1_devdata *dd = container_of(verbs_dev,

					       struct hfi1_devdata,

					       verbs_dev);

	unsigned int ctxt;



	if (qp->ibqp.qp_num == 0)

		ctxt = 0;

	else

		ctxt = ((qp->ibqp.qp_num >> dd->qos_shift) %

			(dd->n_krcv_queues - 1)) + 1;



	return dd->rcd[ctxt];

}



int hfi1_qp_priv_init(struct rvt_dev_info *rdi, struct rvt_qp *qp,

		      struct ib_qp_init_attr *init_attr)

{

	struct hfi1_qp_priv *qpriv = qp->priv;



	qpriv->rcd = qp_to_rcd(rdi, qp);



	return 0;

}

drivers/infiniband/hw/hfi1/tid_rdma.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */

/*

 * Copyright(c) 2018 Intel Corporation.

 *

 */

#ifndef HFI1_TID_RDMA_H

#define HFI1_TID_RDMA_H



int hfi1_qp_priv_init(struct rvt_dev_info *rdi, struct rvt_qp *qp,

		      struct ib_qp_init_attr *init_attr);



#endif /* HFI1_TID_RDMA_H */

drivers/infiniband/hw/hfi1/verbs.c

+1 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,7 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd) 
	dd->verbs_dev.rdi.dparms.max_mad_size = OPA_MGMT_MAD_SIZE;



	dd->verbs_dev.rdi.driver_f.qp_priv_alloc = qp_priv_alloc;

	dd->verbs_dev.rdi.driver_f.qp_priv_init = hfi1_qp_priv_init;

	dd->verbs_dev.rdi.driver_f.qp_priv_free = qp_priv_free;

	dd->verbs_dev.rdi.driver_f.free_all_qps = free_all_qps;

	dd->verbs_dev.rdi.driver_f.notify_qp_reset = notify_qp_reset;

drivers/infiniband/hw/hfi1/verbs.h

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ struct hfi1_devdata; 
struct hfi1_packet;



#include "iowait.h"

#include "tid_rdma.h"



#define HFI1_MAX_RDMA_ATOMIC     16
@@ -156,6 +157,7 @@ struct hfi1_qp_priv { 
	struct hfi1_ahg_info *s_ahg;              /* ahg info for next header */

	struct sdma_engine *s_sde;                /* current sde */

	struct send_context *s_sendcontext;       /* current sendcontext */

	struct hfi1_ctxtdata *rcd;                /* QP's receive context */

	u8 s_sc;		                  /* SC[0..4] for next packet */

	struct iowait s_iowait;

	struct rvt_qp *owner;

CRA Git | Maintained and supported by SUSTech CRA and CCSE