From 072bf1f7e4b5963034df35460f5f311396347a36 Mon Sep 17 00:00:00 2001 From: Steve Wise Date: Wed, 29 Jul 2015 09:44:14 -0500 Subject: [PATCH] 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 Signed-off-by: Doug Ledford --- drivers/infiniband/Kconfig | 1 - drivers/infiniband/hw/Makefile | 1 - drivers/staging/rdma/Kconfig | 2 ++ drivers/staging/rdma/Makefile | 1 + drivers/{infiniband/hw => staging/rdma}/amso1100/Kbuild | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/Kconfig | 0 drivers/staging/rdma/amso1100/TODO | 4 ++++ drivers/{infiniband/hw => staging/rdma}/amso1100/c2.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_ae.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_ae.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_alloc.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_cm.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_cq.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_intr.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_mm.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_mq.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_mq.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_pd.c | 0 .../{infiniband/hw => staging/rdma}/amso1100/c2_provider.c | 0 .../{infiniband/hw => staging/rdma}/amso1100/c2_provider.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_qp.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_rnic.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_status.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_user.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_vq.c | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_vq.h | 0 drivers/{infiniband/hw => staging/rdma}/amso1100/c2_wr.h | 0 28 files changed, 7 insertions(+), 2 deletions(-) rename drivers/{infiniband/hw => staging/rdma}/amso1100/Kbuild (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/Kconfig (100%) create mode 100644 drivers/staging/rdma/amso1100/TODO rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_ae.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_ae.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_alloc.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_cm.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_cq.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_intr.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_mm.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_mq.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_mq.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_pd.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_provider.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_provider.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_qp.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_rnic.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_status.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_user.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_vq.c (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_vq.h (100%) rename drivers/{infiniband/hw => staging/rdma}/amso1100/c2_wr.h (100%) diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 7d6034fd456b..da4c6979fbb8 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -57,7 +57,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/amso1100/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 index d1212c441dfa..1bdb9996d371 100644 --- a/drivers/infiniband/hw/Makefile +++ b/drivers/infiniband/hw/Makefile @@ -1,7 +1,6 @@ obj-$(CONFIG_INFINIBAND_MTHCA) += mthca/ obj-$(CONFIG_INFINIBAND_QIB) += qib/ obj-$(CONFIG_INFINIBAND_EHCA) += ehca/ -obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/ 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 index e582553e1814..5084088c8946 100644 --- a/drivers/staging/rdma/Kconfig +++ b/drivers/staging/rdma/Kconfig @@ -22,6 +22,8 @@ menuconfig STAGING_RDMA # Please keep entries in alphabetic order if STAGING_RDMA +source "drivers/staging/rdma/amso1100/Kconfig" + source "drivers/staging/rdma/ipath/Kconfig" endif diff --git a/drivers/staging/rdma/Makefile b/drivers/staging/rdma/Makefile index 484dac754945..a2a459ac8d67 100644 --- a/drivers/staging/rdma/Makefile +++ b/drivers/staging/rdma/Makefile @@ -1,2 +1,3 @@ # Entries for RDMA_STAGING tree +obj-$(CONFIG_INFINIBAND_AMSO1100) += amso1100/ obj-$(CONFIG_INFINIBAND_IPATH) += ipath/ diff --git a/drivers/infiniband/hw/amso1100/Kbuild b/drivers/staging/rdma/amso1100/Kbuild similarity index 100% rename from drivers/infiniband/hw/amso1100/Kbuild rename to drivers/staging/rdma/amso1100/Kbuild diff --git a/drivers/infiniband/hw/amso1100/Kconfig b/drivers/staging/rdma/amso1100/Kconfig similarity index 100% rename from drivers/infiniband/hw/amso1100/Kconfig rename to drivers/staging/rdma/amso1100/Kconfig diff --git a/drivers/staging/rdma/amso1100/TODO b/drivers/staging/rdma/amso1100/TODO new file mode 100644 index 000000000000..18b00a5cb549 --- /dev/null +++ b/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. diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/staging/rdma/amso1100/c2.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2.c rename to drivers/staging/rdma/amso1100/c2.c diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/staging/rdma/amso1100/c2.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2.h rename to drivers/staging/rdma/amso1100/c2.h diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/staging/rdma/amso1100/c2_ae.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_ae.c rename to drivers/staging/rdma/amso1100/c2_ae.c diff --git a/drivers/infiniband/hw/amso1100/c2_ae.h b/drivers/staging/rdma/amso1100/c2_ae.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_ae.h rename to drivers/staging/rdma/amso1100/c2_ae.h diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c b/drivers/staging/rdma/amso1100/c2_alloc.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_alloc.c rename to drivers/staging/rdma/amso1100/c2_alloc.c diff --git a/drivers/infiniband/hw/amso1100/c2_cm.c b/drivers/staging/rdma/amso1100/c2_cm.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_cm.c rename to drivers/staging/rdma/amso1100/c2_cm.c diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/staging/rdma/amso1100/c2_cq.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_cq.c rename to drivers/staging/rdma/amso1100/c2_cq.c diff --git a/drivers/infiniband/hw/amso1100/c2_intr.c b/drivers/staging/rdma/amso1100/c2_intr.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_intr.c rename to drivers/staging/rdma/amso1100/c2_intr.c diff --git a/drivers/infiniband/hw/amso1100/c2_mm.c b/drivers/staging/rdma/amso1100/c2_mm.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_mm.c rename to drivers/staging/rdma/amso1100/c2_mm.c diff --git a/drivers/infiniband/hw/amso1100/c2_mq.c b/drivers/staging/rdma/amso1100/c2_mq.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_mq.c rename to drivers/staging/rdma/amso1100/c2_mq.c diff --git a/drivers/infiniband/hw/amso1100/c2_mq.h b/drivers/staging/rdma/amso1100/c2_mq.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_mq.h rename to drivers/staging/rdma/amso1100/c2_mq.h diff --git a/drivers/infiniband/hw/amso1100/c2_pd.c b/drivers/staging/rdma/amso1100/c2_pd.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_pd.c rename to drivers/staging/rdma/amso1100/c2_pd.c diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/staging/rdma/amso1100/c2_provider.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_provider.c rename to drivers/staging/rdma/amso1100/c2_provider.c diff --git a/drivers/infiniband/hw/amso1100/c2_provider.h b/drivers/staging/rdma/amso1100/c2_provider.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_provider.h rename to drivers/staging/rdma/amso1100/c2_provider.h diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/staging/rdma/amso1100/c2_qp.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_qp.c rename to drivers/staging/rdma/amso1100/c2_qp.c diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/staging/rdma/amso1100/c2_rnic.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_rnic.c rename to drivers/staging/rdma/amso1100/c2_rnic.c diff --git a/drivers/infiniband/hw/amso1100/c2_status.h b/drivers/staging/rdma/amso1100/c2_status.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_status.h rename to drivers/staging/rdma/amso1100/c2_status.h diff --git a/drivers/infiniband/hw/amso1100/c2_user.h b/drivers/staging/rdma/amso1100/c2_user.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_user.h rename to drivers/staging/rdma/amso1100/c2_user.h diff --git a/drivers/infiniband/hw/amso1100/c2_vq.c b/drivers/staging/rdma/amso1100/c2_vq.c similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_vq.c rename to drivers/staging/rdma/amso1100/c2_vq.c diff --git a/drivers/infiniband/hw/amso1100/c2_vq.h b/drivers/staging/rdma/amso1100/c2_vq.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_vq.h rename to drivers/staging/rdma/amso1100/c2_vq.h diff --git a/drivers/infiniband/hw/amso1100/c2_wr.h b/drivers/staging/rdma/amso1100/c2_wr.h similarity index 100% rename from drivers/infiniband/hw/amso1100/c2_wr.h rename to drivers/staging/rdma/amso1100/c2_wr.h -- 2.39.5