Skip to content

Commit

Permalink
IB/hfi1: Move driver out of staging
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Signed-off-by: Dennis Dalessandro <[email protected]>
Signed-off-by: Doug Ledford <[email protected]>
  • Loading branch information
@dledford
Dennis Dalessandro authored and dledford committed May 26, 2016
1 parent e11ffbd commit f48ad61
Show file tree
Hide file tree
Showing 67 changed files with 10 additions and 15 deletions.
13 changes: 7 additions & 6 deletions MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
M: Dennis Dalessandro <[email protected]>
L: [email protected]
S: Supported
F: drivers/infiniband/hw/hfi1

HFS FILESYSTEM
L: [email protected]
S: Orphan
Expand Down Expand Up @@ -10661,12 +10668,6 @@ M: Arnaud Patard <[email protected]>
S: Odd Fixes
F: drivers/staging/xgifb/

HFI1 DRIVER
M: Mike Marciniszyn <[email protected]>
L: [email protected]
S: Supported
F: drivers/staging/rdma/hfi1

STARFIRE/DURALAN NETWORK DRIVER
M: Ion Badulescu <[email protected]>
S: Odd Fixes
Expand Down
2 changes: 2 additions & 0 deletions drivers/infiniband/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 1 addition & 0 deletions drivers/infiniband/hw/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 drivers/staging/rdma/hfi1/Kconfig → drivers/infiniband/hw/hfi1/Kconfig
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/Makefile → drivers/infiniband/hw/hfi1/Makefile
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/affinity.c → drivers/infiniband/hw/hfi1/affinity.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/affinity.h → drivers/infiniband/hw/hfi1/affinity.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/aspm.h → drivers/infiniband/hw/hfi1/aspm.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/chip.c → drivers/infiniband/hw/hfi1/chip.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/chip.h → drivers/infiniband/hw/hfi1/chip.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/chip_registers.h → drivers/infiniband/hw/hfi1/chip_registers.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/common.h → drivers/infiniband/hw/hfi1/common.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/debugfs.c → drivers/infiniband/hw/hfi1/debugfs.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/debugfs.h → drivers/infiniband/hw/hfi1/debugfs.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/device.c → drivers/infiniband/hw/hfi1/device.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/device.h → drivers/infiniband/hw/hfi1/device.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/dma.c → drivers/infiniband/hw/hfi1/dma.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/driver.c → drivers/infiniband/hw/hfi1/driver.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/efivar.c → drivers/infiniband/hw/hfi1/efivar.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/efivar.h → drivers/infiniband/hw/hfi1/efivar.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/eprom.c → drivers/infiniband/hw/hfi1/eprom.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/eprom.h → drivers/infiniband/hw/hfi1/eprom.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/file_ops.c → drivers/infiniband/hw/hfi1/file_ops.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/firmware.c → drivers/infiniband/hw/hfi1/firmware.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/hfi.h → drivers/infiniband/hw/hfi1/hfi.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/init.c → drivers/infiniband/hw/hfi1/init.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/intr.c → drivers/infiniband/hw/hfi1/intr.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/iowait.h → drivers/infiniband/hw/hfi1/iowait.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/mad.c → drivers/infiniband/hw/hfi1/mad.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/mad.h → drivers/infiniband/hw/hfi1/mad.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/mmu_rb.c → drivers/infiniband/hw/hfi1/mmu_rb.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/mmu_rb.h → drivers/infiniband/hw/hfi1/mmu_rb.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/opa_compat.h → drivers/infiniband/hw/hfi1/opa_compat.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/pcie.c → drivers/infiniband/hw/hfi1/pcie.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/pio.c → drivers/infiniband/hw/hfi1/pio.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/pio.h → drivers/infiniband/hw/hfi1/pio.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/pio_copy.c → drivers/infiniband/hw/hfi1/pio_copy.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/platform.c → drivers/infiniband/hw/hfi1/platform.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/platform.h → drivers/infiniband/hw/hfi1/platform.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/qp.c → drivers/infiniband/hw/hfi1/qp.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/qp.h → drivers/infiniband/hw/hfi1/qp.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/qsfp.c → drivers/infiniband/hw/hfi1/qsfp.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/qsfp.h → drivers/infiniband/hw/hfi1/qsfp.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/rc.c → drivers/infiniband/hw/hfi1/rc.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/ruc.c → drivers/infiniband/hw/hfi1/ruc.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/sdma.c → drivers/infiniband/hw/hfi1/sdma.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/sdma.h → drivers/infiniband/hw/hfi1/sdma.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/sdma_txreq.h → drivers/infiniband/hw/hfi1/sdma_txreq.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/sysfs.c → drivers/infiniband/hw/hfi1/sysfs.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/trace.c → drivers/infiniband/hw/hfi1/trace.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/trace.h → drivers/infiniband/hw/hfi1/trace.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/twsi.c → drivers/infiniband/hw/hfi1/twsi.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/twsi.h → drivers/infiniband/hw/hfi1/twsi.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/uc.c → drivers/infiniband/hw/hfi1/uc.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/ud.c → drivers/infiniband/hw/hfi1/ud.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/user_exp_rcv.c → drivers/infiniband/hw/hfi1/user_exp_rcv.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/user_exp_rcv.h → drivers/infiniband/hw/hfi1/user_exp_rcv.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/user_pages.c → drivers/infiniband/hw/hfi1/user_pages.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/user_sdma.c → drivers/infiniband/hw/hfi1/user_sdma.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/user_sdma.h → drivers/infiniband/hw/hfi1/user_sdma.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/verbs.c → drivers/infiniband/hw/hfi1/verbs.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/verbs.h → drivers/infiniband/hw/hfi1/verbs.h
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/verbs_txreq.c → drivers/infiniband/hw/hfi1/verbs_txreq.c
View file
File renamed without changes.
0 drivers/staging/rdma/hfi1/verbs_txreq.h → drivers/infiniband/hw/hfi1/verbs_txreq.h
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions drivers/staging/rdma/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@ menuconfig STAGING_RDMA
# Please keep entries in alphabetic order
if STAGING_RDMA

source "drivers/staging/rdma/hfi1/Kconfig"

endif
1 change: 0 additions & 1 deletion drivers/staging/rdma/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
# Entries for RDMA_STAGING tree
obj-$(CONFIG_INFINIBAND_HFI1) += hfi1/
6 changes: 0 additions & 6 deletions drivers/staging/rdma/hfi1/TODO
View file

This file was deleted.

0 comments on commit f48ad61

Please sign in to comment.