Skip to contentSkip to conversation

libcxgb3: remove libcxgb3 from rdma-core

PATCH New Potnuri Bharat Teja 1 participant 1 message Oct 24, 2019 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libcxgb3: remove libcxgb3 from rdma-core

remove userspace provider for iw_cxgb3 after removing it from kernel.

---
 CMakeLists.txt                     |   1 -
 MAINTAINERS                        |   5 -
 README.md                          |   1 -
 debian/control                     |  10 +-
 debian/copyright                   |   3 +-
 kernel-boot/rdma-description.rules |   1 -
 kernel-boot/rdma-hw-modules.rules  |   1 -
 kernel-headers/CMakeLists.txt      |   2 -
 kernel-headers/rdma/cxgb3-abi.h    |  82 ----
 libibverbs/verbs.h                 |   1 -
 providers/cxgb3/CMakeLists.txt     |   6 -
 providers/cxgb3/cq.c               | 442 -----------------
 providers/cxgb3/cxio_wr.h          | 758 -----------------------------
 providers/cxgb3/firmware_exports.h | 148 ------
 providers/cxgb3/iwch-abi.h         |  51 --
 providers/cxgb3/iwch.c             | 269 ----------
 providers/cxgb3/iwch.h             | 218 ---------
 providers/cxgb3/qp.c               | 560 ---------------------
 providers/cxgb3/verbs.c            | 476 ------------------
 redhat/rdma-core.spec              |   3 -
 redhat/rdma.kernel-init            |   4 -
 suse/rdma-core.spec                |   2 -
 22 files changed, 4 insertions(+), 3040 deletions(-)
 delete mode 100644 kernel-headers/rdma/cxgb3-abi.h
 delete mode 100644 providers/cxgb3/CMakeLists.txt
 delete mode 100644 providers/cxgb3/cq.c
 delete mode 100644 providers/cxgb3/cxio_wr.h
 delete mode 100644 providers/cxgb3/firmware_exports.h
 delete mode 100644 providers/cxgb3/iwch-abi.h
 delete mode 100644 providers/cxgb3/iwch.c
 delete mode 100644 providers/cxgb3/iwch.h
 delete mode 100644 providers/cxgb3/qp.c
 delete mode 100644 providers/cxgb3/verbs.c
CMakeLists.txt +0 -1
index fc17ef36cf24..cdc8d5444e70 100644
@@ -616,7 +616,6 @@ add_subdirectory(librdmacm/man)
 # Providers
 if (HAVE_COHERENT_DMA)
 add_subdirectory(providers/bnxt_re)
-add_subdirectory(providers/cxgb3) # NO SPARSE
 add_subdirectory(providers/cxgb4) # NO SPARSE
 add_subdirectory(providers/efa)
 add_subdirectory(providers/efa/man)
MAINTAINERS +0 -5
index e47b97b2ff70..8030891d96a4 100644
@@ -51,11 +51,6 @@ M:	Devesh Sharma  <[email protected]>
 S:	Supported
 F:	providers/bnxt_re/
 
-CXGB3 USERSPACE PROVIDER (for iw_cxgb3.ko)
-M:	Steve Wise <[email protected]>
-S:	Supported
-F:	providers/cxgb3/
-
 CXGB4 USERSPACE PROVIDER (for iw_cxgb4.ko)
 M:	Steve Wise <[email protected]>
 S:	Supported
README.md +0 -1
index 451ff7fcb36e..a96351933a27 100644
@@ -15,7 +15,6 @@ under the providers/ directory. Support for the following Kernel RDMA drivers
 is included:
 
  - efa.ko
- - iw_cxgb3.ko
  - iw_cxgb4.ko
  - hfi1.ko
  - hns-roce.ko
debian/control +3 -7
index f8c3b1550e14..65ee3844c42f 100644
@@ -66,21 +66,18 @@ Package: ibverbs-providers
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: libcxgb3-1,
-          libefa1,
+Provides: libefa1,
           libipathverbs1,
           libmlx4-1,
           libmlx5-1,
           libmthca1,
           libnes1
-Replaces: libcxgb3-1 (<< 15),
-          libipathverbs1 (<< 15),
+Replaces: libipathverbs1 (<< 15),
           libmlx4-1 (<< 15),
           libmlx5-1 (<< 15),
           libmthca1 (<< 15),
           libnes1 (<< 15)
-Breaks: libcxgb3-1 (<< 15),
-        libipathverbs1 (<< 15),
+Breaks: libipathverbs1 (<< 15),
         libmlx4-1 (<< 15),
         libmlx5-1 (<< 15),
         libmthca1 (<< 15),
@@ -99,7 +96,6 @@ Description: User space provider drivers for libibverbs
  This package contains the user space verbs drivers:
  .
   - bnxt_re: Broadcom NetXtreme-E RoCE HCAs
-  - cxgb3: Chelsio T3 iWARP HCAs
   - cxgb4: Chelsio T4 iWARP HCAs
   - efa: Amazon Elastic Fabric Adapter
   - hfi1verbs: Intel Omni-Path HFI
