IB/ehca: Deprecate driver, move to staging, schedule deletion

The ehca driver is only supported on IBM machines with a custom EBus. As they have opted to build their newer machines using more industry standard technology and haven't really been pushing EBus capable machines for a while, this driver can now safely be moved to the staging area and scheduled for eventual removal. This plan was brought to IBM's attention and received their sign-off. Cc: alexs@linux.vnet.ibm.com Cc: hnguyen@de.ibm.com Cc: raisch@de.ibm.com Cc: stefan.roscher@de.ibm.com Signed-off-by: Doug Ledford <dledford@redhat.com>
mariux64 · Sep 11, 2015 · 447e9a4 · 447e9a4
1 parent d1178cb
commit 447e9a4
Show file tree

Hide file tree

Showing 36 changed files with 9 additions and 3 deletions.
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
@@ -56,7 +56,6 @@ config INFINIBAND_ADDR_TRANS
 
 source "drivers/infiniband/hw/mthca/Kconfig"
 source "drivers/infiniband/hw/qib/Kconfig"
-source "drivers/infiniband/hw/ehca/Kconfig"
 source "drivers/infiniband/hw/cxgb3/Kconfig"
 source "drivers/infiniband/hw/cxgb4/Kconfig"
 source "drivers/infiniband/hw/mlx4/Kconfig"

diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile
@@ -1,6 +1,5 @@
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= mthca/
 obj-$(CONFIG_INFINIBAND_QIB)		+= qib/
-obj-$(CONFIG_INFINIBAND_EHCA)		+= ehca/
 obj-$(CONFIG_INFINIBAND_CXGB3)		+= cxgb3/
 obj-$(CONFIG_INFINIBAND_CXGB4)		+= cxgb4/
 obj-$(CONFIG_MLX4_INFINIBAND)		+= mlx4/

diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig
@@ -24,6 +24,8 @@ if STAGING_RDMA
 
 source "drivers/staging/rdma/amso1100/Kconfig"
 
+source "drivers/staging/rdma/ehca/Kconfig"
+
 source "drivers/staging/rdma/hfi1/Kconfig"
 
 source "drivers/staging/rdma/ipath/Kconfig"

diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile
@@ -1,4 +1,5 @@
 # Entries for RDMA_STAGING tree
 obj-$(CONFIG_INFINIBAND_AMSO1100)	+= amso1100/
+obj-$(CONFIG_INFINIBAND_EHCA)	+= ehca/
 obj-$(CONFIG_INFINIBAND_HFI1)	+= hfi1/
 obj-$(CONFIG_INFINIBAND_IPATH)	+= ipath/
diff --git a/drivers/infiniband/hw/ehca/Kconfig → drivers/staging/rdma/ehca/Kconfig b/drivers/infiniband/hw/ehca/Kconfig → drivers/staging/rdma/ehca/Kconfig
@@ -2,7 +2,8 @@ config INFINIBAND_EHCA
 	tristate "eHCA support"
 	depends on IBMEBUS
 	---help---
-	This driver supports the IBM pSeries eHCA InfiniBand adapter.
+	This driver supports the deprecated IBM pSeries eHCA InfiniBand
+	adapter.
 
 	To compile the driver as a module, choose M here. The module
 	will be called ib_ehca.

