diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/infiniband/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/infiniband/hw/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rdma/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/rdma/Makefile | 1 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/Kconfig (renamed from drivers/infiniband/hw/ipath/Kconfig) | 4 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/Makefile (renamed from drivers/infiniband/hw/ipath/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/TODO | 5 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_common.h (renamed from drivers/infiniband/hw/ipath/ipath_common.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_cq.c (renamed from drivers/infiniband/hw/ipath/ipath_cq.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_debug.h (renamed from drivers/infiniband/hw/ipath/ipath_debug.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_diag.c (renamed from drivers/infiniband/hw/ipath/ipath_diag.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_dma.c (renamed from drivers/infiniband/hw/ipath/ipath_dma.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_driver.c (renamed from drivers/infiniband/hw/ipath/ipath_driver.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_eeprom.c (renamed from drivers/infiniband/hw/ipath/ipath_eeprom.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_file_ops.c (renamed from drivers/infiniband/hw/ipath/ipath_file_ops.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_fs.c (renamed from drivers/infiniband/hw/ipath/ipath_fs.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_iba6110.c (renamed from drivers/infiniband/hw/ipath/ipath_iba6110.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_init_chip.c (renamed from drivers/infiniband/hw/ipath/ipath_init_chip.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_intr.c (renamed from drivers/infiniband/hw/ipath/ipath_intr.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_kernel.h (renamed from drivers/infiniband/hw/ipath/ipath_kernel.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_keys.c (renamed from drivers/infiniband/hw/ipath/ipath_keys.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_mad.c (renamed from drivers/infiniband/hw/ipath/ipath_mad.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_mmap.c (renamed from drivers/infiniband/hw/ipath/ipath_mmap.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_mr.c (renamed from drivers/infiniband/hw/ipath/ipath_mr.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_qp.c (renamed from drivers/infiniband/hw/ipath/ipath_qp.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_rc.c (renamed from drivers/infiniband/hw/ipath/ipath_rc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_registers.h (renamed from drivers/infiniband/hw/ipath/ipath_registers.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_ruc.c (renamed from drivers/infiniband/hw/ipath/ipath_ruc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_sdma.c (renamed from drivers/infiniband/hw/ipath/ipath_sdma.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_srq.c (renamed from drivers/infiniband/hw/ipath/ipath_srq.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_stats.c (renamed from drivers/infiniband/hw/ipath/ipath_stats.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_sysfs.c (renamed from drivers/infiniband/hw/ipath/ipath_sysfs.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_uc.c (renamed from drivers/infiniband/hw/ipath/ipath_uc.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_ud.c (renamed from drivers/infiniband/hw/ipath/ipath_ud.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_user_pages.c (renamed from drivers/infiniband/hw/ipath/ipath_user_pages.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_user_sdma.c (renamed from drivers/infiniband/hw/ipath/ipath_user_sdma.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_user_sdma.h (renamed from drivers/infiniband/hw/ipath/ipath_user_sdma.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_verbs.c (renamed from drivers/infiniband/hw/ipath/ipath_verbs.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_verbs.h (renamed from drivers/infiniband/hw/ipath/ipath_verbs.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_verbs_mcast.c (renamed from drivers/infiniband/hw/ipath/ipath_verbs_mcast.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_wc_ppc64.c (renamed from drivers/infiniband/hw/ipath/ipath_wc_ppc64.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/rdma/ipath/ipath_wc_x86_64.c (renamed from drivers/infiniband/hw/ipath/ipath_wc_x86_64.c) | 0 |
43 files changed, 12 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a82aa07..db1a523 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5536,7 +5536,7 @@ IPATH DRIVER M: Mike Marciniszyn <infinipath@intel.com> L: linux-rdma@vger.kernel.org S: Maintained -F: drivers/infiniband/hw/ipath/ +F: drivers/staging/rdma/ipath/ IPMI SUBSYSTEM M: Corey Minyard <minyard@acm.org> diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index b899531..7d6034f 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -55,7 +55,6 @@ config INFINIBAND_ADDR_TRANS default y source "drivers/infiniband/hw/mthca/Kconfig" -source "drivers/infiniband/hw/ipath/Kconfig" source "drivers/infiniband/hw/qib/Kconfig" source "drivers/infiniband/hw/ehca/Kconfig" source "drivers/infiniband/hw/amso1100/Kconfig" diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile index e900b03..d1212c4 100644 --- a/drivers/infiniband/hw/Makefile +++ b/drivers/infiniband/hw/Makefile @@ -1,5 +1,4 @@ obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/ -obj-$(CONFIG_INFINIBAND_IPATH) += ipath/ obj-$(CONFIG_INFINIBAND_QIB) += qib/ obj-$(CONFIG_INFINIBAND_EHCA) += ehca/ obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/ diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig index 0bff438..e582553 100644 --- a/drivers/staging/rdma/Kconfig +++ b/drivers/staging/rdma/Kconfig @@ -22,4 +22,6 @@ menuconfig STAGING_RDMA # Please keep entries in alphabetic order if STAGING_RDMA +source "drivers/staging/rdma/ipath/Kconfig" + endif diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile index b5e94f1..484dac7 100644 --- a/drivers/staging/rdma/Makefile +++ b/drivers/staging/rdma/Makefile @@ -1 +1,2 @@ # Entries for RDMA_STAGING tree +obj-$(CONFIG_INFINIBAND_IPATH) += ipath/ diff --git a/drivers/infiniband/hw/ipath/Kconfig b/drivers/staging/rdma/ipath/Kconfig index 8fe54ff..041ce06 100644 --- a/drivers/infiniband/hw/ipath/Kconfig +++ b/drivers/staging/rdma/ipath/Kconfig @@ -2,7 +2,7 @@ config INFINIBAND_IPATH tristate "QLogic HTX HCA support" depends on 64BIT && NET && HT_IRQ ---help--- - This is a driver for the obsolete QLogic Hyper-Transport + This is a driver for the deprecated QLogic Hyper-Transport IB host channel adapter (model QHT7140), including InfiniBand verbs support. This driver allows these devices to be used with both kernel upper level protocols such @@ -12,3 +12,5 @@ config INFINIBAND_IPATH If you have this hardware you will need to boot with PAT disabled on your x86-64 systems, use the nopat kernel parameter. + + Note that this driver will soon be removed entirely from the kernel. diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/staging/rdma/ipath/Makefile index 4496f28..4496f28 100644 --- a/drivers/infiniband/hw/ipath/Makefile +++ b/drivers/staging/rdma/ipath/Makefile diff --git a/drivers/staging/rdma/ipath/TODO b/drivers/staging/rdma/ipath/TODO new file mode 100644 index 0000000..cb00158 --- /dev/null +++ b/drivers/staging/rdma/ipath/TODO @@ -0,0 +1,5 @@ +The ipath driver has been moved to staging in preparation for its removal in a +few releases. The driver will be deleted during the 4.6 merge window. + +Contact Dennis Dalessandro <dennis.dalessandro@intel.com> and +Cc: linux-rdma@vger.kernel.org diff --git a/drivers/infiniband/hw/ipath/ipath_common.h b/drivers/staging/rdma/ipath/ipath_common.h index 28cfe97..28cfe97 100644 --- a/drivers/infiniband/hw/ipath/ipath_common.h +++ b/drivers/staging/rdma/ipath/ipath_common.h diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/staging/rdma/ipath/ipath_cq.c index e9dd911..e9dd911 100644 --- a/drivers/infiniband/hw/ipath/ipath_cq.c +++ b/drivers/staging/rdma/ipath/ipath_cq.c diff --git a/drivers/infiniband/hw/ipath/ipath_debug.h b/drivers/staging/rdma/ipath/ipath_debug.h index 65926cd..65926cd 100644 --- a/drivers/infiniband/hw/ipath/ipath_debug.h +++ b/drivers/staging/rdma/ipath/ipath_debug.h diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/staging/rdma/ipath/ipath_diag.c index 45802e9..45802e9 100644 --- a/drivers/infiniband/hw/ipath/ipath_diag.c +++ b/drivers/staging/rdma/ipath/ipath_diag.c diff --git a/drivers/infiniband/hw/ipath/ipath_dma.c b/drivers/staging/rdma/ipath/ipath_dma.c index 123a8c0..123a8c0 100644 --- a/drivers/infiniband/hw/ipath/ipath_dma.c +++ b/drivers/staging/rdma/ipath/ipath_dma.c diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/staging/rdma/ipath/ipath_driver.c index 871dbe5..871dbe5 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/staging/rdma/ipath/ipath_driver.c diff --git a/drivers/infiniband/hw/ipath/ipath_eeprom.c b/drivers/staging/rdma/ipath/ipath_eeprom.c index fc71819..fc71819 100644 --- a/drivers/infiniband/hw/ipath/ipath_eeprom.c +++ b/drivers/staging/rdma/ipath/ipath_eeprom.c diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/staging/rdma/ipath/ipath_file_ops.c index 450d159..450d159 100644 --- a/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/drivers/staging/rdma/ipath/ipath_file_ops.c diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/staging/rdma/ipath/ipath_fs.c index 25422a3..25422a3 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/staging/rdma/ipath/ipath_fs.c diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/staging/rdma/ipath/ipath_iba6110.c index 7cc3054..7cc3054 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/staging/rdma/ipath/ipath_iba6110.c diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/staging/rdma/ipath/ipath_init_chip.c index be2a60e..be2a60e 100644 --- a/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/drivers/staging/rdma/ipath/ipath_init_chip.c diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/staging/rdma/ipath/ipath_intr.c index 01ba792..01ba792 100644 --- a/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/drivers/staging/rdma/ipath/ipath_intr.c diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/staging/rdma/ipath/ipath_kernel.h index f0f9471..f0f9471 100644 --- a/drivers/infiniband/hw/ipath/ipath_kernel.h +++ b/drivers/staging/rdma/ipath/ipath_kernel.h diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/staging/rdma/ipath/ipath_keys.c index c0e933f..c0e933f 100644 --- a/drivers/infiniband/hw/ipath/ipath_keys.c +++ b/drivers/staging/rdma/ipath/ipath_keys.c diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/staging/rdma/ipath/ipath_mad.c index ad3a926..ad3a926 100644 --- a/drivers/infiniband/hw/ipath/ipath_mad.c +++ b/drivers/staging/rdma/ipath/ipath_mad.c diff --git a/drivers/infiniband/hw/ipath/ipath_mmap.c b/drivers/staging/rdma/ipath/ipath_mmap.c index e732742..e732742 100644 --- a/drivers/infiniband/hw/ipath/ipath_mmap.c +++ b/drivers/staging/rdma/ipath/ipath_mmap.c diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/staging/rdma/ipath/ipath_mr.c index c7278f6..c7278f6 100644 --- a/drivers/infiniband/hw/ipath/ipath_mr.c +++ b/drivers/staging/rdma/ipath/ipath_mr.c diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/staging/rdma/ipath/ipath_qp.c index face876..face876 100644 --- a/drivers/infiniband/hw/ipath/ipath_qp.c +++ b/drivers/staging/rdma/ipath/ipath_qp.c diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/staging/rdma/ipath/ipath_rc.c index 79b3dbc..79b3dbc 100644 --- a/drivers/infiniband/hw/ipath/ipath_rc.c +++ b/drivers/staging/rdma/ipath/ipath_rc.c diff --git a/drivers/infiniband/hw/ipath/ipath_registers.h b/drivers/staging/rdma/ipath/ipath_registers.h index 8f44d0c..8f44d0c 100644 --- a/drivers/infiniband/hw/ipath/ipath_registers.h +++ b/drivers/staging/rdma/ipath/ipath_registers.h diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/staging/rdma/ipath/ipath_ruc.c index 1f95bba..1f95bba 100644 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c +++ b/drivers/staging/rdma/ipath/ipath_ruc.c diff --git a/drivers/infiniband/hw/ipath/ipath_sdma.c b/drivers/staging/rdma/ipath/ipath_sdma.c index 17a5177..17a5177 100644 --- a/drivers/infiniband/hw/ipath/ipath_sdma.c +++ b/drivers/staging/rdma/ipath/ipath_sdma.c diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/staging/rdma/ipath/ipath_srq.c index 2627198..2627198 100644 --- a/drivers/infiniband/hw/ipath/ipath_srq.c +++ b/drivers/staging/rdma/ipath/ipath_srq.c diff --git a/drivers/infiniband/hw/ipath/ipath_stats.c b/drivers/staging/rdma/ipath/ipath_stats.c index f63e143..f63e143 100644 --- a/drivers/infiniband/hw/ipath/ipath_stats.c +++ b/drivers/staging/rdma/ipath/ipath_stats.c diff --git a/drivers/infiniband/hw/ipath/ipath_sysfs.c b/drivers/staging/rdma/ipath/ipath_sysfs.c index 75558f3..75558f3 100644 --- a/drivers/infiniband/hw/ipath/ipath_sysfs.c +++ b/drivers/staging/rdma/ipath/ipath_sysfs.c diff --git a/drivers/infiniband/hw/ipath/ipath_uc.c b/drivers/staging/rdma/ipath/ipath_uc.c index 22e6099..22e6099 100644 --- a/drivers/infiniband/hw/ipath/ipath_uc.c +++ b/drivers/staging/rdma/ipath/ipath_uc.c diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/staging/rdma/ipath/ipath_ud.c index e8a2a91..e8a2a91 100644 --- a/drivers/infiniband/hw/ipath/ipath_ud.c +++ b/drivers/staging/rdma/ipath/ipath_ud.c diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/staging/rdma/ipath/ipath_user_pages.c index 1da1252..1da1252 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c +++ b/drivers/staging/rdma/ipath/ipath_user_pages.c diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/staging/rdma/ipath/ipath_user_sdma.c index cc04b7b..cc04b7b 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c +++ b/drivers/staging/rdma/ipath/ipath_user_sdma.c diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.h b/drivers/staging/rdma/ipath/ipath_user_sdma.h index fc76316..fc76316 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_sdma.h +++ b/drivers/staging/rdma/ipath/ipath_user_sdma.h diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/staging/rdma/ipath/ipath_verbs.c index 30ba49c..30ba49c 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/drivers/staging/rdma/ipath/ipath_verbs.c diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/staging/rdma/ipath/ipath_verbs.h index ec167e5..ec167e5 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.h +++ b/drivers/staging/rdma/ipath/ipath_verbs.h diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/staging/rdma/ipath/ipath_verbs_mcast.c index 6216ea9..6216ea9 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c +++ b/drivers/staging/rdma/ipath/ipath_verbs_mcast.c diff --git a/drivers/infiniband/hw/ipath/ipath_wc_ppc64.c b/drivers/staging/rdma/ipath/ipath_wc_ppc64.c index 1a7e20a..1a7e20a 100644 --- a/drivers/infiniband/hw/ipath/ipath_wc_ppc64.c +++ b/drivers/staging/rdma/ipath/ipath_wc_ppc64.c diff --git a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c b/drivers/staging/rdma/ipath/ipath_wc_x86_64.c index 7b6e4c8..7b6e4c8 100644 --- a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c +++ b/drivers/staging/rdma/ipath/ipath_wc_x86_64.c |
