Browse Source

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>
Doug Ledford 10 years ago
parent
commit
447e9a4d27
36 changed files with 9 additions and 3 deletions
  1. 0 1
      drivers/infiniband/Kconfig
  2. 0 1
      drivers/infiniband/hw/Makefile
  3. 2 0
      drivers/staging/rdma/Kconfig
  4. 1 0
      drivers/staging/rdma/Makefile
  5. 2 1
      drivers/staging/rdma/ehca/Kconfig
  6. 0 0
      drivers/staging/rdma/ehca/Makefile
  7. 4 0
      drivers/staging/rdma/ehca/TODO
  8. 0 0
      drivers/staging/rdma/ehca/ehca_av.c
  9. 0 0
      drivers/staging/rdma/ehca/ehca_classes.h
  10. 0 0
      drivers/staging/rdma/ehca/ehca_classes_pSeries.h
  11. 0 0
      drivers/staging/rdma/ehca/ehca_cq.c
  12. 0 0
      drivers/staging/rdma/ehca/ehca_eq.c
  13. 0 0
      drivers/staging/rdma/ehca/ehca_hca.c
  14. 0 0
      drivers/staging/rdma/ehca/ehca_irq.c
  15. 0 0
      drivers/staging/rdma/ehca/ehca_irq.h
  16. 0 0
      drivers/staging/rdma/ehca/ehca_iverbs.h
  17. 0 0
      drivers/staging/rdma/ehca/ehca_main.c
  18. 0 0
      drivers/staging/rdma/ehca/ehca_mcast.c
  19. 0 0
      drivers/staging/rdma/ehca/ehca_mrmw.c
  20. 0 0
      drivers/staging/rdma/ehca/ehca_mrmw.h
  21. 0 0
      drivers/staging/rdma/ehca/ehca_pd.c
  22. 0 0
      drivers/staging/rdma/ehca/ehca_qes.h
  23. 0 0
      drivers/staging/rdma/ehca/ehca_qp.c
  24. 0 0
      drivers/staging/rdma/ehca/ehca_reqs.c
  25. 0 0
      drivers/staging/rdma/ehca/ehca_sqp.c
  26. 0 0
      drivers/staging/rdma/ehca/ehca_tools.h
  27. 0 0
      drivers/staging/rdma/ehca/ehca_uverbs.c
  28. 0 0
      drivers/staging/rdma/ehca/hcp_if.c
  29. 0 0
      drivers/staging/rdma/ehca/hcp_if.h
  30. 0 0
      drivers/staging/rdma/ehca/hcp_phyp.c
  31. 0 0
      drivers/staging/rdma/ehca/hcp_phyp.h
  32. 0 0
      drivers/staging/rdma/ehca/hipz_fns.h
  33. 0 0
      drivers/staging/rdma/ehca/hipz_fns_core.h
  34. 0 0
      drivers/staging/rdma/ehca/hipz_hw.h
  35. 0 0
      drivers/staging/rdma/ehca/ipz_pt_fn.c
  36. 0 0
      drivers/staging/rdma/ehca/ipz_pt_fn.h

+ 0 - 1
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"

+ 0 - 1
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/

+ 2 - 0
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"

+ 1 - 0
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/

+ 2 - 1
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.

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


+ 4 - 0
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.

+ 0 - 0
drivers/infiniband/hw/ehca/ehca_av.c → drivers/staging/rdma/ehca/ehca_av.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_classes.h → drivers/staging/rdma/ehca/ehca_classes.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_classes_pSeries.h → drivers/staging/rdma/ehca/ehca_classes_pSeries.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_cq.c → drivers/staging/rdma/ehca/ehca_cq.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_eq.c → drivers/staging/rdma/ehca/ehca_eq.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_hca.c → drivers/staging/rdma/ehca/ehca_hca.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_irq.c → drivers/staging/rdma/ehca/ehca_irq.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_irq.h → drivers/staging/rdma/ehca/ehca_irq.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_iverbs.h → drivers/staging/rdma/ehca/ehca_iverbs.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_main.c → drivers/staging/rdma/ehca/ehca_main.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_mcast.c → drivers/staging/rdma/ehca/ehca_mcast.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_mrmw.c → drivers/staging/rdma/ehca/ehca_mrmw.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_mrmw.h → drivers/staging/rdma/ehca/ehca_mrmw.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_pd.c → drivers/staging/rdma/ehca/ehca_pd.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_qes.h → drivers/staging/rdma/ehca/ehca_qes.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_qp.c → drivers/staging/rdma/ehca/ehca_qp.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_reqs.c → drivers/staging/rdma/ehca/ehca_reqs.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_sqp.c → drivers/staging/rdma/ehca/ehca_sqp.c


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_tools.h → drivers/staging/rdma/ehca/ehca_tools.h


+ 0 - 0
drivers/infiniband/hw/ehca/ehca_uverbs.c → drivers/staging/rdma/ehca/ehca_uverbs.c


+ 0 - 0
drivers/infiniband/hw/ehca/hcp_if.c → drivers/staging/rdma/ehca/hcp_if.c


+ 0 - 0
drivers/infiniband/hw/ehca/hcp_if.h → drivers/staging/rdma/ehca/hcp_if.h


+ 0 - 0
drivers/infiniband/hw/ehca/hcp_phyp.c → drivers/staging/rdma/ehca/hcp_phyp.c


+ 0 - 0
drivers/infiniband/hw/ehca/hcp_phyp.h → drivers/staging/rdma/ehca/hcp_phyp.h


+ 0 - 0
drivers/infiniband/hw/ehca/hipz_fns.h → drivers/staging/rdma/ehca/hipz_fns.h


+ 0 - 0
drivers/infiniband/hw/ehca/hipz_fns_core.h → drivers/staging/rdma/ehca/hipz_fns_core.h


+ 0 - 0
drivers/infiniband/hw/ehca/hipz_hw.h → drivers/staging/rdma/ehca/hipz_hw.h


+ 0 - 0
drivers/infiniband/hw/ehca/ipz_pt_fn.c → drivers/staging/rdma/ehca/ipz_pt_fn.c


+ 0 - 0
drivers/infiniband/hw/ehca/ipz_pt_fn.h → drivers/staging/rdma/ehca/ipz_pt_fn.h