projects/linux·commit 72714841

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

72714841 · Linus Torvalds <[email protected]> · 2015-09-16 09:16:20 -07:00

Pull rdma driver move from Doug Ledford:
 "This is a move only, no functional changes.

  I tried to get it in prior to the rc1 release, but we were waiting on
  IBM to get back to us that they were OK with the deprecation and
  eventual removal of this driver.  That OK didn't materialize until
  last week, so integration and testing time pushed us beyond the rc1
  release.

  Summary:

   - Move ehca driver to staging/rdma and schedule for deletion"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/ehca: Deprecate driver, move to staging, schedule deletion
Commit
72714841b705a5b9bccf37ee85a62352bee3a3ef
Parents
30255100 · 447e9a4d

Merge commit. Changes below are compared with the first parent: 30255100.

Changes

36 files changed · +9 −3

FileStatusAddDelContent
drivers/infiniband/Kconfigmodified+0−1View file
drivers/infiniband/hw/Makefilemodified+0−1View file
drivers/staging/rdma/Kconfigmodified+2−0View file
drivers/staging/rdma/Makefilemodified+1−0View file
drivers/infiniband/hw/ehca/Kconfig → drivers/staging/rdma/ehca/Kconfigrenamed+2−1View file
drivers/infiniband/hw/ehca/Makefile → drivers/staging/rdma/ehca/Makefilerenamed+0−0View file
drivers/staging/rdma/ehca/TODOadded+4−0View file
drivers/infiniband/hw/ehca/ehca_av.c → drivers/staging/rdma/ehca/ehca_av.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_classes.h → drivers/staging/rdma/ehca/ehca_classes.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_classes_pSeries.h → drivers/staging/rdma/ehca/ehca_classes_pSeries.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_cq.c → drivers/staging/rdma/ehca/ehca_cq.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_eq.c → drivers/staging/rdma/ehca/ehca_eq.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_hca.c → drivers/staging/rdma/ehca/ehca_hca.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_irq.c → drivers/staging/rdma/ehca/ehca_irq.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_irq.h → drivers/staging/rdma/ehca/ehca_irq.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_iverbs.h → drivers/staging/rdma/ehca/ehca_iverbs.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_main.c → drivers/staging/rdma/ehca/ehca_main.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_mcast.c → drivers/staging/rdma/ehca/ehca_mcast.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_mrmw.c → drivers/staging/rdma/ehca/ehca_mrmw.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_mrmw.h → drivers/staging/rdma/ehca/ehca_mrmw.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_pd.c → drivers/staging/rdma/ehca/ehca_pd.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_qes.h → drivers/staging/rdma/ehca/ehca_qes.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_qp.c → drivers/staging/rdma/ehca/ehca_qp.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_reqs.c → drivers/staging/rdma/ehca/ehca_reqs.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_sqp.c → drivers/staging/rdma/ehca/ehca_sqp.crenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_tools.h → drivers/staging/rdma/ehca/ehca_tools.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ehca_uverbs.c → drivers/staging/rdma/ehca/ehca_uverbs.crenamed+0−0View file
drivers/infiniband/hw/ehca/hcp_if.c → drivers/staging/rdma/ehca/hcp_if.crenamed+0−0View file
drivers/infiniband/hw/ehca/hcp_if.h → drivers/staging/rdma/ehca/hcp_if.hrenamed+0−0View file
drivers/infiniband/hw/ehca/hcp_phyp.c → drivers/staging/rdma/ehca/hcp_phyp.crenamed+0−0View file
drivers/infiniband/hw/ehca/hcp_phyp.h → drivers/staging/rdma/ehca/hcp_phyp.hrenamed+0−0View file
drivers/infiniband/hw/ehca/hipz_fns.h → drivers/staging/rdma/ehca/hipz_fns.hrenamed+0−0View file
drivers/infiniband/hw/ehca/hipz_fns_core.h → drivers/staging/rdma/ehca/hipz_fns_core.hrenamed+0−0View file
drivers/infiniband/hw/ehca/hipz_hw.h → drivers/staging/rdma/ehca/hipz_hw.hrenamed+0−0View file
drivers/infiniband/hw/ehca/ipz_pt_fn.c → drivers/staging/rdma/ehca/ipz_pt_fn.crenamed+0−0View file
drivers/infiniband/hw/ehca/ipz_pt_fn.h → drivers/staging/rdma/ehca/ipz_pt_fn.hrenamed+0−0View file

