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

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

staging/rdma/hfi1: 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 hfi1.

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 530a5d8e

drivers/staging/rdma/hfi1/Kconfig

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

	tristate "Intel OPA Gen1 support"

	depends on X86_64

	depends on X86_64 && INFINIBAND_RDMAVT

	select MMU_NOTIFIER

	default m

	---help---

drivers/staging/rdma/hfi1/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -9925,7 +9925,7 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state) 
			sdma_all_running(dd);



			/* Signal the IB layer that the port has went active */

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

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

			event.element.port_num = ppd->port;

			event.event = IB_EVENT_PORT_ACTIVE;

		}

drivers/staging/rdma/hfi1/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static ssize_t hfi1_snoop_write(struct file *fp, const char __user *data, 
			vl = sc4;

		} else {

			sl = (byte_two >> 4) & 0xf;

			ibp = to_iport(&dd->verbs_dev.ibdev, 1);

			ibp = to_iport(&dd->verbs_dev.rdi.ibdev, 1);

			sc5 = ibp->sl_to_sc[sl];

			vl = sc_to_vlt(dd, sc5);

			if (vl != sc4) {

drivers/staging/rdma/hfi1/hfi.h

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ 
#include <linux/cdev.h>

#include <linux/delay.h>

#include <linux/kthread.h>

#include <linux/mmu_notifier.h>

#include <linux/rbtree.h>

#include <rdma/rdma_vt.h>



#include "chip_registers.h"

#include "common.h"

drivers/staging/rdma/hfi1/init.c

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

#include <linux/printk.h>

#include <linux/hrtimer.h>

#include <rdma/rdma_vt.h>



#include "hfi.h"

#include "device.h"
@@ -983,7 +984,7 @@ void hfi1_free_devdata(struct hfi1_devdata *dd) 
	rcu_barrier(); /* wait for rcu callbacks to complete */

	free_percpu(dd->int_counter);

	free_percpu(dd->rcv_limit);

	ib_dealloc_device(&dd->verbs_dev.ibdev);

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

}



/*
@@ -1079,7 +1080,7 @@ struct hfi1_devdata *hfi1_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);

}