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

Commit 2dc05ab5 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/qib: Begin to use rdmavt for verbs 



This patch begins to make use of rdmavt by registering with it and
providing access to the header files. This is just the beginning of
rdmavt support in qib.

Most functionality is still being done in the driver, set flags so that
rdmavt will let qib continue to handle mr, qp, and cq init.

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
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 38ce2c6f

drivers/infiniband/hw/qib/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_QIB

	tristate "Intel PCIe HCA support"

	depends on 64BIT

	depends on 64BIT && INFINIBAND_RDMAVT

	---help---

	This is a low-level driver for Intel PCIe QLE InfiniBand host

	channel adapters.  This driver does not support the Intel

drivers/infiniband/hw/qib/qib.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#include <linux/kref.h>

#include <linux/sched.h>

#include <linux/kthread.h>

#include <rdma/rdma_vt.h>



#include "qib_common.h"

#include "qib_verbs.h"

drivers/infiniband/hw/qib/qib_init.c

+3 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#ifdef CONFIG_INFINIBAND_QIB_DCA

#include <linux/dca.h>

#endif

#include <rdma/rdma_vt.h>



#include "qib.h"

#include "qib_common.h"
@@ -1081,7 +1082,7 @@ void qib_free_devdata(struct qib_devdata *dd) 
	qib_dbg_ibdev_exit(&dd->verbs_dev);

#endif

	free_percpu(dd->int_counter);

	ib_dealloc_device(&dd->verbs_dev.ibdev);

	ib_dealloc_device(&dd->verbs_dev.rdi.ibdev);

}



u64 qib_int_counter(struct qib_devdata *dd)
@@ -1171,7 +1172,7 @@ struct qib_devdata *qib_alloc_devdata(struct pci_dev *pdev, size_t extra) 
bail:

	if (!list_empty(&dd->list))

		list_del_init(&dd->list);

	ib_dealloc_device(&dd->verbs_dev.ibdev);

	ib_dealloc_device(&dd->verbs_dev.rdi.ibdev);

	return ERR_PTR(ret);

}

drivers/infiniband/hw/qib/qib_intr.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void signal_ib_event(struct qib_pportdata *ppd, enum ib_event_type ev) 
	struct ib_event event;

	struct qib_devdata *dd = ppd->dd;



	event.device = &dd->verbs_dev.ibdev;

	event.device = &dd->verbs_dev.rdi.ibdev;

	event.element.port_num = ppd->port;

	event.event = ev;

	ib_dispatch_event(&event);

drivers/infiniband/hw/qib/qib_mad.c

+3 −2
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ static int set_pkeys(struct qib_devdata *dd, u8 port, u16 *pkeys) 
		(void) dd->f_set_ib_cfg(ppd, QIB_IB_CFG_PKEYS, 0);



		event.event = IB_EVENT_PKEY_CHANGE;

		event.device = &dd->verbs_dev.ibdev;

		event.device = &dd->verbs_dev.rdi.ibdev;

		event.element.port_num = port;

		ib_dispatch_event(&event);

	}
@@ -2483,7 +2483,8 @@ int qib_create_agents(struct qib_ibdev *dev) 


	for (p = 0; p < dd->num_pports; p++) {

		ibp = &dd->pport[p].ibport_data;

		agent = ib_register_mad_agent(&dev->ibdev, p + 1, IB_QPT_SMI,

		agent = ib_register_mad_agent(&dev->rdi.ibdev, p + 1,

					      IB_QPT_SMI,

					      NULL, 0, send_handler,

					      NULL, NULL, 0);

		if (IS_ERR(agent)) {