History

Merge 5.3-rc4 into char-misc-next

We need the char-misc fixes in here as well.

Greg Kroah-Hartman committed 7 years ago

Commit 77e38c12 parents cec2cae d45331b807 files · +8117 −4484Browse files

Showing the changes to include/uapi (6 of 807 files). Show all

Unified · Split

6 files
  1. include/uapi/linux/kfd_ioctl.h +1 −19
  2. include/uapi/linux/netfilter/xt_connlabel.h +6 −0
  3. include/uapi/linux/socket.h +13 −6
  4. include/uapi/linux/virtio_iommu.h +18 −14
  5. include/uapi/sound/sof/fw.h +9 −7
  6. include/uapi/sound/sof/header.h +8 −6
include/uapi/linux/kfd_ioctl.h+1−19
@@ -410,21 +410,6 @@ struct kfd_ioctl_unmap_memory_from_gpu_args { · 409 unmodified lines
410410 __u32 n_success; /* to/from KFD */
411411 };
412412
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−
428413 struct kfd_ioctl_get_dmabuf_info_args {
429414 __u64 size; /* from KFD */
430415 __u64 metadata_ptr; /* to KFD */
@@ -544,10 +529,7 @@ enum kfd_mmio_remap { · 113 unmodified lines
544529 #define AMDKFD_IOC_IMPORT_DMABUF \
545530 AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)
546531
547−#define AMDKFD_IOC_ALLOC_QUEUE_GWS \
548− AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args)
549−
550532 #define AMDKFD_COMMAND_START 0x01
551−#define AMDKFD_COMMAND_END 0x1F
533+#define AMDKFD_COMMAND_END 0x1E
552534
553535 #endif
include/uapi/linux/netfilter/xt_connlabel.h+6−0
@@ -1,4 +1,8 @@
11 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2+
3+#ifndef _UAPI_XT_CONNLABEL_H
4+#define _UAPI_XT_CONNLABEL_H
5+
26 #include <linux/types.h>
37
48 #define XT_CONNLABEL_MAXBIT 127
@@ -11,3 +15,5 @@ struct xt_connlabel_mtinfo { · 6 unmodified lines
1115 __u16 bit;
1216 __u16 options;
1317 };
18+
19+#endif /* _UAPI_XT_CONNLABEL_H */
include/uapi/linux/socket.h+13−6
@@ -6,17 +6,24 @@ · 5 unmodified lines
66 * Desired design of maximum size and alignment (see RFC2553)
77 */
88 #define _K_SS_MAXSIZE 128 /* Implementation specific max size */
9−#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
10− /* Implementation specific desired alignment */
119
1210 typedef unsigned short __kernel_sa_family_t;
1311
12+/*
13+ * The definition uses anonymous union and struct in order to control the
14+ * default alignment.
15+ */
1416 struct __kernel_sockaddr_storage {
15− __kernel_sa_family_t ss_family; /* address family */
16− /* Following field(s) are implementation specific */
17− char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
17+ union {
18+ struct {
19+ __kernel_sa_family_t ss_family; /* address family */
20+ /* Following field(s) are implementation specific */
21+ char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
1822 /* space to achieve desired size, */
1923 /* _SS_MAXSIZE value minus size of ss_family */
20−} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
24+ };
25+ void *__align; /* implementation specific desired alignment */
26+ };
27+};
2128
2229 #endif /* _UAPI_LINUX_SOCKET_H */
include/uapi/linux/virtio_iommu.h+18−14
@@ -1,8 +1,8 @@
11 /* SPDX-License-Identifier: BSD-3-Clause */
22 /*
3− * Virtio-iommu definition v0.9
3+ * Virtio-iommu definition v0.12
44 *
5− * Copyright (C) 2018 Arm Ltd.
5+ * Copyright (C) 2019 Arm Ltd.
66 */
77 #ifndef _UAPI_LINUX_VIRTIO_IOMMU_H
88 #define _UAPI_LINUX_VIRTIO_IOMMU_H
@@ -11,26 +11,31 @@ · 2 unmodified lines
1111
1212 /* Feature bits */
1313 #define VIRTIO_IOMMU_F_INPUT_RANGE 0
14−#define VIRTIO_IOMMU_F_DOMAIN_BITS 1
14+#define VIRTIO_IOMMU_F_DOMAIN_RANGE 1
1515 #define VIRTIO_IOMMU_F_MAP_UNMAP 2
1616 #define VIRTIO_IOMMU_F_BYPASS 3
1717 #define VIRTIO_IOMMU_F_PROBE 4
18+#define VIRTIO_IOMMU_F_MMIO 5
1819
19−struct virtio_iommu_range {
20− __u64 start;
21− __u64 end;
20+struct virtio_iommu_range_64 {
21+ __le64 start;
22+ __le64 end;
23+};
24+
25+struct virtio_iommu_range_32 {
26+ __le32 start;
27+ __le32 end;
2228 };
2329
2430 struct virtio_iommu_config {
2531 /* Supported page sizes */
26− __u64 page_size_mask;
32+ __le64 page_size_mask;
2733 /* Supported IOVA range */
28− struct virtio_iommu_range input_range;
34+ struct virtio_iommu_range_64 input_range;
2935 /* Max domain ID size */
30− __u8 domain_bits;
31− __u8 padding[3];
36+ struct virtio_iommu_range_32 domain_range;
3237 /* Probe buffer size */
33− __u32 probe_size;
38+ __le32 probe_size;
3439 };
3540
3641 /* Request types */
@@ -49,6 +54,7 @@ struct virtio_iommu_config { · 12 unmodified lines
4954 #define VIRTIO_IOMMU_S_RANGE 0x05
5055 #define VIRTIO_IOMMU_S_NOENT 0x06
5156 #define VIRTIO_IOMMU_S_FAULT 0x07
57+#define VIRTIO_IOMMU_S_NOMEM 0x08
5258
5359 struct virtio_iommu_req_head {
5460 __u8 type;
@@ -78,12 +84,10 @@ struct virtio_iommu_req_detach { · 23 unmodified lines
7884
7985 #define VIRTIO_IOMMU_MAP_F_READ (1 << 0)
8086 #define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)
81−#define VIRTIO_IOMMU_MAP_F_EXEC (1 << 2)
82−#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 3)
87+#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 2)
8388
8489 #define VIRTIO_IOMMU_MAP_F_MASK (VIRTIO_IOMMU_MAP_F_READ | \
8590 VIRTIO_IOMMU_MAP_F_WRITE | \
86− VIRTIO_IOMMU_MAP_F_EXEC | \
8791 VIRTIO_IOMMU_MAP_F_MMIO)
8892
8993 struct virtio_iommu_req_map {
include/uapi/sound/sof/fw.h+9−7
@@ -13,6 +13,8 @@ · 12 unmodified lines
1313 #ifndef __INCLUDE_UAPI_SOF_FW_H__
1414 #define __INCLUDE_UAPI_SOF_FW_H__
1515
16+#include <linux/types.h>
17+
1618 #define SND_SOF_FW_SIG_SIZE 4
1719 #define SND_SOF_FW_ABI 1
1820 #define SND_SOF_FW_SIG "Reef"
@@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type { · 27 unmodified lines
4648
4749 struct snd_sof_blk_hdr {
4850 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 */
5153 } __packed;
5254
5355 /*
@@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type { · 7 unmodified lines
6163
6264 struct snd_sof_mod_hdr {
6365 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 */
6668 } __packed;
6769
6870 /*
@@ -70,9 +72,9 @@ struct snd_sof_mod_hdr { · 1 unmodified line
7072 */
7173 struct snd_sof_fw_header {
7274 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 */
7678 } __packed;
7779
7880 #endif
include/uapi/sound/sof/header.h+8−6
@@ -9,6 +9,8 @@ · 8 unmodified lines
99 #ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__
1010 #define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__
1111
12+#include <linux/types.h>
13+
1214 /*
1315 * Header for all non IPC ABI data.
1416 *
@@ -16,12 +18,12 @@ · 1 unmodified line
1618 * Used by any bespoke component data structures or binary blobs.
1719 */
1820 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 */
2527 } __packed;
2628
2729 #endif