From 6f9b38903c06c159d167344821cd7b4bae864380 Mon Sep 17 00:00:00 2001 From: Dennis Dalessandro Date: Thu, 30 Jul 2015 09:25:42 -0400 Subject: [PATCH] IB/ipath: Deprecate ipath driver and move to staging. It is now time for the ipath driver to begin to be phased out of the kernel. This patch moves the ipath driver from the Infiniband sub tree to the staging area where it will remain until the code is removed from the kernel in a few releases. Reviewed-by: Mike Marciniszyn Signed-off-by: Dennis Dalessandro Signed-off-by: Doug Ledford --- MAINTAINERS | 2 +- drivers/infiniband/Kconfig | 1 - drivers/infiniband/hw/Makefile | 1 - drivers/staging/rdma/Kconfig | 2 ++ drivers/staging/rdma/Makefile | 1 + drivers/{infiniband/hw => staging/rdma}/ipath/Kconfig | 4 +++- drivers/{infiniband/hw => staging/rdma}/ipath/Makefile | 0 drivers/staging/rdma/ipath/TODO | 5 +++++ drivers/{infiniband/hw => staging/rdma}/ipath/ipath_common.h | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_cq.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_debug.h | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_diag.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_dma.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_driver.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_eeprom.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_file_ops.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_fs.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_iba6110.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_init_chip.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_intr.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_kernel.h | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_keys.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_mad.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_mmap.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_mr.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_qp.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_rc.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_registers.h | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_ruc.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_sdma.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_srq.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_stats.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_sysfs.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_uc.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_ud.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_user_pages.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_user_sdma.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_user_sdma.h | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_verbs.c | 0 drivers/{infiniband/hw => staging/rdma}/ipath/ipath_verbs.h | 0 .../hw => staging/rdma}/ipath/ipath_verbs_mcast.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_wc_ppc64.c | 0 .../{infiniband/hw => staging/rdma}/ipath/ipath_wc_x86_64.c | 0 43 files changed, 12 insertions(+), 4 deletions(-) rename drivers/{infiniband/hw => staging/rdma}/ipath/Kconfig (81%) rename drivers/{infiniband/hw => staging/rdma}/ipath/Makefile (100%) create mode 100644 drivers/staging/rdma/ipath/TODO rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_common.h (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_cq.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_debug.h (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_diag.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_dma.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_driver.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_eeprom.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_file_ops.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_fs.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_iba6110.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_init_chip.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_intr.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_kernel.h (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_keys.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_mad.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_mmap.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_mr.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_qp.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_rc.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_registers.h (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_ruc.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_sdma.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_srq.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_stats.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_sysfs.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_uc.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_ud.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_user_pages.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_user_sdma.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_user_sdma.h (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_verbs.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_verbs.h (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_verbs_mcast.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_wc_ppc64.c (100%) rename drivers/{infiniband/hw => staging/rdma}/ipath/ipath_wc_x86_64.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index a82aa07366d1..db1a523ed493 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5536,7 +5536,7 @@ IPATH DRIVER M: Mike Marciniszyn L: linux-rdma@vger.kernel.org S: Maintained -F: drivers/infiniband/hw/ipath/ +F: drivers/staging/rdma/ipath/ IPMI SUBSYSTEM M: Corey Minyard diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index b899531498eb..7d6034fd456b 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 e900b03531a9..d1212c441dfa 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 0bff438ada6f..e582553e1814 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 b5e94f169101..484dac754945 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 similarity index 81% rename from drivers/infiniband/hw/ipath/Kconfig rename to drivers/staging/rdma/ipath/Kconfig index 8fe54ff00580..041ce0634968 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 similarity index 100% rename from drivers/infiniband/hw/ipath/Makefile rename to drivers/staging/rdma/ipath/Makefile diff --git a/drivers/staging/rdma/ipath/TODO b/drivers/staging/rdma/ipath/TODO new file mode 100644 index 000000000000..cb00158d64c8 --- /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 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_common.h rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_cq.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_debug.h rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_diag.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_dma.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_driver.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_eeprom.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_file_ops.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_fs.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_iba6110.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_init_chip.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_intr.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_kernel.h rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_keys.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_mad.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_mmap.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_mr.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_qp.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_rc.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_registers.h rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_ruc.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_sdma.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_srq.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_stats.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_sysfs.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_uc.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_ud.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_user_pages.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_user_sdma.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_user_sdma.h rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_verbs.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_verbs.h rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_verbs_mcast.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_wc_ppc64.c rename to 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 similarity index 100% rename from drivers/infiniband/hw/ipath/ipath_wc_x86_64.c rename to drivers/staging/rdma/ipath/ipath_wc_x86_64.c -- 2.39.5