drivers/infiniband/Kconfig

View file
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index da4c697..aa26f3c 100644
--- 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"

drivers/infiniband/hw/Makefile

View file
diff --git a/drivers/infiniband/hw/Makefile b/drivers/infiniband/hw/Makefile
index 1bdb999..aded2a5 100644
--- 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/

drivers/staging/rdma/Kconfig

View file
diff --git a/drivers/staging/rdma/Kconfig b/drivers/staging/rdma/Kconfig
index cf5fe9b..d7f6235 100644
--- 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"

drivers/staging/rdma/Makefile

View file
diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile
index cbd915a..139d78e 100644
--- 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/

drivers/staging/rdma/ehca/Kconfig

View file
diff --git a/drivers/infiniband/hw/ehca/Kconfig b/drivers/staging/rdma/ehca/Kconfig
similarity index 80%
rename from drivers/infiniband/hw/ehca/Kconfig
rename to drivers/staging/rdma/ehca/Kconfig
index 59f807d..3fadd2a 100644
--- a/drivers/infiniband/hw/ehca/Kconfig
+++ b/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.

drivers/staging/rdma/ehca/Makefile

View file
diff --git a/drivers/infiniband/hw/ehca/Makefile b/drivers/staging/rdma/ehca/Makefile
similarity index 100%
rename from drivers/infiniband/hw/ehca/Makefile
rename to drivers/staging/rdma/ehca/Makefile

drivers/staging/rdma/ehca/TODO

View file
diff --git a/drivers/staging/rdma/ehca/TODO b/drivers/staging/rdma/ehca/TODO
new file mode 100644
index 0000000..199a4a6
--- /dev/null
+++ 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.

drivers/staging/rdma/ehca/ehca_av.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/staging/rdma/ehca/ehca_av.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_av.c
rename to drivers/staging/rdma/ehca/ehca_av.c

drivers/staging/rdma/ehca/ehca_classes.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_classes.h b/drivers/staging/rdma/ehca/ehca_classes.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_classes.h
rename to drivers/staging/rdma/ehca/ehca_classes.h

drivers/staging/rdma/ehca/ehca_classes_pSeries.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_classes_pSeries.h b/drivers/staging/rdma/ehca/ehca_classes_pSeries.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_classes_pSeries.h
rename to drivers/staging/rdma/ehca/ehca_classes_pSeries.h

drivers/staging/rdma/ehca/ehca_cq.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/staging/rdma/ehca/ehca_cq.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_cq.c
rename to drivers/staging/rdma/ehca/ehca_cq.c

drivers/staging/rdma/ehca/ehca_eq.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c b/drivers/staging/rdma/ehca/ehca_eq.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_eq.c
rename to drivers/staging/rdma/ehca/ehca_eq.c

drivers/staging/rdma/ehca/ehca_hca.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/staging/rdma/ehca/ehca_hca.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_hca.c
rename to drivers/staging/rdma/ehca/ehca_hca.c

drivers/staging/rdma/ehca/ehca_irq.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/staging/rdma/ehca/ehca_irq.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_irq.c
rename to drivers/staging/rdma/ehca/ehca_irq.c

drivers/staging/rdma/ehca/ehca_irq.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.h b/drivers/staging/rdma/ehca/ehca_irq.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_irq.h
rename to drivers/staging/rdma/ehca/ehca_irq.h

drivers/staging/rdma/ehca/ehca_iverbs.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h b/drivers/staging/rdma/ehca/ehca_iverbs.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_iverbs.h
rename to drivers/staging/rdma/ehca/ehca_iverbs.h

drivers/staging/rdma/ehca/ehca_main.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/staging/rdma/ehca/ehca_main.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_main.c
rename to drivers/staging/rdma/ehca/ehca_main.c

drivers/staging/rdma/ehca/ehca_mcast.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_mcast.c b/drivers/staging/rdma/ehca/ehca_mcast.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_mcast.c
rename to drivers/staging/rdma/ehca/ehca_mcast.c

drivers/staging/rdma/ehca/ehca_mrmw.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/staging/rdma/ehca/ehca_mrmw.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_mrmw.c
rename to drivers/staging/rdma/ehca/ehca_mrmw.c

