Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e.
Showing the changes to include/uapi (5 of 549 files). Show all
Unified · Split
| @@ -1467,8 +1467,8 @@ union bpf_attr { · 1466 unmodified lines | ||
| 1467 | 1467 | * If no cookie has been set yet, generate a new cookie. Once |
| 1468 | 1468 | * generated, the socket cookie remains stable for the life of the |
| 1469 | 1469 | * socket. This helper can be useful for monitoring per socket |
| 1470 | − * networking traffic statistics as it provides a unique socket | |
| 1471 | − * identifier per namespace. | |
| 1470 | + * networking traffic statistics as it provides a global socket | |
| 1471 | + * identifier that can be assumed unique. | |
| 1472 | 1472 | * Return |
| 1473 | 1473 | * A 8-byte long non-decreasing number on success, or 0 if the |
| 1474 | 1474 | * socket field is missing inside *skb*. |
| @@ -410,21 +410,6 @@ struct kfd_ioctl_unmap_memory_from_gpu_args { · 409 unmodified lines | ||
| 410 | 410 | __u32 n_success; /* to/from KFD */ |
| 411 | 411 | }; |
| 412 | 412 | |
| 413 | −/* Allocate GWS for specific queue | |
| 414 | − * | |
| 415 | − * @gpu_id: device identifier | |
| 416 | − * @queue_id: queue's id that GWS is allocated for | |
| 417 | − * @num_gws: how many GWS to allocate | |
| 418 | − * @first_gws: index of the first GWS allocated. | |
| 419 | − * only support contiguous GWS allocation | |
| 420 | − */ | |
| 421 | −struct kfd_ioctl_alloc_queue_gws_args { | |
| 422 | − __u32 gpu_id; /* to KFD */ | |
| 423 | − __u32 queue_id; /* to KFD */ | |
| 424 | − __u32 num_gws; /* to KFD */ | |
| 425 | − __u32 first_gws; /* from KFD */ | |
| 426 | −}; | |
| 427 | − | |
| 428 | 413 | struct kfd_ioctl_get_dmabuf_info_args { |
| 429 | 414 | __u64 size; /* from KFD */ |
| 430 | 415 | __u64 metadata_ptr; /* to KFD */ |
| @@ -544,10 +529,7 @@ enum kfd_mmio_remap { · 113 unmodified lines | ||
| 544 | 529 | #define AMDKFD_IOC_IMPORT_DMABUF \ |
| 545 | 530 | AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args) |
| 546 | 531 | |
| 547 | −#define AMDKFD_IOC_ALLOC_QUEUE_GWS \ | |
| 548 | − AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args) | |
| 549 | − | |
| 550 | 532 | #define AMDKFD_COMMAND_START 0x01 |
| 551 | −#define AMDKFD_COMMAND_END 0x1F | |
| 533 | +#define AMDKFD_COMMAND_END 0x1E | |
| 552 | 534 | |
| 553 | 535 | #endif |
| @@ -180,6 +180,7 @@ struct siw_cqe { · 179 unmodified lines | ||
| 180 | 180 | * to control CQ arming. |
| 181 | 181 | */ |
| 182 | 182 | struct siw_cq_ctrl { |
| 183 | − __aligned_u64 notify; | |
| 183 | + __u32 flags; | |
| 184 | + __u32 pad; | |
| 184 | 185 | }; |
| 185 | 186 | #endif |
| @@ -13,6 +13,8 @@ · 12 unmodified lines | ||
| 13 | 13 | #ifndef __INCLUDE_UAPI_SOF_FW_H__ |
| 14 | 14 | #define __INCLUDE_UAPI_SOF_FW_H__ |
| 15 | 15 | |
| 16 | +#include <linux/types.h> | |
| 17 | + | |
| 16 | 18 | #define SND_SOF_FW_SIG_SIZE 4 |
| 17 | 19 | #define SND_SOF_FW_ABI 1 |
| 18 | 20 | #define SND_SOF_FW_SIG "Reef" |
| @@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type { · 27 unmodified lines | ||
| 46 | 48 | |
| 47 | 49 | struct snd_sof_blk_hdr { |
| 48 | 50 | enum snd_sof_fw_blk_type type; |
| 49 | − uint32_t size; /* bytes minus this header */ | |
| 50 | − uint32_t offset; /* offset from base */ | |
| 51 | + __u32 size; /* bytes minus this header */ | |
| 52 | + __u32 offset; /* offset from base */ | |
| 51 | 53 | } __packed; |
| 52 | 54 | |
| 53 | 55 | /* |
| @@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type { · 7 unmodified lines | ||
| 61 | 63 | |
| 62 | 64 | struct snd_sof_mod_hdr { |
| 63 | 65 | enum snd_sof_fw_mod_type type; |
| 64 | − uint32_t size; /* bytes minus this header */ | |
| 65 | − uint32_t num_blocks; /* number of blocks */ | |
| 66 | + __u32 size; /* bytes minus this header */ | |
| 67 | + __u32 num_blocks; /* number of blocks */ | |
| 66 | 68 | } __packed; |
| 67 | 69 | |
| 68 | 70 | /* |
| @@ -70,9 +72,9 @@ struct snd_sof_mod_hdr { · 1 unmodified line | ||
| 70 | 72 | */ |
| 71 | 73 | struct snd_sof_fw_header { |
| 72 | 74 | unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */ |
| 73 | − uint32_t file_size; /* size of file minus this header */ | |
| 74 | − uint32_t num_modules; /* number of modules */ | |
| 75 | − uint32_t abi; /* version of header format */ | |
| 75 | + __u32 file_size; /* size of file minus this header */ | |
| 76 | + __u32 num_modules; /* number of modules */ | |
| 77 | + __u32 abi; /* version of header format */ | |
| 76 | 78 | } __packed; |
| 77 | 79 | |
| 78 | 80 | #endif |
| @@ -9,6 +9,8 @@ · 8 unmodified lines | ||
| 9 | 9 | #ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ |
| 10 | 10 | #define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ |
| 11 | 11 | |
| 12 | +#include <linux/types.h> | |
| 13 | + | |
| 12 | 14 | /* |
| 13 | 15 | * Header for all non IPC ABI data. |
| 14 | 16 | * |
| @@ -16,12 +18,12 @@ · 1 unmodified line | ||
| 16 | 18 | * Used by any bespoke component data structures or binary blobs. |
| 17 | 19 | */ |
| 18 | 20 | struct sof_abi_hdr { |
| 19 | − uint32_t magic; /**< 'S', 'O', 'F', '\0' */ | |
| 20 | − uint32_t type; /**< component specific type */ | |
| 21 | − uint32_t size; /**< size in bytes of data excl. this struct */ | |
| 22 | − uint32_t abi; /**< SOF ABI version */ | |
| 23 | − uint32_t reserved[4]; /**< reserved for future use */ | |
| 24 | − uint32_t data[0]; /**< Component data - opaque to core */ | |
| 21 | + __u32 magic; /**< 'S', 'O', 'F', '\0' */ | |
| 22 | + __u32 type; /**< component specific type */ | |
| 23 | + __u32 size; /**< size in bytes of data excl. this struct */ | |
| 24 | + __u32 abi; /**< SOF ABI version */ | |
| 25 | + __u32 reserved[4]; /**< reserved for future use */ | |
| 26 | + __u32 data[0]; /**< Component data - opaque to core */ | |
| 25 | 27 | } __packed; |
| 26 | 28 | |
| 27 | 29 | #endif |