debian/copyright +1 -2
index c834859524e1..1af3cd8187cd 100644
@@ -149,8 +149,7 @@ Files: providers/bnxt_re/*
 Copyright: 2015-2017, Broadcom Limited and/or its subsidiaries
 License: BSD-2-clause or GPL-2
 
-Files: providers/cxgb3/*
-       providers/cxgb4/*
+Files: providers/cxgb4/*
 Copyright: 2003-2016, Chelsio Communications, Inc.
 License: BSD-MIT or GPL-2
 
kernel-boot/rdma-description.rules +0 -1
index bb33dce40bd6..4ea59ba1977b 100644
@@ -22,7 +22,6 @@ DRIVERS=="ib_qib", ENV{ID_RDMA_INFINIBAND}="1"
 DRIVERS=="hfi1", ENV{ID_RDMA_OPA}="1"
 
 # Hardware that supports iWarp
-DRIVERS=="cxgb3", ENV{ID_RDMA_IWARP}="1"
 DRIVERS=="cxgb4", ENV{ID_RDMA_IWARP}="1"
 DRIVERS=="i40e", ENV{ID_RDMA_IWARP}="1"
 DRIVERS=="nes", ENV{ID_RDMA_IWARP}="1"
kernel-boot/rdma-hw-modules.rules +0 -1
index dde0ab8dacac..da4bbe363ac4 100644
@@ -8,7 +8,6 @@ SUBSYSTEM!="net", GOTO="rdma_hw_modules_end"
 # RDMA.
 ENV{ID_NET_DRIVER}=="be2net", RUN{builtin}+="kmod load ocrdma"
 ENV{ID_NET_DRIVER}=="bnxt_en", RUN{builtin}+="kmod load bnxt_re"
-ENV{ID_NET_DRIVER}=="cxgb3", RUN{builtin}+="kmod load iw_cxgb3"
 ENV{ID_NET_DRIVER}=="cxgb4", RUN{builtin}+="kmod load iw_cxgb4"
 ENV{ID_NET_DRIVER}=="hns", RUN{builtin}+="kmod load hns_roce"
 ENV{ID_NET_DRIVER}=="i40e", RUN{builtin}+="kmod load i40iw"
kernel-headers/CMakeLists.txt +0 -2
index 50bc77e6ab6e..b3139b74a1d6 100644
@@ -1,6 +1,5 @@
 publish_internal_headers(rdma
   rdma/bnxt_re-abi.h
-  rdma/cxgb3-abi.h
   rdma/cxgb4-abi.h
   rdma/efa-abi.h
   rdma/hns-abi.h
@@ -59,7 +58,6 @@ endfunction()
 # Transform the kernel ABIs used by the providers
 rdma_kernel_provider_abi(
   rdma/bnxt_re-abi.h
-  rdma/cxgb3-abi.h
   rdma/cxgb4-abi.h
   rdma/efa-abi.h
   rdma/hns-abi.h
kernel-headers/rdma/cxgb3-abi.h deleted +0 -82

82 lines not on this page · raw message

libibverbs/verbs.h +0 -1
index c411722b154f..12a33a99a968 100644
@@ -2144,7 +2144,6 @@ struct ibv_device **ibv_get_device_list(int *num_devices);
 
 struct verbs_devices_ops;
 extern const struct verbs_device_ops verbs_provider_bnxt_re;
-extern const struct verbs_device_ops verbs_provider_cxgb3;
 extern const struct verbs_device_ops verbs_provider_cxgb4;
 extern const struct verbs_device_ops verbs_provider_efa;
 extern const struct verbs_device_ops verbs_provider_hfi1verbs;
providers/cxgb3/CMakeLists.txt deleted +0 -6
deleted file mode 100644
index a578105e7b28..000000000000
@@ -1,6 +0,0 @@
-rdma_provider(cxgb3
-  cq.c
-  iwch.c
-  qp.c
-  verbs.c
-)
providers/cxgb3/cq.c deleted +0 -442

442 lines not on this page · raw message

providers/cxgb3/cxio_wr.h deleted +0 -758

758 lines not on this page · raw message

providers/cxgb3/firmware_exports.h deleted +0 -148

148 lines not on this page · raw message

providers/cxgb3/iwch-abi.h deleted +0 -51

51 lines not on this page · raw message

providers/cxgb3/iwch.c deleted +0 -269

269 lines not on this page · raw message

providers/cxgb3/iwch.h deleted +0 -218

218 lines not on this page · raw message

providers/cxgb3/qp.c deleted +0 -560

560 lines not on this page · raw message

providers/cxgb3/verbs.c deleted +0 -476

367 lines not on this page · raw message

redhat/rdma-core.spec +0 -3
index 731a4e10ff7b..f796246ce192 100644

Lines of this file are not shown. View the raw message.

redhat/rdma.kernel-init +0 -4
index 6f50e72fcc3b..c7444a1c8d77 100644

Lines of this file are not shown. View the raw message.

suse/rdma-core.spec +0 -2
index 3221657d0682..c6562f1d2ca3 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.18.0.232.gb7bd9486b055

Part of the diff is not shown here. View the raw message.