浏览代码

RDMA/amso1100: Deprecate the amso1100 driver and move to staging

The HW hasn't been sold since 2005, and the SW has definite bit rot.
Its time to remove it.  So move it to staging for a few releases and
then remove it after that.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Steve Wise 10 年之前
父节点
当前提交
072bf1f7e4

+ 0 - 1
drivers/infiniband/Kconfig

@@ -57,7 +57,6 @@ config INFINIBAND_ADDR_TRANS
 source "drivers/infiniband/hw/mthca/Kconfig"
 source "drivers/infiniband/hw/mthca/Kconfig"
 source "drivers/infiniband/hw/qib/Kconfig"
 source "drivers/infiniband/hw/qib/Kconfig"
 source "drivers/infiniband/hw/ehca/Kconfig"
 source "drivers/infiniband/hw/ehca/Kconfig"
-source "drivers/infiniband/hw/amso1100/Kconfig"
 source "drivers/infiniband/hw/cxgb3/Kconfig"
 source "drivers/infiniband/hw/cxgb3/Kconfig"
 source "drivers/infiniband/hw/cxgb4/Kconfig"
 source "drivers/infiniband/hw/cxgb4/Kconfig"
 source "drivers/infiniband/hw/mlx4/Kconfig"
 source "drivers/infiniband/hw/mlx4/Kconfig"

+ 0 - 1
drivers/infiniband/hw/Makefile

@@ -1,7 +1,6 @@
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= mthca/
 obj-$(CONFIG_INFINIBAND_MTHCA)		+= mthca/
 obj-$(CONFIG_INFINIBAND_QIB)		+= qib/
 obj-$(CONFIG_INFINIBAND_QIB)		+= qib/
 obj-$(CONFIG_INFINIBAND_EHCA)		+= ehca/
 obj-$(CONFIG_INFINIBAND_EHCA)		+= ehca/
-obj-$(CONFIG_INFINIBAND_AMSO1100)	+= amso1100/
 obj-$(CONFIG_INFINIBAND_CXGB3)		+= cxgb3/
 obj-$(CONFIG_INFINIBAND_CXGB3)		+= cxgb3/
 obj-$(CONFIG_INFINIBAND_CXGB4)		+= cxgb4/
 obj-$(CONFIG_INFINIBAND_CXGB4)		+= cxgb4/
 obj-$(CONFIG_MLX4_INFINIBAND)		+= mlx4/
 obj-$(CONFIG_MLX4_INFINIBAND)		+= mlx4/

+ 2 - 0
drivers/staging/rdma/Kconfig

@@ -22,6 +22,8 @@ menuconfig STAGING_RDMA
 # Please keep entries in alphabetic order
 # Please keep entries in alphabetic order
 if STAGING_RDMA
 if STAGING_RDMA
 
 
+source "drivers/staging/rdma/amso1100/Kconfig"
+
 source "drivers/staging/rdma/ipath/Kconfig"
 source "drivers/staging/rdma/ipath/Kconfig"
 
 
 endif
 endif

+ 1 - 0
drivers/staging/rdma/Makefile

@@ -1,2 +1,3 @@
 # Entries for RDMA_STAGING tree
 # Entries for RDMA_STAGING tree
+obj-$(CONFIG_INFINIBAND_AMSO1100)	+= amso1100/
 obj-$(CONFIG_INFINIBAND_IPATH)	+= ipath/
 obj-$(CONFIG_INFINIBAND_IPATH)	+= ipath/

+ 0 - 0
drivers/infiniband/hw/amso1100/Kbuild → drivers/staging/rdma/amso1100/Kbuild


+ 0 - 0
drivers/infiniband/hw/amso1100/Kconfig → drivers/staging/rdma/amso1100/Kconfig


+ 4 - 0
drivers/staging/rdma/amso1100/TODO

@@ -0,0 +1,4 @@
+7/2015
+
+The amso1100 driver has been deprecated and moved to drivers/staging.
+It will be removed in the 4.6 merge window.

+ 0 - 0
drivers/infiniband/hw/amso1100/c2.c → drivers/staging/rdma/amso1100/c2.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2.h → drivers/staging/rdma/amso1100/c2.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_ae.c → drivers/staging/rdma/amso1100/c2_ae.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_ae.h → drivers/staging/rdma/amso1100/c2_ae.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_alloc.c → drivers/staging/rdma/amso1100/c2_alloc.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_cm.c → drivers/staging/rdma/amso1100/c2_cm.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_cq.c → drivers/staging/rdma/amso1100/c2_cq.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_intr.c → drivers/staging/rdma/amso1100/c2_intr.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_mm.c → drivers/staging/rdma/amso1100/c2_mm.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_mq.c → drivers/staging/rdma/amso1100/c2_mq.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_mq.h → drivers/staging/rdma/amso1100/c2_mq.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_pd.c → drivers/staging/rdma/amso1100/c2_pd.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_provider.c → drivers/staging/rdma/amso1100/c2_provider.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_provider.h → drivers/staging/rdma/amso1100/c2_provider.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_qp.c → drivers/staging/rdma/amso1100/c2_qp.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_rnic.c → drivers/staging/rdma/amso1100/c2_rnic.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_status.h → drivers/staging/rdma/amso1100/c2_status.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_user.h → drivers/staging/rdma/amso1100/c2_user.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_vq.c → drivers/staging/rdma/amso1100/c2_vq.c


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_vq.h → drivers/staging/rdma/amso1100/c2_vq.h


+ 0 - 0
drivers/infiniband/hw/amso1100/c2_wr.h → drivers/staging/rdma/amso1100/c2_wr.h