53b40e150c
- Update to v27.0 (bsc#1160338) - No release notes available - Dropped patches merged upstream: - bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch - bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch - Add patches to support older HW (nes, cxgb3) that was dropped upstream - Revert-Update-kernel-headers.patch - Revert-libcxgb3-Remove-libcxgb3-from-rdma-core.patch - Revert-libnes-Remove-libnes-from-rdma-core.patch OBS-URL: https://build.opensuse.org/request/show/763762 OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=126
253 lines
7.5 KiB
Diff
253 lines
7.5 KiB
Diff
commit a53161ed3b4ed1502c9fa47e82bd79dec29714ad
|
|
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
|
Date: Fri Jan 10 09:24:53 2020 +0100
|
|
|
|
Revert "Update kernel headers"
|
|
|
|
This reverts commit c21a3cf5d9e4cef0904b4d47f1cb43be9efdbf90.
|
|
|
|
diff --git kernel-headers/CMakeLists.txt kernel-headers/CMakeLists.txt
|
|
index 2d0766dd1280..13624b22d81b 100644
|
|
--- kernel-headers/CMakeLists.txt
|
|
+++ kernel-headers/CMakeLists.txt
|
|
@@ -1,5 +1,6 @@
|
|
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
|
|
@@ -14,6 +15,7 @@ publish_internal_headers(rdma
|
|
rdma/mlx5_user_ioctl_cmds.h
|
|
rdma/mlx5_user_ioctl_verbs.h
|
|
rdma/mthca-abi.h
|
|
+ rdma/nes-abi.h
|
|
rdma/ocrdma-abi.h
|
|
rdma/qedr-abi.h
|
|
rdma/rdma_netlink.h
|
|
@@ -58,6 +60,7 @@ 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
|
|
@@ -66,6 +69,7 @@ rdma_kernel_provider_abi(
|
|
rdma/mlx4-abi.h
|
|
rdma/mlx5-abi.h
|
|
rdma/mthca-abi.h
|
|
+ rdma/nes-abi.h
|
|
rdma/ocrdma-abi.h
|
|
rdma/qedr-abi.h
|
|
rdma/rdma_user_rxe.h
|
|
diff --git kernel-headers/rdma/cxgb3-abi.h kernel-headers/rdma/cxgb3-abi.h
|
|
new file mode 100644
|
|
index 000000000000..85aed672f43e
|
|
--- /dev/null
|
|
+++ kernel-headers/rdma/cxgb3-abi.h
|
|
@@ -0,0 +1,82 @@
|
|
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
|
|
+/*
|
|
+ * Copyright (c) 2006 Chelsio, Inc. All rights reserved.
|
|
+ *
|
|
+ * This software is available to you under a choice of one of two
|
|
+ * licenses. You may choose to be licensed under the terms of the GNU
|
|
+ * General Public License (GPL) Version 2, available from the file
|
|
+ * COPYING in the main directory of this source tree, or the
|
|
+ * OpenIB.org BSD license below:
|
|
+ *
|
|
+ * Redistribution and use in source and binary forms, with or
|
|
+ * without modification, are permitted provided that the following
|
|
+ * conditions are met:
|
|
+ *
|
|
+ * - Redistributions of source code must retain the above
|
|
+ * copyright notice, this list of conditions and the following
|
|
+ * disclaimer.
|
|
+ *
|
|
+ * - Redistributions in binary form must reproduce the above
|
|
+ * copyright notice, this list of conditions and the following
|
|
+ * disclaimer in the documentation and/or other materials
|
|
+ * provided with the distribution.
|
|
+ *
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
+ * SOFTWARE.
|
|
+ */
|
|
+#ifndef CXGB3_ABI_USER_H
|
|
+#define CXGB3_ABI_USER_H
|
|
+
|
|
+#include <linux/types.h>
|
|
+
|
|
+#define IWCH_UVERBS_ABI_VERSION 1
|
|
+
|
|
+/*
|
|
+ * Make sure that all structs defined in this file remain laid out so
|
|
+ * that they pack the same way on 32-bit and 64-bit architectures (to
|
|
+ * avoid incompatibility between 32-bit userspace and 64-bit kernels).
|
|
+ * In particular do not use pointer types -- pass pointers in __aligned_u64
|
|
+ * instead.
|
|
+ */
|
|
+struct iwch_create_cq_req {
|
|
+ __aligned_u64 user_rptr_addr;
|
|
+};
|
|
+
|
|
+struct iwch_create_cq_resp_v0 {
|
|
+ __aligned_u64 key;
|
|
+ __u32 cqid;
|
|
+ __u32 size_log2;
|
|
+};
|
|
+
|
|
+struct iwch_create_cq_resp {
|
|
+ __aligned_u64 key;
|
|
+ __u32 cqid;
|
|
+ __u32 size_log2;
|
|
+ __u32 memsize;
|
|
+ __u32 reserved;
|
|
+};
|
|
+
|
|
+struct iwch_create_qp_resp {
|
|
+ __aligned_u64 key;
|
|
+ __aligned_u64 db_key;
|
|
+ __u32 qpid;
|
|
+ __u32 size_log2;
|
|
+ __u32 sq_size_log2;
|
|
+ __u32 rq_size_log2;
|
|
+};
|
|
+
|
|
+struct iwch_reg_user_mr_resp {
|
|
+ __u32 pbl_addr;
|
|
+};
|
|
+
|
|
+struct iwch_alloc_pd_resp {
|
|
+ __u32 pdid;
|
|
+};
|
|
+
|
|
+#endif /* CXGB3_ABI_USER_H */
|
|
diff --git kernel-headers/rdma/nes-abi.h kernel-headers/rdma/nes-abi.h
|
|
new file mode 100644
|
|
index 000000000000..f80495baa969
|
|
--- /dev/null
|
|
+++ kernel-headers/rdma/nes-abi.h
|
|
@@ -0,0 +1,115 @@
|
|
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */
|
|
+/*
|
|
+ * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved.
|
|
+ * Copyright (c) 2005 Topspin Communications. All rights reserved.
|
|
+ * Copyright (c) 2005 Cisco Systems. All rights reserved.
|
|
+ * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
|
|
+ *
|
|
+ * This software is available to you under a choice of one of two
|
|
+ * licenses. You may choose to be licensed under the terms of the GNU
|
|
+ * General Public License (GPL) Version 2, available from the file
|
|
+ * COPYING in the main directory of this source tree, or the
|
|
+ * OpenIB.org BSD license below:
|
|
+ *
|
|
+ * Redistribution and use in source and binary forms, with or
|
|
+ * without modification, are permitted provided that the following
|
|
+ * conditions are met:
|
|
+ *
|
|
+ * - Redistributions of source code must retain the above
|
|
+ * copyright notice, this list of conditions and the following
|
|
+ * disclaimer.
|
|
+ *
|
|
+ * - Redistributions in binary form must reproduce the above
|
|
+ * copyright notice, this list of conditions and the following
|
|
+ * disclaimer in the documentation and/or other materials
|
|
+ * provided with the distribution.
|
|
+ *
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
+ * SOFTWARE.
|
|
+ *
|
|
+ */
|
|
+
|
|
+#ifndef NES_ABI_USER_H
|
|
+#define NES_ABI_USER_H
|
|
+
|
|
+#include <linux/types.h>
|
|
+
|
|
+#define NES_ABI_USERSPACE_VER 2
|
|
+#define NES_ABI_KERNEL_VER 2
|
|
+
|
|
+/*
|
|
+ * Make sure that all structs defined in this file remain laid out so
|
|
+ * that they pack the same way on 32-bit and 64-bit architectures (to
|
|
+ * avoid incompatibility between 32-bit userspace and 64-bit kernels).
|
|
+ * In particular do not use pointer types -- pass pointers in __u64
|
|
+ * instead.
|
|
+ */
|
|
+
|
|
+struct nes_alloc_ucontext_req {
|
|
+ __u32 reserved32;
|
|
+ __u8 userspace_ver;
|
|
+ __u8 reserved8[3];
|
|
+};
|
|
+
|
|
+struct nes_alloc_ucontext_resp {
|
|
+ __u32 max_pds; /* maximum pds allowed for this user process */
|
|
+ __u32 max_qps; /* maximum qps allowed for this user process */
|
|
+ __u32 wq_size; /* size of the WQs (sq+rq) allocated to the mmaped area */
|
|
+ __u8 virtwq; /* flag to indicate if virtual WQ are to be used or not */
|
|
+ __u8 kernel_ver;
|
|
+ __u8 reserved[2];
|
|
+};
|
|
+
|
|
+struct nes_alloc_pd_resp {
|
|
+ __u32 pd_id;
|
|
+ __u32 mmap_db_index;
|
|
+};
|
|
+
|
|
+struct nes_create_cq_req {
|
|
+ __aligned_u64 user_cq_buffer;
|
|
+ __u32 mcrqf;
|
|
+ __u8 reserved[4];
|
|
+};
|
|
+
|
|
+struct nes_create_qp_req {
|
|
+ __aligned_u64 user_wqe_buffers;
|
|
+ __aligned_u64 user_qp_buffer;
|
|
+};
|
|
+
|
|
+enum iwnes_memreg_type {
|
|
+ IWNES_MEMREG_TYPE_MEM = 0x0000,
|
|
+ IWNES_MEMREG_TYPE_QP = 0x0001,
|
|
+ IWNES_MEMREG_TYPE_CQ = 0x0002,
|
|
+ IWNES_MEMREG_TYPE_MW = 0x0003,
|
|
+ IWNES_MEMREG_TYPE_FMR = 0x0004,
|
|
+ IWNES_MEMREG_TYPE_FMEM = 0x0005,
|
|
+};
|
|
+
|
|
+struct nes_mem_reg_req {
|
|
+ __u32 reg_type; /* indicates if id is memory, QP or CQ */
|
|
+ __u32 reserved;
|
|
+};
|
|
+
|
|
+struct nes_create_cq_resp {
|
|
+ __u32 cq_id;
|
|
+ __u32 cq_size;
|
|
+ __u32 mmap_db_index;
|
|
+ __u32 reserved;
|
|
+};
|
|
+
|
|
+struct nes_create_qp_resp {
|
|
+ __u32 qp_id;
|
|
+ __u32 actual_sq_size;
|
|
+ __u32 actual_rq_size;
|
|
+ __u32 mmap_sq_db_index;
|
|
+ __u32 mmap_rq_db_index;
|
|
+ __u32 nes_drv_opt;
|
|
+};
|
|
+
|
|
+#endif /* NES_ABI_USER_H */
|