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
33 #ifndef _USR_IDXD_H_
44 #define _USR_IDXD_H_
55
6−#ifdef __KERNEL__
76 #include <linux/types.h>
8−#else
9−#include <stdint.h>
10−#endif
117
128 /* Driver command error status */
139 enum idxd_scmd_stat {
@@ -176,132 +172,132 @@ enum iax_completion_status { · 162 unmodified lines
176172 #define DSA_COMP_STATUS(status) ((status) & DSA_COMP_STATUS_MASK)
177173
178174 struct dsa_hw_desc {
179− uint32_t pasid:20;
180− uint32_t rsvd:11;
181− uint32_t priv:1;
182− uint32_t flags:24;
183− uint32_t opcode:8;
184− uint64_t completion_addr;
175+ __u32 pasid:20;
176+ __u32 rsvd:11;
177+ __u32 priv:1;
178+ __u32 flags:24;
179+ __u32 opcode:8;
180+ __u64 completion_addr;
185181 union {
186− uint64_t src_addr;
187− uint64_t rdback_addr;
188− uint64_t pattern;
189− uint64_t desc_list_addr;
190− uint64_t pattern_lower;
191− uint64_t transl_fetch_addr;
182+ __u64 src_addr;
183+ __u64 rdback_addr;
184+ __u64 pattern;
185+ __u64 desc_list_addr;
186+ __u64 pattern_lower;
187+ __u64 transl_fetch_addr;
192188 };
193189 union {
194− uint64_t dst_addr;
195− uint64_t rdback_addr2;
196− uint64_t src2_addr;
197− uint64_t comp_pattern;
190+ __u64 dst_addr;
191+ __u64 rdback_addr2;
192+ __u64 src2_addr;
193+ __u64 comp_pattern;
198194 };
199195 union {
200− uint32_t xfer_size;
201− uint32_t desc_count;
202− uint32_t region_size;
196+ __u32 xfer_size;
197+ __u32 desc_count;
198+ __u32 region_size;
203199 };
204− uint16_t int_handle;
205− uint16_t rsvd1;
200+ __u16 int_handle;
201+ __u16 rsvd1;
206202 union {
207− uint8_t expected_res;
203+ __u8 expected_res;
208204 /* create delta record */
209205 struct {
210− uint64_t delta_addr;
211− uint32_t max_delta_size;
212− uint32_t delt_rsvd;
213− uint8_t expected_res_mask;
206+ __u64 delta_addr;
207+ __u32 max_delta_size;
208+ __u32 delt_rsvd;
209+ __u8 expected_res_mask;
214210 };
215− uint32_t delta_rec_size;
216− uint64_t dest2;
211+ __u32 delta_rec_size;
212+ __u64 dest2;
217213 /* CRC */
218214 struct {
219− uint32_t crc_seed;
220− uint32_t crc_rsvd;
221− uint64_t seed_addr;
215+ __u32 crc_seed;
216+ __u32 crc_rsvd;
217+ __u64 seed_addr;
222218 };
223219 /* DIF check or strip */
224220 struct {
225− uint8_t src_dif_flags;
226− uint8_t dif_chk_res;
227− uint8_t dif_chk_flags;
228− uint8_t dif_chk_res2[5];
229− uint32_t chk_ref_tag_seed;
230− uint16_t chk_app_tag_mask;
231− uint16_t chk_app_tag_seed;
221+ __u8 src_dif_flags;
222+ __u8 dif_chk_res;
223+ __u8 dif_chk_flags;
224+ __u8 dif_chk_res2[5];
225+ __u32 chk_ref_tag_seed;
226+ __u16 chk_app_tag_mask;
227+ __u16 chk_app_tag_seed;
232228 };
233229 /* DIF insert */
234230 struct {
235− uint8_t dif_ins_res;
236− uint8_t dest_dif_flag;
237− uint8_t dif_ins_flags;
238− uint8_t dif_ins_res2[13];
239− uint32_t ins_ref_tag_seed;
240− uint16_t ins_app_tag_mask;
241− uint16_t ins_app_tag_seed;
231+ __u8 dif_ins_res;
232+ __u8 dest_dif_flag;
233+ __u8 dif_ins_flags;
234+ __u8 dif_ins_res2[13];
235+ __u32 ins_ref_tag_seed;
236+ __u16 ins_app_tag_mask;
237+ __u16 ins_app_tag_seed;
242238 };
243239 /* DIF update */
244240 struct {
245− uint8_t src_upd_flags;
246− uint8_t upd_dest_flags;
247− uint8_t dif_upd_flags;
248− uint8_t dif_upd_res[5];
249− uint32_t src_ref_tag_seed;
250− uint16_t src_app_tag_mask;
251− uint16_t src_app_tag_seed;
252− uint32_t dest_ref_tag_seed;
253− uint16_t dest_app_tag_mask;
254− uint16_t dest_app_tag_seed;
241+ __u8 src_upd_flags;
242+ __u8 upd_dest_flags;
243+ __u8 dif_upd_flags;
244+ __u8 dif_upd_res[5];
245+ __u32 src_ref_tag_seed;
246+ __u16 src_app_tag_mask;
247+ __u16 src_app_tag_seed;
248+ __u32 dest_ref_tag_seed;
249+ __u16 dest_app_tag_mask;
250+ __u16 dest_app_tag_seed;
255251 };
256252
257253 /* Fill */
258− uint64_t pattern_upper;
254+ __u64 pattern_upper;
259255
260256 /* Translation fetch */
261257 struct {
262− uint64_t transl_fetch_res;
263− uint32_t region_stride;
258+ __u64 transl_fetch_res;
259+ __u32 region_stride;
264260 };
265261
266262 /* DIX generate */
267263 struct {
268− uint8_t dix_gen_res;
269− uint8_t dest_dif_flags;
270− uint8_t dif_flags;
271− uint8_t dix_gen_res2[13];
272− uint32_t ref_tag_seed;
273− uint16_t app_tag_mask;
274− uint16_t app_tag_seed;
264+ __u8 dix_gen_res;
265+ __u8 dest_dif_flags;
266+ __u8 dif_flags;
267+ __u8 dix_gen_res2[13];
268+ __u32 ref_tag_seed;
269+ __u16 app_tag_mask;
270+ __u16 app_tag_seed;
275271 };
276272
277− uint8_t op_specific[24];
273+ __u8 op_specific[24];
278274 };
279275 } __attribute__((packed));
280276
281277 struct iax_hw_desc {
282− uint32_t pasid:20;
283− uint32_t rsvd:11;
284− uint32_t priv:1;
285− uint32_t flags:24;
286− uint32_t opcode:8;
287− uint64_t completion_addr;
288− uint64_t src1_addr;
289− uint64_t dst_addr;
290− uint32_t src1_size;
291− uint16_t int_handle;
278+ __u32 pasid:20;
279+ __u32 rsvd:11;
280+ __u32 priv:1;
281+ __u32 flags:24;
282+ __u32 opcode:8;
283+ __u64 completion_addr;
284+ __u64 src1_addr;
285+ __u64 dst_addr;
286+ __u32 src1_size;
287+ __u16 int_handle;
292288 union {
293− uint16_t compr_flags;
294− uint16_t decompr_flags;
289+ __u16 compr_flags;
290+ __u16 decompr_flags;
295291 };
296− uint64_t src2_addr;
297− uint32_t max_dst_size;
298− uint32_t src2_size;
299− uint32_t filter_flags;
300− uint32_t num_inputs;
292+ __u64 src2_addr;
293+ __u32 max_dst_size;
294+ __u32 src2_size;
295+ __u32 filter_flags;
296+ __u32 num_inputs;
301297 } __attribute__((packed));
302298
303299 struct dsa_raw_desc {
304− uint64_t field[8];
300+ __u64 field[8];
305301 } __attribute__((packed));
306302
307303 /*
@@ -309,91 +305,91 @@ struct dsa_raw_desc { · 1 unmodified line
309305 * volatile and prevent the compiler from optimize the read.
310306 */
311307 struct dsa_completion_record {
312− volatile uint8_t status;
308+ volatile __u8 status;
313309 union {
314− uint8_t result;
315− uint8_t dif_status;
310+ __u8 result;
311+ __u8 dif_status;
316312 };
317− uint8_t fault_info;
318− uint8_t rsvd;
313+ __u8 fault_info;
314+ __u8 rsvd;
319315 union {
320− uint32_t bytes_completed;
321− uint32_t descs_completed;
316+ __u32 bytes_completed;
317+ __u32 descs_completed;
322318 };
323− uint64_t fault_addr;
319+ __u64 fault_addr;
324320 union {
325321 /* common record */
326322 struct {
327− uint32_t invalid_flags:24;
328− uint32_t rsvd2:8;
323+ __u32 invalid_flags:24;
324+ __u32 rsvd2:8;
329325 };
330326
331− uint32_t delta_rec_size;
332− uint64_t crc_val;
327+ __u32 delta_rec_size;
328+ __u64 crc_val;
333329
334330 /* DIF check & strip */
335331 struct {
336− uint32_t dif_chk_ref_tag;
337− uint16_t dif_chk_app_tag_mask;
338− uint16_t dif_chk_app_tag;
332+ __u32 dif_chk_ref_tag;
333+ __u16 dif_chk_app_tag_mask;
334+ __u16 dif_chk_app_tag;
339335 };
340336
341337 /* DIF insert */
342338 struct {
343− uint64_t dif_ins_res;
344− uint32_t dif_ins_ref_tag;
345− uint16_t dif_ins_app_tag_mask;
346− uint16_t dif_ins_app_tag;
339+ __u64 dif_ins_res;
340+ __u32 dif_ins_ref_tag;
341+ __u16 dif_ins_app_tag_mask;
342+ __u16 dif_ins_app_tag;
347343 };
348344
349345 /* DIF update */
350346 struct {
351− uint32_t dif_upd_src_ref_tag;
352− uint16_t dif_upd_src_app_tag_mask;
353− uint16_t dif_upd_src_app_tag;
354− uint32_t dif_upd_dest_ref_tag;
355− uint16_t dif_upd_dest_app_tag_mask;
356− uint16_t dif_upd_dest_app_tag;
347+ __u32 dif_upd_src_ref_tag;
348+ __u16 dif_upd_src_app_tag_mask;
349+ __u16 dif_upd_src_app_tag;
350+ __u32 dif_upd_dest_ref_tag;
351+ __u16 dif_upd_dest_app_tag_mask;
352+ __u16 dif_upd_dest_app_tag;
357353 };
358354
359355 /* DIX generate */
360356 struct {
361− uint64_t dix_gen_res;
362− uint32_t dix_ref_tag;
363− uint16_t dix_app_tag_mask;
364− uint16_t dix_app_tag;
357+ __u64 dix_gen_res;
358+ __u32 dix_ref_tag;
359+ __u16 dix_app_tag_mask;
360+ __u16 dix_app_tag;
365361 };
366362
367− uint8_t op_specific[16];
363+ __u8 op_specific[16];
368364 };
369365 } __attribute__((packed));
370366
371367 struct dsa_raw_completion_record {
372− uint64_t field[4];
368+ __u64 field[4];
373369 } __attribute__((packed));
374370
375371 struct iax_completion_record {
376− volatile uint8_t status;
377− uint8_t error_code;
378− uint8_t fault_info;
379− uint8_t rsvd;
380− uint32_t bytes_completed;
381− uint64_t fault_addr;
382− uint32_t invalid_flags;
383− uint32_t rsvd2;
384− uint32_t output_size;
385− uint8_t output_bits;
386− uint8_t rsvd3;
387− uint16_t xor_csum;
388− uint32_t crc;
389− uint32_t min;
390− uint32_t max;
391− uint32_t sum;
392− uint64_t rsvd4[2];
372+ volatile __u8 status;
373+ __u8 error_code;
374+ __u8 fault_info;
375+ __u8 rsvd;
376+ __u32 bytes_completed;
377+ __u64 fault_addr;
378+ __u32 invalid_flags;
379+ __u32 rsvd2;
380+ __u32 output_size;
381+ __u8 output_bits;
382+ __u8 rsvd3;
383+ __u16 xor_csum;
384+ __u32 crc;
385+ __u32 min;
386+ __u32 max;
387+ __u32 sum;
388+ __u64 rsvd4[2];
393389 } __attribute__((packed));
394390
395391 struct iax_raw_completion_record {
396− uint64_t field[8];
392+ __u64 field[8];
397393 } __attribute__((packed));
398394
399395 #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