History

dmaengine: idxd: uapi: use UAPI types

Using libc types and headers from the UAPI headers is problematic as it introduces a dependency on a full C toolchain. Use the fixed-width integer types provided by the UAPI headers instead.

Thomas Weißschuh committed 10 months ago

Commit 98b9f201 parent b4423771 file · +133 −137Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/linux/idxd.h+133−137
@@ -3,11 +3,7 @@ · 2 unmodified lines
3#ifndef _USR_IDXD_H_3#ifndef _USR_IDXD_H_
4#define _USR_IDXD_H_4#define _USR_IDXD_H_
5 5
6#ifdef __KERNEL__
7#include <linux/types.h>6#include <linux/types.h>
8#else
9#include <stdint.h>
10#endif
11 7
12/* Driver command error status */8/* Driver command error status */
13enum idxd_scmd_stat {9enum idxd_scmd_stat {
@@ -176,132 +172,132 @@ enum iax_completion_status { · 162 unmodified lines
176#define DSA_COMP_STATUS(status) ((status) & DSA_COMP_STATUS_MASK)172#define DSA_COMP_STATUS(status) ((status) & DSA_COMP_STATUS_MASK)
177 173
178struct dsa_hw_desc {174struct dsa_hw_desc {
179 uint32_t pasid:20;175 __u32 pasid:20;
180 uint32_t rsvd:11;176 __u32 rsvd:11;
181 uint32_t priv:1;177 __u32 priv:1;
182 uint32_t flags:24;178 __u32 flags:24;
183 uint32_t opcode:8;179 __u32 opcode:8;
184 uint64_t completion_addr;180 __u64 completion_addr;
185 union {181 union {
186 uint64_t src_addr;182 __u64 src_addr;
187 uint64_t rdback_addr;183 __u64 rdback_addr;
188 uint64_t pattern;184 __u64 pattern;
189 uint64_t desc_list_addr;185 __u64 desc_list_addr;
190 uint64_t pattern_lower;186 __u64 pattern_lower;
191 uint64_t transl_fetch_addr;187 __u64 transl_fetch_addr;
192 };188 };
193 union {189 union {
194 uint64_t dst_addr;190 __u64 dst_addr;
195 uint64_t rdback_addr2;191 __u64 rdback_addr2;
196 uint64_t src2_addr;192 __u64 src2_addr;
197 uint64_t comp_pattern;193 __u64 comp_pattern;
198 };194 };
199 union {195 union {
200 uint32_t xfer_size;196 __u32 xfer_size;
201 uint32_t desc_count;197 __u32 desc_count;
202 uint32_t region_size;198 __u32 region_size;
203 };199 };
204 uint16_t int_handle;200 __u16 int_handle;
205 uint16_t rsvd1;201 __u16 rsvd1;
206 union {202 union {
207 uint8_t expected_res;203 __u8 expected_res;
208 /* create delta record */204 /* create delta record */
209 struct {205 struct {
210 uint64_t delta_addr;206 __u64 delta_addr;
211 uint32_t max_delta_size;207 __u32 max_delta_size;
212 uint32_t delt_rsvd;208 __u32 delt_rsvd;
213 uint8_t expected_res_mask;209 __u8 expected_res_mask;
214 };210 };
215 uint32_t delta_rec_size;211 __u32 delta_rec_size;
216 uint64_t dest2;212 __u64 dest2;
217 /* CRC */213 /* CRC */
218 struct {214 struct {
219 uint32_t crc_seed;215 __u32 crc_seed;
220 uint32_t crc_rsvd;216 __u32 crc_rsvd;
221 uint64_t seed_addr;217 __u64 seed_addr;
222 };218 };
223 /* DIF check or strip */219 /* DIF check or strip */
224 struct {220 struct {
225 uint8_t src_dif_flags;221 __u8 src_dif_flags;
226 uint8_t dif_chk_res;222 __u8 dif_chk_res;
227 uint8_t dif_chk_flags;223 __u8 dif_chk_flags;
228 uint8_t dif_chk_res2[5];224 __u8 dif_chk_res2[5];
229 uint32_t chk_ref_tag_seed;225 __u32 chk_ref_tag_seed;
230 uint16_t chk_app_tag_mask;226 __u16 chk_app_tag_mask;
231 uint16_t chk_app_tag_seed;227 __u16 chk_app_tag_seed;
232 };228 };
233 /* DIF insert */229 /* DIF insert */
234 struct {230 struct {
235 uint8_t dif_ins_res;231 __u8 dif_ins_res;
236 uint8_t dest_dif_flag;232 __u8 dest_dif_flag;
237 uint8_t dif_ins_flags;233 __u8 dif_ins_flags;
238 uint8_t dif_ins_res2[13];234 __u8 dif_ins_res2[13];
239 uint32_t ins_ref_tag_seed;235 __u32 ins_ref_tag_seed;
240 uint16_t ins_app_tag_mask;236 __u16 ins_app_tag_mask;
241 uint16_t ins_app_tag_seed;237 __u16 ins_app_tag_seed;
242 };238 };
243 /* DIF update */239 /* DIF update */
244 struct {240 struct {
245 uint8_t src_upd_flags;241 __u8 src_upd_flags;
246 uint8_t upd_dest_flags;242 __u8 upd_dest_flags;
247 uint8_t dif_upd_flags;243 __u8 dif_upd_flags;
248 uint8_t dif_upd_res[5];244 __u8 dif_upd_res[5];
249 uint32_t src_ref_tag_seed;245 __u32 src_ref_tag_seed;
250 uint16_t src_app_tag_mask;246 __u16 src_app_tag_mask;
251 uint16_t src_app_tag_seed;247 __u16 src_app_tag_seed;
252 uint32_t dest_ref_tag_seed;248 __u32 dest_ref_tag_seed;
253 uint16_t dest_app_tag_mask;249 __u16 dest_app_tag_mask;
254 uint16_t dest_app_tag_seed;250 __u16 dest_app_tag_seed;
255 };251 };
256 252
257 /* Fill */253 /* Fill */
258 uint64_t pattern_upper;254 __u64 pattern_upper;
259 255
260 /* Translation fetch */256 /* Translation fetch */
261 struct {257 struct {
262 uint64_t transl_fetch_res;258 __u64 transl_fetch_res;
263 uint32_t region_stride;259 __u32 region_stride;
264 };260 };
265 261
266 /* DIX generate */262 /* DIX generate */
267 struct {263 struct {
268 uint8_t dix_gen_res;264 __u8 dix_gen_res;
269 uint8_t dest_dif_flags;265 __u8 dest_dif_flags;
270 uint8_t dif_flags;266 __u8 dif_flags;
271 uint8_t dix_gen_res2[13];267 __u8 dix_gen_res2[13];
272 uint32_t ref_tag_seed;268 __u32 ref_tag_seed;
273 uint16_t app_tag_mask;269 __u16 app_tag_mask;
274 uint16_t app_tag_seed;270 __u16 app_tag_seed;
275 };271 };
276 272
277 uint8_t op_specific[24];273 __u8 op_specific[24];
278 };274 };
279} __attribute__((packed));275} __attribute__((packed));
280 276
281struct iax_hw_desc {277struct iax_hw_desc {
282 uint32_t pasid:20;278 __u32 pasid:20;
283 uint32_t rsvd:11;279 __u32 rsvd:11;
284 uint32_t priv:1;280 __u32 priv:1;
285 uint32_t flags:24;281 __u32 flags:24;
286 uint32_t opcode:8;282 __u32 opcode:8;
287 uint64_t completion_addr;283 __u64 completion_addr;
288 uint64_t src1_addr;284 __u64 src1_addr;
289 uint64_t dst_addr;285 __u64 dst_addr;
290 uint32_t src1_size;286 __u32 src1_size;
291 uint16_t int_handle;287 __u16 int_handle;
292 union {288 union {
293 uint16_t compr_flags;289 __u16 compr_flags;
294 uint16_t decompr_flags;290 __u16 decompr_flags;
295 };291 };
296 uint64_t src2_addr;292 __u64 src2_addr;
297 uint32_t max_dst_size;293 __u32 max_dst_size;
298 uint32_t src2_size;294 __u32 src2_size;
299 uint32_t filter_flags;295 __u32 filter_flags;
300 uint32_t num_inputs;296 __u32 num_inputs;
301} __attribute__((packed));297} __attribute__((packed));
302 298
303struct dsa_raw_desc {299struct dsa_raw_desc {
304 uint64_t field[8];300 __u64 field[8];
305} __attribute__((packed));301} __attribute__((packed));
306 302
307/*303/*
@@ -309,91 +305,91 @@ struct dsa_raw_desc { · 1 unmodified line
309 * volatile and prevent the compiler from optimize the read.305 * volatile and prevent the compiler from optimize the read.
310 */306 */
311struct dsa_completion_record {307struct dsa_completion_record {
312 volatile uint8_t status;308 volatile __u8 status;
313 union {309 union {
314 uint8_t result;310 __u8 result;
315 uint8_t dif_status;311 __u8 dif_status;
316 };312 };
317 uint8_t fault_info;313 __u8 fault_info;
318 uint8_t rsvd;314 __u8 rsvd;
319 union {315 union {
320 uint32_t bytes_completed;316 __u32 bytes_completed;
321 uint32_t descs_completed;317 __u32 descs_completed;
322 };318 };
323 uint64_t fault_addr;319 __u64 fault_addr;
324 union {320 union {
325 /* common record */321 /* common record */
326 struct {322 struct {
327 uint32_t invalid_flags:24;323 __u32 invalid_flags:24;
328 uint32_t rsvd2:8;324 __u32 rsvd2:8;
329 };325 };
330 326
331 uint32_t delta_rec_size;327 __u32 delta_rec_size;
332 uint64_t crc_val;328 __u64 crc_val;
333 329
334 /* DIF check & strip */330 /* DIF check & strip */
335 struct {331 struct {
336 uint32_t dif_chk_ref_tag;332 __u32 dif_chk_ref_tag;
337 uint16_t dif_chk_app_tag_mask;333 __u16 dif_chk_app_tag_mask;
338 uint16_t dif_chk_app_tag;334 __u16 dif_chk_app_tag;
339 };335 };
340 336
341 /* DIF insert */337 /* DIF insert */
342 struct {338 struct {
343 uint64_t dif_ins_res;339 __u64 dif_ins_res;
344 uint32_t dif_ins_ref_tag;340 __u32 dif_ins_ref_tag;
345 uint16_t dif_ins_app_tag_mask;341 __u16 dif_ins_app_tag_mask;
346 uint16_t dif_ins_app_tag;342 __u16 dif_ins_app_tag;
347 };343 };
348 344
349 /* DIF update */345 /* DIF update */
350 struct {346 struct {
351 uint32_t dif_upd_src_ref_tag;347 __u32 dif_upd_src_ref_tag;
352 uint16_t dif_upd_src_app_tag_mask;348 __u16 dif_upd_src_app_tag_mask;
353 uint16_t dif_upd_src_app_tag;349 __u16 dif_upd_src_app_tag;
354 uint32_t dif_upd_dest_ref_tag;350 __u32 dif_upd_dest_ref_tag;
355 uint16_t dif_upd_dest_app_tag_mask;351 __u16 dif_upd_dest_app_tag_mask;
356 uint16_t dif_upd_dest_app_tag;352 __u16 dif_upd_dest_app_tag;
357 };353 };
358 354
359 /* DIX generate */355 /* DIX generate */
360 struct {356 struct {
361 uint64_t dix_gen_res;357 __u64 dix_gen_res;
362 uint32_t dix_ref_tag;358 __u32 dix_ref_tag;
363 uint16_t dix_app_tag_mask;359 __u16 dix_app_tag_mask;
364 uint16_t dix_app_tag;360 __u16 dix_app_tag;
365 };361 };
366 362
367 uint8_t op_specific[16];363 __u8 op_specific[16];
368 };364 };
369} __attribute__((packed));365} __attribute__((packed));
370 366
371struct dsa_raw_completion_record {367struct dsa_raw_completion_record {
372 uint64_t field[4];368 __u64 field[4];
373} __attribute__((packed));369} __attribute__((packed));
374 370
375struct iax_completion_record {371struct iax_completion_record {
376 volatile uint8_t status;372 volatile __u8 status;
377 uint8_t error_code;373 __u8 error_code;
378 uint8_t fault_info;374 __u8 fault_info;
379 uint8_t rsvd;375 __u8 rsvd;
380 uint32_t bytes_completed;376 __u32 bytes_completed;
381 uint64_t fault_addr;377 __u64 fault_addr;
382 uint32_t invalid_flags;378 __u32 invalid_flags;
383 uint32_t rsvd2;379 __u32 rsvd2;
384 uint32_t output_size;380 __u32 output_size;
385 uint8_t output_bits;381 __u8 output_bits;
386 uint8_t rsvd3;382 __u8 rsvd3;
387 uint16_t xor_csum;383 __u16 xor_csum;
388 uint32_t crc;384 __u32 crc;
389 uint32_t min;385 __u32 min;
390 uint32_t max;386 __u32 max;
391 uint32_t sum;387 __u32 sum;
392 uint64_t rsvd4[2];388 __u64 rsvd4[2];
393} __attribute__((packed));389} __attribute__((packed));
394 390
395struct iax_raw_completion_record {391struct iax_raw_completion_record {
396 uint64_t field[8];392 __u64 field[8];
397} __attribute__((packed));393} __attribute__((packed));
398 394
399#endif395#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t