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

Commit ac9ef8cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull rdma qedr RoCE driver from Doug Ledford:
 "Early on in the merge window I mentioned I had a backlog of new
  drivers waiting to be reviewed and that, in addition to the hns-roce
  driver, I wanted to get possible a couple more reviewed. I ended up
  only having the time to complete one of the additional drivers.

  During Dave Miller's pull request this go around, there were a series
  of 9 patches to the QLogic qed net driver that add basic support for a
  paired RoCE driver. That support is currently not functional because
  it is missing the matching RoCE driver in the RDMA subsystem. I
  managed to finish that review. However, because it goes against part
  of Dave's net pull, and a part that was accepted a day or two after
  the merge window opened, to apply cleanly it has to be applied to
  either the tip of Dave's net branch, or as I did in this case, I just
  applied it to your master after you had taken Dave's pull request."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  qedr: Add events support and register IB device
  qedr: Add GSI support
  qedr: Add LL2 RoCE interface
  qedr: Add support for data path
  qedr: Add support for memory registeration verbs
  qedr: Add support for QP verbs
  qedr: Add support for PD,PKEY and CQ verbs
  qedr: Add support for user context verbs
  qedr: Add support for RoCE HW init
  qedr: Add RoCE driver framework
parents b292fb80 993d1b52
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -89,4 +89,6 @@ source "drivers/infiniband/sw/rxe/Kconfig"

source "drivers/infiniband/hw/hfi1/Kconfig"

source "drivers/infiniband/hw/qedr/Kconfig"

endif # INFINIBAND
+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma/
obj-$(CONFIG_INFINIBAND_USNIC)		+= usnic/
obj-$(CONFIG_INFINIBAND_HFI1)		+= hfi1/
obj-$(CONFIG_INFINIBAND_HNS)		+= hns/
obj-$(CONFIG_INFINIBAND_QEDR)		+= qedr/
+7 −0
Original line number Diff line number Diff line
config INFINIBAND_QEDR
	tristate "QLogic RoCE driver"
	depends on 64BIT && QEDE
	select QED_LL2
	---help---
	  This driver provides low-level InfiniBand over Ethernet
	  support for QLogic QED host channel adapters (HCAs).
+3 −0
Original line number Diff line number Diff line
obj-$(CONFIG_INFINIBAND_QEDR) := qedr.o

qedr-y := main.o verbs.o qedr_cm.o
+914 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading