Browse Source

IB/hfi1: Move driver out of staging

The TODO list for the hfi1 driver was completed during 4.6. In addition
other objections raised (which are far beyond what was in the TODO list)
have been addressed as well. It is now time to remove the driver from
staging and into the drivers/infiniband sub-tree.

Reviewed-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Dennis Dalessandro 9 years ago
parent
commit
f48ad614c1
67 changed files with 10 additions and 15 deletions
  1. 7 6
      MAINTAINERS
  2. 2 0
      drivers/infiniband/Kconfig
  3. 1 0
      drivers/infiniband/hw/Makefile
  4. 0 0
      drivers/infiniband/hw/hfi1/Kconfig
  5. 0 0
      drivers/infiniband/hw/hfi1/Makefile
  6. 0 0
      drivers/infiniband/hw/hfi1/affinity.c
  7. 0 0
      drivers/infiniband/hw/hfi1/affinity.h
  8. 0 0
      drivers/infiniband/hw/hfi1/aspm.h
  9. 0 0
      drivers/infiniband/hw/hfi1/chip.c
  10. 0 0
      drivers/infiniband/hw/hfi1/chip.h
  11. 0 0
      drivers/infiniband/hw/hfi1/chip_registers.h
  12. 0 0
      drivers/infiniband/hw/hfi1/common.h
  13. 0 0
      drivers/infiniband/hw/hfi1/debugfs.c
  14. 0 0
      drivers/infiniband/hw/hfi1/debugfs.h
  15. 0 0
      drivers/infiniband/hw/hfi1/device.c
  16. 0 0
      drivers/infiniband/hw/hfi1/device.h
  17. 0 0
      drivers/infiniband/hw/hfi1/dma.c
  18. 0 0
      drivers/infiniband/hw/hfi1/driver.c
  19. 0 0
      drivers/infiniband/hw/hfi1/efivar.c
  20. 0 0
      drivers/infiniband/hw/hfi1/efivar.h
  21. 0 0
      drivers/infiniband/hw/hfi1/eprom.c
  22. 0 0
      drivers/infiniband/hw/hfi1/eprom.h
  23. 0 0
      drivers/infiniband/hw/hfi1/file_ops.c
  24. 0 0
      drivers/infiniband/hw/hfi1/firmware.c
  25. 0 0
      drivers/infiniband/hw/hfi1/hfi.h
  26. 0 0
      drivers/infiniband/hw/hfi1/init.c
  27. 0 0
      drivers/infiniband/hw/hfi1/intr.c
  28. 0 0
      drivers/infiniband/hw/hfi1/iowait.h
  29. 0 0
      drivers/infiniband/hw/hfi1/mad.c
  30. 0 0
      drivers/infiniband/hw/hfi1/mad.h
  31. 0 0
      drivers/infiniband/hw/hfi1/mmu_rb.c
  32. 0 0
      drivers/infiniband/hw/hfi1/mmu_rb.h
  33. 0 0
      drivers/infiniband/hw/hfi1/opa_compat.h
  34. 0 0
      drivers/infiniband/hw/hfi1/pcie.c
  35. 0 0
      drivers/infiniband/hw/hfi1/pio.c
  36. 0 0
      drivers/infiniband/hw/hfi1/pio.h
  37. 0 0
      drivers/infiniband/hw/hfi1/pio_copy.c
  38. 0 0
      drivers/infiniband/hw/hfi1/platform.c
  39. 0 0
      drivers/infiniband/hw/hfi1/platform.h
  40. 0 0
      drivers/infiniband/hw/hfi1/qp.c
  41. 0 0
      drivers/infiniband/hw/hfi1/qp.h
  42. 0 0
      drivers/infiniband/hw/hfi1/qsfp.c
  43. 0 0
      drivers/infiniband/hw/hfi1/qsfp.h
  44. 0 0
      drivers/infiniband/hw/hfi1/rc.c
  45. 0 0
      drivers/infiniband/hw/hfi1/ruc.c
  46. 0 0
      drivers/infiniband/hw/hfi1/sdma.c
  47. 0 0
      drivers/infiniband/hw/hfi1/sdma.h
  48. 0 0
      drivers/infiniband/hw/hfi1/sdma_txreq.h
  49. 0 0
      drivers/infiniband/hw/hfi1/sysfs.c
  50. 0 0
      drivers/infiniband/hw/hfi1/trace.c
  51. 0 0
      drivers/infiniband/hw/hfi1/trace.h
  52. 0 0
      drivers/infiniband/hw/hfi1/twsi.c
  53. 0 0
      drivers/infiniband/hw/hfi1/twsi.h
  54. 0 0
      drivers/infiniband/hw/hfi1/uc.c
  55. 0 0
      drivers/infiniband/hw/hfi1/ud.c
  56. 0 0
      drivers/infiniband/hw/hfi1/user_exp_rcv.c
  57. 0 0
      drivers/infiniband/hw/hfi1/user_exp_rcv.h
  58. 0 0
      drivers/infiniband/hw/hfi1/user_pages.c
  59. 0 0
      drivers/infiniband/hw/hfi1/user_sdma.c
  60. 0 0
      drivers/infiniband/hw/hfi1/user_sdma.h
  61. 0 0
      drivers/infiniband/hw/hfi1/verbs.c
  62. 0 0
      drivers/infiniband/hw/hfi1/verbs.h
  63. 0 0
      drivers/infiniband/hw/hfi1/verbs_txreq.c
  64. 0 0
      drivers/infiniband/hw/hfi1/verbs_txreq.h
  65. 0 2
      drivers/staging/rdma/Kconfig
  66. 0 1
      drivers/staging/rdma/Makefile
  67. 0 6
      drivers/staging/rdma/hfi1/TODO

+ 7 - 6
MAINTAINERS

@@ -5086,6 +5086,13 @@ F:	drivers/block/cciss*
 F:	include/linux/cciss_ioctl.h
 F:	include/uapi/linux/cciss_ioctl.h
 
+HFI1 DRIVER
+M:	Mike Marciniszyn <mike.marciniszyn@intel.com>
+M:	Dennis Dalessandro <dennis.dalessandro@intel.com>
+L:	linux-rdma@vger.kernel.org
+S:	Supported
+F:	drivers/infiniband/hw/hfi1
+
 HFS FILESYSTEM
 L:	linux-fsdevel@vger.kernel.org
 S:	Orphan
@@ -10661,12 +10668,6 @@ M:	Arnaud Patard <arnaud.patard@rtp-net.org>
 S:	Odd Fixes
 F:	drivers/staging/xgifb/
 
-HFI1 DRIVER
-M:	Mike Marciniszyn <infinipath@intel.com>
-L:	linux-rdma@vger.kernel.org
-S:	Supported
-F:	drivers/staging/rdma/hfi1
-
 STARFIRE/DURALAN NETWORK DRIVER
 M:	Ion Badulescu <ionut@badula.org>
 S:	Odd Fixes

+ 2 - 0
drivers/infiniband/Kconfig

@@ -85,4 +85,6 @@ source "drivers/infiniband/ulp/isert/Kconfig"
 
 source "drivers/infiniband/sw/rdmavt/Kconfig"
 
+source "drivers/infiniband/hw/hfi1/Kconfig"
+
 endif # INFINIBAND

+ 1 - 0
drivers/infiniband/hw/Makefile

@@ -8,3 +8,4 @@ obj-$(CONFIG_MLX5_INFINIBAND)		+= mlx5/
 obj-$(CONFIG_INFINIBAND_NES)		+= nes/
 obj-$(CONFIG_INFINIBAND_OCRDMA)		+= ocrdma/
 obj-$(CONFIG_INFINIBAND_USNIC)		+= usnic/
+obj-$(CONFIG_INFINIBAND_HFI1)		+= hfi1/

+ 0 - 0
drivers/staging/rdma/hfi1/Kconfig → drivers/infiniband/hw/hfi1/Kconfig


+ 0 - 0
drivers/staging/rdma/hfi1/Makefile → drivers/infiniband/hw/hfi1/Makefile


+ 0 - 0
drivers/staging/rdma/hfi1/affinity.c → drivers/infiniband/hw/hfi1/affinity.c


+ 0 - 0
drivers/staging/rdma/hfi1/affinity.h → drivers/infiniband/hw/hfi1/affinity.h


+ 0 - 0
drivers/staging/rdma/hfi1/aspm.h → drivers/infiniband/hw/hfi1/aspm.h


+ 0 - 0
drivers/staging/rdma/hfi1/chip.c → drivers/infiniband/hw/hfi1/chip.c


+ 0 - 0
drivers/staging/rdma/hfi1/chip.h → drivers/infiniband/hw/hfi1/chip.h


+ 0 - 0
drivers/staging/rdma/hfi1/chip_registers.h → drivers/infiniband/hw/hfi1/chip_registers.h


+ 0 - 0
drivers/staging/rdma/hfi1/common.h → drivers/infiniband/hw/hfi1/common.h


+ 0 - 0
drivers/staging/rdma/hfi1/debugfs.c → drivers/infiniband/hw/hfi1/debugfs.c


+ 0 - 0
drivers/staging/rdma/hfi1/debugfs.h → drivers/infiniband/hw/hfi1/debugfs.h


+ 0 - 0
drivers/staging/rdma/hfi1/device.c → drivers/infiniband/hw/hfi1/device.c


+ 0 - 0
drivers/staging/rdma/hfi1/device.h → drivers/infiniband/hw/hfi1/device.h


+ 0 - 0
drivers/staging/rdma/hfi1/dma.c → drivers/infiniband/hw/hfi1/dma.c


+ 0 - 0
drivers/staging/rdma/hfi1/driver.c → drivers/infiniband/hw/hfi1/driver.c


+ 0 - 0
drivers/staging/rdma/hfi1/efivar.c → drivers/infiniband/hw/hfi1/efivar.c


+ 0 - 0
drivers/staging/rdma/hfi1/efivar.h → drivers/infiniband/hw/hfi1/efivar.h


+ 0 - 0
drivers/staging/rdma/hfi1/eprom.c → drivers/infiniband/hw/hfi1/eprom.c


+ 0 - 0
drivers/staging/rdma/hfi1/eprom.h → drivers/infiniband/hw/hfi1/eprom.h


+ 0 - 0
drivers/staging/rdma/hfi1/file_ops.c → drivers/infiniband/hw/hfi1/file_ops.c


+ 0 - 0
drivers/staging/rdma/hfi1/firmware.c → drivers/infiniband/hw/hfi1/firmware.c


+ 0 - 0
drivers/staging/rdma/hfi1/hfi.h → drivers/infiniband/hw/hfi1/hfi.h


+ 0 - 0
drivers/staging/rdma/hfi1/init.c → drivers/infiniband/hw/hfi1/init.c


+ 0 - 0
drivers/staging/rdma/hfi1/intr.c → drivers/infiniband/hw/hfi1/intr.c


+ 0 - 0
drivers/staging/rdma/hfi1/iowait.h → drivers/infiniband/hw/hfi1/iowait.h


+ 0 - 0
drivers/staging/rdma/hfi1/mad.c → drivers/infiniband/hw/hfi1/mad.c


+ 0 - 0
drivers/staging/rdma/hfi1/mad.h → drivers/infiniband/hw/hfi1/mad.h


+ 0 - 0
drivers/staging/rdma/hfi1/mmu_rb.c → drivers/infiniband/hw/hfi1/mmu_rb.c


+ 0 - 0
drivers/staging/rdma/hfi1/mmu_rb.h → drivers/infiniband/hw/hfi1/mmu_rb.h


+ 0 - 0
drivers/staging/rdma/hfi1/opa_compat.h → drivers/infiniband/hw/hfi1/opa_compat.h


+ 0 - 0
drivers/staging/rdma/hfi1/pcie.c → drivers/infiniband/hw/hfi1/pcie.c


+ 0 - 0
drivers/staging/rdma/hfi1/pio.c → drivers/infiniband/hw/hfi1/pio.c


+ 0 - 0
drivers/staging/rdma/hfi1/pio.h → drivers/infiniband/hw/hfi1/pio.h


+ 0 - 0
drivers/staging/rdma/hfi1/pio_copy.c → drivers/infiniband/hw/hfi1/pio_copy.c


+ 0 - 0
drivers/staging/rdma/hfi1/platform.c → drivers/infiniband/hw/hfi1/platform.c


+ 0 - 0
drivers/staging/rdma/hfi1/platform.h → drivers/infiniband/hw/hfi1/platform.h


+ 0 - 0
drivers/staging/rdma/hfi1/qp.c → drivers/infiniband/hw/hfi1/qp.c