drivers/staging/rdma/ehca/ehca_mrmw.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.h b/drivers/staging/rdma/ehca/ehca_mrmw.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_mrmw.h
rename to drivers/staging/rdma/ehca/ehca_mrmw.h

drivers/staging/rdma/ehca/ehca_pd.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/staging/rdma/ehca/ehca_pd.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_pd.c
rename to drivers/staging/rdma/ehca/ehca_pd.c

drivers/staging/rdma/ehca/ehca_qes.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_qes.h b/drivers/staging/rdma/ehca/ehca_qes.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_qes.h
rename to drivers/staging/rdma/ehca/ehca_qes.h

drivers/staging/rdma/ehca/ehca_qp.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/staging/rdma/ehca/ehca_qp.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_qp.c
rename to drivers/staging/rdma/ehca/ehca_qp.c

drivers/staging/rdma/ehca/ehca_reqs.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_reqs.c b/drivers/staging/rdma/ehca/ehca_reqs.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_reqs.c
rename to drivers/staging/rdma/ehca/ehca_reqs.c

drivers/staging/rdma/ehca/ehca_sqp.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c b/drivers/staging/rdma/ehca/ehca_sqp.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_sqp.c
rename to drivers/staging/rdma/ehca/ehca_sqp.c

drivers/staging/rdma/ehca/ehca_tools.h

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/staging/rdma/ehca/ehca_tools.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_tools.h
rename to drivers/staging/rdma/ehca/ehca_tools.h

drivers/staging/rdma/ehca/ehca_uverbs.c

View file
diff --git a/drivers/infiniband/hw/ehca/ehca_uverbs.c b/drivers/staging/rdma/ehca/ehca_uverbs.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ehca_uverbs.c
rename to drivers/staging/rdma/ehca/ehca_uverbs.c

drivers/staging/rdma/ehca/hcp_if.c

View file
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/staging/rdma/ehca/hcp_if.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/hcp_if.c
rename to drivers/staging/rdma/ehca/hcp_if.c

drivers/staging/rdma/ehca/hcp_if.h

View file
diff --git a/drivers/infiniband/hw/ehca/hcp_if.h b/drivers/staging/rdma/ehca/hcp_if.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/hcp_if.h
rename to drivers/staging/rdma/ehca/hcp_if.h

drivers/staging/rdma/ehca/hcp_phyp.c

View file
diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.c b/drivers/staging/rdma/ehca/hcp_phyp.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/hcp_phyp.c
rename to drivers/staging/rdma/ehca/hcp_phyp.c

drivers/staging/rdma/ehca/hcp_phyp.h

View file
diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.h b/drivers/staging/rdma/ehca/hcp_phyp.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/hcp_phyp.h
rename to drivers/staging/rdma/ehca/hcp_phyp.h

drivers/staging/rdma/ehca/hipz_fns.h

View file
diff --git a/drivers/infiniband/hw/ehca/hipz_fns.h b/drivers/staging/rdma/ehca/hipz_fns.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/hipz_fns.h
rename to drivers/staging/rdma/ehca/hipz_fns.h

drivers/staging/rdma/ehca/hipz_fns_core.h

View file
diff --git a/drivers/infiniband/hw/ehca/hipz_fns_core.h b/drivers/staging/rdma/ehca/hipz_fns_core.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/hipz_fns_core.h
rename to drivers/staging/rdma/ehca/hipz_fns_core.h

drivers/staging/rdma/ehca/hipz_hw.h

View file
diff --git a/drivers/infiniband/hw/ehca/hipz_hw.h b/drivers/staging/rdma/ehca/hipz_hw.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/hipz_hw.h
rename to drivers/staging/rdma/ehca/hipz_hw.h

drivers/staging/rdma/ehca/ipz_pt_fn.c

View file
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/staging/rdma/ehca/ipz_pt_fn.c
similarity index 100%
rename from drivers/infiniband/hw/ehca/ipz_pt_fn.c
rename to drivers/staging/rdma/ehca/ipz_pt_fn.c

drivers/staging/rdma/ehca/ipz_pt_fn.h

View file
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.h b/drivers/staging/rdma/ehca/ipz_pt_fn.h
similarity index 100%
rename from drivers/infiniband/hw/ehca/ipz_pt_fn.h
rename to drivers/staging/rdma/ehca/ipz_pt_fn.h