diff --git a/drivers/infiniband/hw/ehca/Makefile → drivers/staging/rdma/ehca/Makefile b/drivers/infiniband/hw/ehca/Makefile → drivers/staging/rdma/ehca/Makefile
diff --git a/drivers/staging/rdma/ehca/TODO b/drivers/staging/rdma/ehca/TODO
@@ -0,0 +1,4 @@
+9/2015
+
+The ehca driver has been deprecated and moved to drivers/staging/rdma.
+It will be removed in the 4.6 merge window.
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c → drivers/staging/rdma/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c → drivers/staging/rdma/ehca/ehca_av.c
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h → drivers/staging/rdma/ehca/ehca_classes.h b/drivers/infiniband/hw/ehca/ehca_classes.h → drivers/staging/rdma/ehca/ehca_classes.h
diff --git a/...infiniband/hw/ehca/ehca_classes_pSeries.h → .../staging/rdma/ehca/ehca_classes_pSeries.h b/...infiniband/hw/ehca/ehca_classes_pSeries.h → .../staging/rdma/ehca/ehca_classes_pSeries.h
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c → drivers/staging/rdma/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c → drivers/staging/rdma/ehca/ehca_cq.c
diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c → drivers/staging/rdma/ehca/ehca_eq.c b/drivers/infiniband/hw/ehca/ehca_eq.c → drivers/staging/rdma/ehca/ehca_eq.c
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c → drivers/staging/rdma/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c → drivers/staging/rdma/ehca/ehca_hca.c
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c → drivers/staging/rdma/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c → drivers/staging/rdma/ehca/ehca_irq.c
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.h → drivers/staging/rdma/ehca/ehca_irq.h b/drivers/infiniband/hw/ehca/ehca_irq.h → drivers/staging/rdma/ehca/ehca_irq.h
diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h → drivers/staging/rdma/ehca/ehca_iverbs.h b/drivers/infiniband/hw/ehca/ehca_iverbs.h → drivers/staging/rdma/ehca/ehca_iverbs.h
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c → drivers/staging/rdma/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c → drivers/staging/rdma/ehca/ehca_main.c
diff --git a/drivers/infiniband/hw/ehca/ehca_mcast.c → drivers/staging/rdma/ehca/ehca_mcast.c b/drivers/infiniband/hw/ehca/ehca_mcast.c → drivers/staging/rdma/ehca/ehca_mcast.c
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c → drivers/staging/rdma/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c → drivers/staging/rdma/ehca/ehca_mrmw.c
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.h → drivers/staging/rdma/ehca/ehca_mrmw.h b/drivers/infiniband/hw/ehca/ehca_mrmw.h → drivers/staging/rdma/ehca/ehca_mrmw.h
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c → drivers/staging/rdma/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c → drivers/staging/rdma/ehca/ehca_pd.c
diff --git a/drivers/infiniband/hw/ehca/ehca_qes.h → drivers/staging/rdma/ehca/ehca_qes.h b/drivers/infiniband/hw/ehca/ehca_qes.h → drivers/staging/rdma/ehca/ehca_qes.h
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c → drivers/staging/rdma/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c → drivers/staging/rdma/ehca/ehca_qp.c
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c → drivers/staging/rdma/ehca/ehca_reqs.c b/drivers/infiniband/hw/ehca/ehca_reqs.c → drivers/staging/rdma/ehca/ehca_reqs.c
diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c → drivers/staging/rdma/ehca/ehca_sqp.c b/drivers/infiniband/hw/ehca/ehca_sqp.c → drivers/staging/rdma/ehca/ehca_sqp.c
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h → drivers/staging/rdma/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h → drivers/staging/rdma/ehca/ehca_tools.h
diff --git a/drivers/infiniband/hw/ehca/ehca_uverbs.c → drivers/staging/rdma/ehca/ehca_uverbs.c b/drivers/infiniband/hw/ehca/ehca_uverbs.c → drivers/staging/rdma/ehca/ehca_uverbs.c
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c → drivers/staging/rdma/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c → drivers/staging/rdma/ehca/hcp_if.c
diff --git a/drivers/infiniband/hw/ehca/hcp_if.h → drivers/staging/rdma/ehca/hcp_if.h b/drivers/infiniband/hw/ehca/hcp_if.h → drivers/staging/rdma/ehca/hcp_if.h
diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.c → drivers/staging/rdma/ehca/hcp_phyp.c b/drivers/infiniband/hw/ehca/hcp_phyp.c → drivers/staging/rdma/ehca/hcp_phyp.c
diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.h → drivers/staging/rdma/ehca/hcp_phyp.h b/drivers/infiniband/hw/ehca/hcp_phyp.h → drivers/staging/rdma/ehca/hcp_phyp.h
diff --git a/drivers/infiniband/hw/ehca/hipz_fns.h → drivers/staging/rdma/ehca/hipz_fns.h b/drivers/infiniband/hw/ehca/hipz_fns.h → drivers/staging/rdma/ehca/hipz_fns.h
diff --git a/drivers/infiniband/hw/ehca/hipz_fns_core.h → drivers/staging/rdma/ehca/hipz_fns_core.h b/drivers/infiniband/hw/ehca/hipz_fns_core.h → drivers/staging/rdma/ehca/hipz_fns_core.h
diff --git a/drivers/infiniband/hw/ehca/hipz_hw.h → drivers/staging/rdma/ehca/hipz_hw.h b/drivers/infiniband/hw/ehca/hipz_hw.h → drivers/staging/rdma/ehca/hipz_hw.h
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c → drivers/staging/rdma/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c → drivers/staging/rdma/ehca/ipz_pt_fn.c
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.h → drivers/staging/rdma/ehca/ipz_pt_fn.h b/drivers/infiniband/hw/ehca/ipz_pt_fn.h → drivers/staging/rdma/ehca/ipz_pt_fn.h