]>
Commit | Line | Data |
---|---|---|
59dabf6f JB |
1 | From c21a3cf5d9e4cef0904b4d47f1cb43be9efdbf90 Mon Sep 17 00:00:00 2001 |
2 | From: Michal Kalderon <michal.kalderon@marvell.com> | |
3 | Date: Thu, 24 Oct 2019 14:23:03 +0300 | |
4 | Subject: [PATCH] Update kernel headers | |
5 | ||
6 | To commit b4bc76609722 ("RDMA/qedr: Add iWARP doorbell recovery support") | |
7 | ||
8 | Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com> | |
9 | Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> | |
10 | --- | |
11 | kernel-headers/CMakeLists.txt | 5 +- | |
12 | kernel-headers/rdma/cxgb3-abi.h | 82 --------------- | |
13 | kernel-headers/rdma/ib_user_ioctl_verbs.h | 22 ++++ | |
14 | kernel-headers/rdma/nes-abi.h | 115 --------------------- | |
15 | kernel-headers/rdma/qedr-abi.h | 25 +++++ | |
16 | kernel-headers/rdma/rdma_user_ioctl_cmds.h | 22 ---- | |
17 | kernel-headers/rdma/rvt-abi.h | 66 ++++++++++++ | |
18 | kernel-headers/rdma/vmw_pvrdma-abi.h | 5 + | |
19 | 8 files changed, 119 insertions(+), 223 deletions(-) | |
20 | delete mode 100644 kernel-headers/rdma/cxgb3-abi.h | |
21 | delete mode 100644 kernel-headers/rdma/nes-abi.h | |
22 | create mode 100644 kernel-headers/rdma/rvt-abi.h | |
23 | ||
24 | diff --git a/kernel-headers/CMakeLists.txt b/kernel-headers/CMakeLists.txt | |
25 | index 50bc77e6a..2d0766dd1 100644 | |
26 | --- a/kernel-headers/CMakeLists.txt | |
27 | +++ b/kernel-headers/CMakeLists.txt | |
28 | @@ -1,6 +1,5 @@ | |
29 | publish_internal_headers(rdma | |
30 | rdma/bnxt_re-abi.h | |
31 | - rdma/cxgb3-abi.h | |
32 | rdma/cxgb4-abi.h | |
33 | rdma/efa-abi.h | |
34 | rdma/hns-abi.h | |
35 | @@ -15,7 +14,6 @@ publish_internal_headers(rdma | |
36 | rdma/mlx5_user_ioctl_cmds.h | |
37 | rdma/mlx5_user_ioctl_verbs.h | |
38 | rdma/mthca-abi.h | |
39 | - rdma/nes-abi.h | |
40 | rdma/ocrdma-abi.h | |
41 | rdma/qedr-abi.h | |
42 | rdma/rdma_netlink.h | |
43 | @@ -59,7 +58,6 @@ endfunction() | |
44 | # Transform the kernel ABIs used by the providers | |
45 | rdma_kernel_provider_abi( | |
46 | rdma/bnxt_re-abi.h | |
47 | - rdma/cxgb3-abi.h | |
48 | rdma/cxgb4-abi.h | |
49 | rdma/efa-abi.h | |
50 | rdma/hns-abi.h | |
51 | @@ -68,7 +66,6 @@ rdma_kernel_provider_abi( | |
52 | rdma/mlx4-abi.h | |
53 | rdma/mlx5-abi.h | |
54 | rdma/mthca-abi.h | |
55 | - rdma/nes-abi.h | |
56 | rdma/ocrdma-abi.h | |
57 | rdma/qedr-abi.h | |
58 | rdma/rdma_user_rxe.h | |
59 | diff --git a/kernel-headers/rdma/cxgb3-abi.h b/kernel-headers/rdma/cxgb3-abi.h | |
60 | deleted file mode 100644 | |
61 | index 85aed672f..000000000 | |
62 | --- a/kernel-headers/rdma/cxgb3-abi.h | |
63 | +++ /dev/null | |
64 | @@ -1,82 +0,0 @@ | |
65 | -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ | |
66 | -/* | |
67 | - * Copyright (c) 2006 Chelsio, Inc. All rights reserved. | |
68 | - * | |
69 | - * This software is available to you under a choice of one of two | |
70 | - * licenses. You may choose to be licensed under the terms of the GNU | |
71 | - * General Public License (GPL) Version 2, available from the file | |
72 | - * COPYING in the main directory of this source tree, or the | |
73 | - * OpenIB.org BSD license below: | |
74 | - * | |
75 | - * Redistribution and use in source and binary forms, with or | |
76 | - * without modification, are permitted provided that the following | |
77 | - * conditions are met: | |
78 | - * | |
79 | - * - Redistributions of source code must retain the above | |
80 | - * copyright notice, this list of conditions and the following | |
81 | - * disclaimer. | |
82 | - * | |
83 | - * - Redistributions in binary form must reproduce the above | |
84 | - * copyright notice, this list of conditions and the following | |
85 | - * disclaimer in the documentation and/or other materials | |
86 | - * provided with the distribution. | |
87 | - * | |
88 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
89 | - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
90 | - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |
91 | - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | |
92 | - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | |
93 | - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |
94 | - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
95 | - * SOFTWARE. | |
96 | - */ | |
97 | -#ifndef CXGB3_ABI_USER_H | |
98 | -#define CXGB3_ABI_USER_H | |
99 | - | |
100 | -#include <linux/types.h> | |
101 | - | |
102 | -#define IWCH_UVERBS_ABI_VERSION 1 | |
103 | - | |
104 | -/* | |
105 | - * Make sure that all structs defined in this file remain laid out so | |
106 | - * that they pack the same way on 32-bit and 64-bit architectures (to | |
107 | - * avoid incompatibility between 32-bit userspace and 64-bit kernels). | |
108 | - * In particular do not use pointer types -- pass pointers in __aligned_u64 | |
109 | - * instead. | |
110 | - */ | |
111 | -struct iwch_create_cq_req { | |
112 | - __aligned_u64 user_rptr_addr; | |
113 | -}; | |
114 | - | |
115 | -struct iwch_create_cq_resp_v0 { | |
116 | - __aligned_u64 key; | |
117 | - __u32 cqid; | |
118 | - __u32 size_log2; | |
119 | -}; | |
120 | - | |
121 | -struct iwch_create_cq_resp { | |
122 | - __aligned_u64 key; | |
123 | - __u32 cqid; | |
124 | - __u32 size_log2; | |
125 | - __u32 memsize; | |
126 | - __u32 reserved; | |
127 | -}; | |
128 | - | |
129 | -struct iwch_create_qp_resp { | |
130 | - __aligned_u64 key; | |
131 | - __aligned_u64 db_key; | |
132 | - __u32 qpid; | |
133 | - __u32 size_log2; | |
134 | - __u32 sq_size_log2; | |
135 | - __u32 rq_size_log2; | |
136 | -}; | |
137 | - | |
138 | -struct iwch_reg_user_mr_resp { | |
139 | - __u32 pbl_addr; | |
140 | -}; | |
141 | - | |
142 | -struct iwch_alloc_pd_resp { | |
143 | - __u32 pdid; | |
144 | -}; | |
145 | - | |
146 | -#endif /* CXGB3_ABI_USER_H */ | |
147 | diff --git a/kernel-headers/rdma/nes-abi.h b/kernel-headers/rdma/nes-abi.h | |
148 | deleted file mode 100644 | |
149 | index f80495baa..000000000 | |
150 | --- a/kernel-headers/rdma/nes-abi.h | |
151 | +++ /dev/null | |
152 | @@ -1,115 +0,0 @@ | |
153 | -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR Linux-OpenIB) */ | |
154 | -/* | |
155 | - * Copyright (c) 2006 - 2011 Intel Corporation. All rights reserved. | |
156 | - * Copyright (c) 2005 Topspin Communications. All rights reserved. | |
157 | - * Copyright (c) 2005 Cisco Systems. All rights reserved. | |
158 | - * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. | |
159 | - * | |
160 | - * This software is available to you under a choice of one of two | |
161 | - * licenses. You may choose to be licensed under the terms of the GNU | |
162 | - * General Public License (GPL) Version 2, available from the file | |
163 | - * COPYING in the main directory of this source tree, or the | |
164 | - * OpenIB.org BSD license below: | |
165 | - * | |
166 | - * Redistribution and use in source and binary forms, with or | |
167 | - * without modification, are permitted provided that the following | |
168 | - * conditions are met: | |
169 | - * | |
170 | - * - Redistributions of source code must retain the above | |
171 | - * copyright notice, this list of conditions and the following | |
172 | - * disclaimer. | |
173 | - * | |
174 | - * - Redistributions in binary form must reproduce the above | |
175 | - * copyright notice, this list of conditions and the following | |
176 | - * disclaimer in the documentation and/or other materials | |
177 | - * provided with the distribution. | |
178 | - * | |
179 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
180 | - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
181 | - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | |
182 | - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | |
183 | - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | |
184 | - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | |
185 | - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | |
186 | - * SOFTWARE. | |
187 | - * | |
188 | - */ | |
189 | - | |
190 | -#ifndef NES_ABI_USER_H | |
191 | -#define NES_ABI_USER_H | |
192 | - | |
193 | -#include <linux/types.h> | |
194 | - | |
195 | -#define NES_ABI_USERSPACE_VER 2 | |
196 | -#define NES_ABI_KERNEL_VER 2 | |
197 | - | |
198 | -/* | |
199 | - * Make sure that all structs defined in this file remain laid out so | |
200 | - * that they pack the same way on 32-bit and 64-bit architectures (to | |
201 | - * avoid incompatibility between 32-bit userspace and 64-bit kernels). | |
202 | - * In particular do not use pointer types -- pass pointers in __u64 | |
203 | - * instead. | |
204 | - */ | |
205 | - | |
206 | -struct nes_alloc_ucontext_req { | |
207 | - __u32 reserved32; | |
208 | - __u8 userspace_ver; | |
209 | - __u8 reserved8[3]; | |
210 | -}; | |
211 | - | |
212 | -struct nes_alloc_ucontext_resp { | |
213 | - __u32 max_pds; /* maximum pds allowed for this user process */ | |
214 | - __u32 max_qps; /* maximum qps allowed for this user process */ | |
215 | - __u32 wq_size; /* size of the WQs (sq+rq) allocated to the mmaped area */ | |
216 | - __u8 virtwq; /* flag to indicate if virtual WQ are to be used or not */ | |
217 | - __u8 kernel_ver; | |
218 | - __u8 reserved[2]; | |
219 | -}; | |
220 | - | |
221 | -struct nes_alloc_pd_resp { | |
222 | - __u32 pd_id; | |
223 | - __u32 mmap_db_index; | |
224 | -}; | |
225 | - | |
226 | -struct nes_create_cq_req { | |
227 | - __aligned_u64 user_cq_buffer; | |
228 | - __u32 mcrqf; | |
229 | - __u8 reserved[4]; | |
230 | -}; | |
231 | - | |
232 | -struct nes_create_qp_req { | |
233 | - __aligned_u64 user_wqe_buffers; | |
234 | - __aligned_u64 user_qp_buffer; | |
235 | -}; | |
236 | - | |
237 | -enum iwnes_memreg_type { | |
238 | - IWNES_MEMREG_TYPE_MEM = 0x0000, | |
239 | - IWNES_MEMREG_TYPE_QP = 0x0001, | |
240 | - IWNES_MEMREG_TYPE_CQ = 0x0002, | |
241 | - IWNES_MEMREG_TYPE_MW = 0x0003, | |
242 | - IWNES_MEMREG_TYPE_FMR = 0x0004, | |
243 | - IWNES_MEMREG_TYPE_FMEM = 0x0005, | |
244 | -}; | |
245 | - | |
246 | -struct nes_mem_reg_req { | |
247 | - __u32 reg_type; /* indicates if id is memory, QP or CQ */ | |
248 | - __u32 reserved; | |
249 | -}; | |
250 | - | |
251 | -struct nes_create_cq_resp { | |
252 | - __u32 cq_id; | |
253 | - __u32 cq_size; | |
254 | - __u32 mmap_db_index; | |
255 | - __u32 reserved; | |
256 | -}; | |
257 | - | |
258 | -struct nes_create_qp_resp { | |
259 | - __u32 qp_id; | |
260 | - __u32 actual_sq_size; | |
261 | - __u32 actual_rq_size; | |
262 | - __u32 mmap_sq_db_index; | |
263 | - __u32 mmap_rq_db_index; | |
264 | - __u32 nes_drv_opt; | |
265 | -}; | |
266 | - | |
267 | -#endif /* NES_ABI_USER_H */ |