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
410 __u32 n_success; /* to/from KFD */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 */
421struct 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
428struct kfd_ioctl_get_dmabuf_info_args {413struct kfd_ioctl_get_dmabuf_info_args {
429 __u64 size; /* from KFD */414 __u64 size; /* from KFD */
430 __u64 metadata_ptr; /* to KFD */415 __u64 metadata_ptr; /* to KFD */
@@ -544,10 +529,7 @@ enum kfd_mmio_remap { · 113 unmodified lines
544#define AMDKFD_IOC_IMPORT_DMABUF \529#define AMDKFD_IOC_IMPORT_DMABUF \
545 AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)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#define AMDKFD_COMMAND_START 0x01532#define AMDKFD_COMMAND_START 0x01
551#define AMDKFD_COMMAND_END 0x1F533#define AMDKFD_COMMAND_END 0x1E
552 534
553#endif535#endif
include/uapi/linux/netfilter/xt_connlabel.h+6−0
@@ -1,4 +1,8 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2
3#ifndef _UAPI_XT_CONNLABEL_H
4#define _UAPI_XT_CONNLABEL_H
5
2#include <linux/types.h>6#include <linux/types.h>
3 7
4#define XT_CONNLABEL_MAXBIT 1278#define XT_CONNLABEL_MAXBIT 127
@@ -11,3 +15,5 @@ struct xt_connlabel_mtinfo { · 6 unmodified lines
11 __u16 bit;15 __u16 bit;
12 __u16 options;16 __u16 options;
13};17};
18
19#endif /* _UAPI_XT_CONNLABEL_H */
include/uapi/linux/socket.h+13−6
@@ -6,17 +6,24 @@ · 5 unmodified lines
6 * Desired design of maximum size and alignment (see RFC2553)6 * Desired design of maximum size and alignment (see RFC2553)
7 */7 */
8#define _K_SS_MAXSIZE 128 /* Implementation specific max size */8#define _K_SS_MAXSIZE 128 /* Implementation specific max size */
9#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
10 /* Implementation specific desired alignment */
11 9
12typedef unsigned short __kernel_sa_family_t;10typedef unsigned short __kernel_sa_family_t;
13 11
12/*
13 * The definition uses anonymous union and struct in order to control the
14 * default alignment.
15 */
14struct __kernel_sockaddr_storage {16struct __kernel_sockaddr_storage {
15 __kernel_sa_family_t ss_family; /* address family */17 union {
16 /* Following field(s) are implementation specific */18 struct {
17 char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];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)];
18 /* space to achieve desired size, */22 /* space to achieve desired size, */
19 /* _SS_MAXSIZE value minus size of ss_family */23 /* _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};
21 28
22#endif /* _UAPI_LINUX_SOCKET_H */29#endif /* _UAPI_LINUX_SOCKET_H */
include/uapi/linux/virtio_iommu.h+18−14
@@ -1,8 +1,8 @@
1/* SPDX-License-Identifier: BSD-3-Clause */1/* SPDX-License-Identifier: BSD-3-Clause */
2/*2/*
3 * Virtio-iommu definition v0.93 * Virtio-iommu definition v0.12
4 *4 *
5 * Copyright (C) 2018 Arm Ltd.5 * Copyright (C) 2019 Arm Ltd.
6 */6 */
7#ifndef _UAPI_LINUX_VIRTIO_IOMMU_H7#ifndef _UAPI_LINUX_VIRTIO_IOMMU_H
8#define _UAPI_LINUX_VIRTIO_IOMMU_H8#define _UAPI_LINUX_VIRTIO_IOMMU_H
@@ -11,26 +11,31 @@ · 2 unmodified lines
11 11
12/* Feature bits */12/* Feature bits */
13#define VIRTIO_IOMMU_F_INPUT_RANGE 013#define VIRTIO_IOMMU_F_INPUT_RANGE 0
14#define VIRTIO_IOMMU_F_DOMAIN_BITS 114#define VIRTIO_IOMMU_F_DOMAIN_RANGE 1
15#define VIRTIO_IOMMU_F_MAP_UNMAP 215#define VIRTIO_IOMMU_F_MAP_UNMAP 2
16#define VIRTIO_IOMMU_F_BYPASS 316#define VIRTIO_IOMMU_F_BYPASS 3
17#define VIRTIO_IOMMU_F_PROBE 417#define VIRTIO_IOMMU_F_PROBE 4
18#define VIRTIO_IOMMU_F_MMIO 5
18 19
19struct virtio_iommu_range {20struct virtio_iommu_range_64 {
20 __u64 start;21 __le64 start;
21 __u64 end;22 __le64 end;
23};
24
25struct virtio_iommu_range_32 {
26 __le32 start;
27 __le32 end;
22};28};
23 29
24struct virtio_iommu_config {30struct virtio_iommu_config {
25 /* Supported page sizes */31 /* Supported page sizes */
26 __u64 page_size_mask;32 __le64 page_size_mask;
27 /* Supported IOVA range */33 /* Supported IOVA range */
28 struct virtio_iommu_range input_range;34 struct virtio_iommu_range_64 input_range;
29 /* Max domain ID size */35 /* Max domain ID size */
30 __u8 domain_bits;36 struct virtio_iommu_range_32 domain_range;
31 __u8 padding[3];
32 /* Probe buffer size */37 /* Probe buffer size */
33 __u32 probe_size;38 __le32 probe_size;
34};39};
35 40
36/* Request types */41/* Request types */
@@ -49,6 +54,7 @@ struct virtio_iommu_config { · 12 unmodified lines
49#define VIRTIO_IOMMU_S_RANGE 0x0554#define VIRTIO_IOMMU_S_RANGE 0x05
50#define VIRTIO_IOMMU_S_NOENT 0x0655#define VIRTIO_IOMMU_S_NOENT 0x06
51#define VIRTIO_IOMMU_S_FAULT 0x0756#define VIRTIO_IOMMU_S_FAULT 0x07
57#define VIRTIO_IOMMU_S_NOMEM 0x08
52 58
53struct virtio_iommu_req_head {59struct virtio_iommu_req_head {
54 __u8 type;60 __u8 type;
@@ -78,12 +84,10 @@ struct virtio_iommu_req_detach { · 23 unmodified lines
78 84
79#define VIRTIO_IOMMU_MAP_F_READ (1 << 0)85#define VIRTIO_IOMMU_MAP_F_READ (1 << 0)
80#define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)86#define VIRTIO_IOMMU_MAP_F_WRITE (1 << 1)
81#define VIRTIO_IOMMU_MAP_F_EXEC (1 << 2)87#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 2)
82#define VIRTIO_IOMMU_MAP_F_MMIO (1 << 3)
83 88
84#define VIRTIO_IOMMU_MAP_F_MASK (VIRTIO_IOMMU_MAP_F_READ | \89#define VIRTIO_IOMMU_MAP_F_MASK (VIRTIO_IOMMU_MAP_F_READ | \
85 VIRTIO_IOMMU_MAP_F_WRITE | \90 VIRTIO_IOMMU_MAP_F_WRITE | \
86 VIRTIO_IOMMU_MAP_F_EXEC | \
87 VIRTIO_IOMMU_MAP_F_MMIO)91 VIRTIO_IOMMU_MAP_F_MMIO)
88 92
89struct virtio_iommu_req_map {93struct virtio_iommu_req_map {
include/uapi/sound/sof/fw.h+9−7
@@ -13,6 +13,8 @@ · 12 unmodified lines
13#ifndef __INCLUDE_UAPI_SOF_FW_H__13#ifndef __INCLUDE_UAPI_SOF_FW_H__
14#define __INCLUDE_UAPI_SOF_FW_H__14#define __INCLUDE_UAPI_SOF_FW_H__
15 15
16#include <linux/types.h>
17
16#define SND_SOF_FW_SIG_SIZE 418#define SND_SOF_FW_SIG_SIZE 4
17#define SND_SOF_FW_ABI 119#define SND_SOF_FW_ABI 1
18#define SND_SOF_FW_SIG "Reef"20#define SND_SOF_FW_SIG "Reef"
@@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type { · 27 unmodified lines
46 48
47struct snd_sof_blk_hdr {49struct snd_sof_blk_hdr {
48 enum snd_sof_fw_blk_type type;50 enum snd_sof_fw_blk_type type;
49 uint32_t size; /* bytes minus this header */51 __u32 size; /* bytes minus this header */
50 uint32_t offset; /* offset from base */52 __u32 offset; /* offset from base */
51} __packed;53} __packed;
52 54
53/*55/*
@@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type { · 7 unmodified lines
61 63
62struct snd_sof_mod_hdr {64struct snd_sof_mod_hdr {
63 enum snd_sof_fw_mod_type type;65 enum snd_sof_fw_mod_type type;
64 uint32_t size; /* bytes minus this header */66 __u32 size; /* bytes minus this header */
65 uint32_t num_blocks; /* number of blocks */67 __u32 num_blocks; /* number of blocks */
66} __packed;68} __packed;
67 69
68/*70/*
@@ -70,9 +72,9 @@ struct snd_sof_mod_hdr { · 1 unmodified line
70 */72 */
71struct snd_sof_fw_header {73struct snd_sof_fw_header {
72 unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */74 unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */
73 uint32_t file_size; /* size of file minus this header */75 __u32 file_size; /* size of file minus this header */
74 uint32_t num_modules; /* number of modules */76 __u32 num_modules; /* number of modules */
75 uint32_t abi; /* version of header format */77 __u32 abi; /* version of header format */
76} __packed;78} __packed;
77 79
78#endif80#endif
include/uapi/sound/sof/header.h+8−6
@@ -9,6 +9,8 @@ · 8 unmodified lines
9#ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__9#ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__
10#define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__10#define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__
11 11
12#include <linux/types.h>
13
12/*14/*
13 * Header for all non IPC ABI data.15 * Header for all non IPC ABI data.
14 *16 *
@@ -16,12 +18,12 @@ · 1 unmodified line
16 * Used by any bespoke component data structures or binary blobs.18 * Used by any bespoke component data structures or binary blobs.
17 */19 */
18struct sof_abi_hdr {20struct sof_abi_hdr {
19 uint32_t magic; /**< 'S', 'O', 'F', '\0' */21 __u32 magic; /**< 'S', 'O', 'F', '\0' */
20 uint32_t type; /**< component specific type */22 __u32 type; /**< component specific type */
21 uint32_t size; /**< size in bytes of data excl. this struct */23 __u32 size; /**< size in bytes of data excl. this struct */
22 uint32_t abi; /**< SOF ABI version */24 __u32 abi; /**< SOF ABI version */
23 uint32_t reserved[4]; /**< reserved for future use */25 __u32 reserved[4]; /**< reserved for future use */
24 uint32_t data[0]; /**< Component data - opaque to core */26 __u32 data[0]; /**< Component data - opaque to core */
25} __packed;27} __packed;
26 28
27#endif29#endif