+ 0 - 0
drivers/staging/rdma/hfi1/qp.h → drivers/infiniband/hw/hfi1/qp.h


+ 0 - 0
drivers/staging/rdma/hfi1/qsfp.c → drivers/infiniband/hw/hfi1/qsfp.c


+ 0 - 0
drivers/staging/rdma/hfi1/qsfp.h → drivers/infiniband/hw/hfi1/qsfp.h


+ 0 - 0
drivers/staging/rdma/hfi1/rc.c → drivers/infiniband/hw/hfi1/rc.c


+ 0 - 0
drivers/staging/rdma/hfi1/ruc.c → drivers/infiniband/hw/hfi1/ruc.c


+ 0 - 0
drivers/staging/rdma/hfi1/sdma.c → drivers/infiniband/hw/hfi1/sdma.c


+ 0 - 0
drivers/staging/rdma/hfi1/sdma.h → drivers/infiniband/hw/hfi1/sdma.h


+ 0 - 0
drivers/staging/rdma/hfi1/sdma_txreq.h → drivers/infiniband/hw/hfi1/sdma_txreq.h


+ 0 - 0
drivers/staging/rdma/hfi1/sysfs.c → drivers/infiniband/hw/hfi1/sysfs.c


+ 0 - 0
drivers/staging/rdma/hfi1/trace.c → drivers/infiniband/hw/hfi1/trace.c


+ 0 - 0
drivers/staging/rdma/hfi1/trace.h → drivers/infiniband/hw/hfi1/trace.h


+ 0 - 0
drivers/staging/rdma/hfi1/twsi.c → drivers/infiniband/hw/hfi1/twsi.c


+ 0 - 0
drivers/staging/rdma/hfi1/twsi.h → drivers/infiniband/hw/hfi1/twsi.h


+ 0 - 0
drivers/staging/rdma/hfi1/uc.c → drivers/infiniband/hw/hfi1/uc.c


+ 0 - 0
drivers/staging/rdma/hfi1/ud.c → drivers/infiniband/hw/hfi1/ud.c


+ 0 - 0
drivers/staging/rdma/hfi1/user_exp_rcv.c → drivers/infiniband/hw/hfi1/user_exp_rcv.c


+ 0 - 0
drivers/staging/rdma/hfi1/user_exp_rcv.h → drivers/infiniband/hw/hfi1/user_exp_rcv.h


+ 0 - 0
drivers/staging/rdma/hfi1/user_pages.c → drivers/infiniband/hw/hfi1/user_pages.c


+ 0 - 0
drivers/staging/rdma/hfi1/user_sdma.c → drivers/infiniband/hw/hfi1/user_sdma.c


+ 0 - 0
drivers/staging/rdma/hfi1/user_sdma.h → drivers/infiniband/hw/hfi1/user_sdma.h


+ 0 - 0
drivers/staging/rdma/hfi1/verbs.c → drivers/infiniband/hw/hfi1/verbs.c


+ 0 - 0
drivers/staging/rdma/hfi1/verbs.h → drivers/infiniband/hw/hfi1/verbs.h


+ 0 - 0
drivers/staging/rdma/hfi1/verbs_txreq.c → drivers/infiniband/hw/hfi1/verbs_txreq.c


+ 0 - 0
drivers/staging/rdma/hfi1/verbs_txreq.h → drivers/infiniband/hw/hfi1/verbs_txreq.h


+ 0 - 2
drivers/staging/rdma/Kconfig

@@ -22,6 +22,4 @@ menuconfig STAGING_RDMA
 # Please keep entries in alphabetic order
 if STAGING_RDMA
 
-source "drivers/staging/rdma/hfi1/Kconfig"
-
 endif

+ 0 - 1
drivers/staging/rdma/Makefile

@@ -1,2 +1 @@
 # Entries for RDMA_STAGING tree
-obj-$(CONFIG_INFINIBAND_HFI1)	+= hfi1/

+ 0 - 6
drivers/staging/rdma/hfi1/TODO

@@ -1,6 +0,0 @@
-July, 2015
-
-- Remove unneeded file entries in sysfs
-- Remove software processing of IB protocol and place in library for use
-  by qib, ipath (if still present), hfi1, and eventually soft-roce
-- Replace incorrect uAPI