History

Merge tag 'v5.13-rc7' into rdma.git for-next

Linux 5.13-rc7 Needed for dependencies in following patches. Merge conflict in rxe_cmop.c resolved by compining both patches.

Jason Gunthorpe committed 5 years ago

Commit fdcebbc2 parents 6d33cab 13311e71665 files · +18578 −8916Browse files

Showing the changes to include/uapi (11 of 1665 files). Show all

Unified · Split

11 files
  1. include/uapi/asm-generic/siginfo.h +8 −7
  2. include/uapi/asm-generic/unistd.h +1 −2
  3. include/uapi/linux/fs.h +1 −1
  4. include/uapi/linux/in.h +3 −0
  5. include/uapi/linux/input-event-codes.h +1 −0
  6. include/uapi/linux/io_uring.h +10 −9
  7. include/uapi/linux/kvm.h +3 −2
  8. include/uapi/linux/perf_event.h +1 −1
  9. include/uapi/linux/signalfd.h +1 −3
  10. include/uapi/linux/virtio_ids.h +1 −1
  11. include/uapi/misc/habanalabs.h +33 −0
include/uapi/asm-generic/siginfo.h+8−7
@@ -63,9 +63,6 @@ union __sifields { · 62 unmodified lines
63 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGTRAP, SIGEMT */63 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGTRAP, SIGEMT */
64 struct {64 struct {
65 void __user *_addr; /* faulting insn/memory ref. */65 void __user *_addr; /* faulting insn/memory ref. */
66#ifdef __ARCH_SI_TRAPNO
67 int _trapno; /* TRAP # which caused the signal */
68#endif
69#ifdef __ia64__66#ifdef __ia64__
70 int _imm; /* immediate value for "break" */67 int _imm; /* immediate value for "break" */
71 unsigned int _flags; /* see ia64 si_flags */68 unsigned int _flags; /* see ia64 si_flags */
@@ -75,6 +72,8 @@ union __sifields { · 3 unmodified lines
75#define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \72#define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \
76 sizeof(short) : __alignof__(void *))73 sizeof(short) : __alignof__(void *))
77 union {74 union {
75 /* used on alpha and sparc */
76 int _trapno; /* TRAP # which caused the signal */
78 /*77 /*
79 * used when si_code=BUS_MCEERR_AR or78 * used when si_code=BUS_MCEERR_AR or
80 * used when si_code=BUS_MCEERR_AO79 * used when si_code=BUS_MCEERR_AO
@@ -92,7 +91,10 @@ union __sifields { · 11 unmodified lines
92 __u32 _pkey;91 __u32 _pkey;
93 } _addr_pkey;92 } _addr_pkey;
94 /* used when si_code=TRAP_PERF */93 /* used when si_code=TRAP_PERF */
95 unsigned long _perf;94 struct {
95 unsigned long _data;
96 __u32 _type;
97 } _perf;
96 };98 };
97 } _sigfault;99 } _sigfault;
98 100
@@ -150,14 +152,13 @@ typedef struct siginfo { · 51 unmodified lines
150#define si_int _sifields._rt._sigval.sival_int152#define si_int _sifields._rt._sigval.sival_int
151#define si_ptr _sifields._rt._sigval.sival_ptr153#define si_ptr _sifields._rt._sigval.sival_ptr
152#define si_addr _sifields._sigfault._addr154#define si_addr _sifields._sigfault._addr
153#ifdef __ARCH_SI_TRAPNO
154#define si_trapno _sifields._sigfault._trapno155#define si_trapno _sifields._sigfault._trapno
155#endif
156#define si_addr_lsb _sifields._sigfault._addr_lsb156#define si_addr_lsb _sifields._sigfault._addr_lsb
157#define si_lower _sifields._sigfault._addr_bnd._lower157#define si_lower _sifields._sigfault._addr_bnd._lower
158#define si_upper _sifields._sigfault._addr_bnd._upper158#define si_upper _sifields._sigfault._addr_bnd._upper
159#define si_pkey _sifields._sigfault._addr_pkey._pkey159#define si_pkey _sifields._sigfault._addr_pkey._pkey
160#define si_perf _sifields._sigfault._perf160#define si_perf_data _sifields._sigfault._perf._data
161#define si_perf_type _sifields._sigfault._perf._type
161#define si_band _sifields._sigpoll._band162#define si_band _sifields._sigpoll._band
162#define si_fd _sifields._sigpoll._fd163#define si_fd _sifields._sigpoll._fd
163#define si_call_addr _sifields._sigsys._call_addr164#define si_call_addr _sifields._sigsys._call_addr
include/uapi/asm-generic/unistd.h+1−2
@@ -863,8 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) · 862 unmodified lines
863__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)863__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
864#define __NR_mount_setattr 442864#define __NR_mount_setattr 442
865__SYSCALL(__NR_mount_setattr, sys_mount_setattr)865__SYSCALL(__NR_mount_setattr, sys_mount_setattr)
866#define __NR_quotactl_path 443866/* 443 is reserved for quotactl_path */
867__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
868 867
869#define __NR_landlock_create_ruleset 444868#define __NR_landlock_create_ruleset 444
870__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)869__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)
include/uapi/linux/fs.h+1−1
@@ -185,7 +185,7 @@ struct fsxattr { · 184 unmodified lines
185#define BLKROTATIONAL _IO(0x12,126)185#define BLKROTATIONAL _IO(0x12,126)
186#define BLKZEROOUT _IO(0x12,127)186#define BLKZEROOUT _IO(0x12,127)
187/*187/*
188 * A jump here: 130-131 are reserved for zoned block devices188 * A jump here: 130-136 are reserved for zoned block devices
189 * (see uapi/linux/blkzoned.h)189 * (see uapi/linux/blkzoned.h)
190 */190 */
191 191
include/uapi/linux/in.h+3−0
@@ -289,6 +289,9 @@ struct sockaddr_in { · 288 unmodified lines
289/* Address indicating an error return. */289/* Address indicating an error return. */
290#define INADDR_NONE ((unsigned long int) 0xffffffff)290#define INADDR_NONE ((unsigned long int) 0xffffffff)
291 291
292/* Dummy address for src of ICMP replies if no real address is set (RFC7600). */
293#define INADDR_DUMMY ((unsigned long int) 0xc0000008)
294
292/* Network number for local host loopback. */295/* Network number for local host loopback. */
293#define IN_LOOPBACKNET 127296#define IN_LOOPBACKNET 127
294 297
include/uapi/linux/input-event-codes.h+1−0
@@ -611,6 +611,7 @@ · 610 unmodified lines
611#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */611#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */
612#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */612#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
613#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */613#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */
614#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */
614 615
615#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */616#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
616#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */617#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */
include/uapi/linux/io_uring.h+10−9
@@ -280,6 +280,7 @@ struct io_uring_params { · 279 unmodified lines
280#define IORING_FEAT_SQPOLL_NONFIXED (1U << 7)280#define IORING_FEAT_SQPOLL_NONFIXED (1U << 7)
281#define IORING_FEAT_EXT_ARG (1U << 8)281#define IORING_FEAT_EXT_ARG (1U << 8)
282#define IORING_FEAT_NATIVE_WORKERS (1U << 9)282#define IORING_FEAT_NATIVE_WORKERS (1U << 9)
283#define IORING_FEAT_RSRC_TAGS (1U << 10)
283 284
284/*285/*
285 * io_uring_register(2) opcodes and arguments286 * io_uring_register(2) opcodes and arguments
@@ -298,8 +299,12 @@ enum { · 12 unmodified lines
298 IORING_UNREGISTER_PERSONALITY = 10,299 IORING_UNREGISTER_PERSONALITY = 10,
299 IORING_REGISTER_RESTRICTIONS = 11,300 IORING_REGISTER_RESTRICTIONS = 11,
300 IORING_REGISTER_ENABLE_RINGS = 12,301 IORING_REGISTER_ENABLE_RINGS = 12,
301 IORING_REGISTER_RSRC = 13,302
302 IORING_REGISTER_RSRC_UPDATE = 14,303 /* extended with tagging */
304 IORING_REGISTER_FILES2 = 13,
305 IORING_REGISTER_FILES_UPDATE2 = 14,
306 IORING_REGISTER_BUFFERS2 = 15,
307 IORING_REGISTER_BUFFERS_UPDATE = 16,
303 308
304 /* this goes last */309 /* this goes last */
305 IORING_REGISTER_LAST310 IORING_REGISTER_LAST
@@ -312,14 +317,10 @@ struct io_uring_files_update { · 6 unmodified lines
312 __aligned_u64 /* __s32 * */ fds;317 __aligned_u64 /* __s32 * */ fds;
313};318};
314 319
315enum {
316 IORING_RSRC_FILE = 0,
317 IORING_RSRC_BUFFER = 1,
318};
319
320struct io_uring_rsrc_register {320struct io_uring_rsrc_register {
321 __u32 type;
322 __u32 nr;321 __u32 nr;
322 __u32 resv;
323 __u64 resv2;
323 __aligned_u64 data;324 __aligned_u64 data;
324 __aligned_u64 tags;325 __aligned_u64 tags;
325};326};
@@ -335,8 +336,8 @@ struct io_uring_rsrc_update2 { · 9 unmodified lines
335 __u32 resv;336 __u32 resv;
336 __aligned_u64 data;337 __aligned_u64 data;
337 __aligned_u64 tags;338 __aligned_u64 tags;
338 __u32 type;
339 __u32 nr;339 __u32 nr;
340 __u32 resv2;
340};341};
341 342
342/* Skip updating fd indexes set to this value in the fd table */343/* Skip updating fd indexes set to this value in the fd table */
include/uapi/linux/kvm.h+3−2
@@ -8,6 +8,7 @@ · 7 unmodified lines
8 * Note: you must update KVM_API_VERSION if you change this interface.8 * Note: you must update KVM_API_VERSION if you change this interface.
9 */9 */
10 10
11#include <linux/const.h>
11#include <linux/types.h>12#include <linux/types.h>
12#include <linux/compiler.h>13#include <linux/compiler.h>
13#include <linux/ioctl.h>14#include <linux/ioctl.h>
@@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { · 1865 unmodified lines
1879 * conversion after harvesting an entry. Also, it must not skip any1880 * conversion after harvesting an entry. Also, it must not skip any
1880 * dirty bits, so that dirty bits are always harvested in sequence.1881 * dirty bits, so that dirty bits are always harvested in sequence.
1881 */1882 */
1882#define KVM_DIRTY_GFN_F_DIRTY BIT(0)1883#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0)
1883#define KVM_DIRTY_GFN_F_RESET BIT(1)1884#define KVM_DIRTY_GFN_F_RESET _BITUL(1)
1884#define KVM_DIRTY_GFN_F_MASK 0x31885#define KVM_DIRTY_GFN_F_MASK 0x3
1885 1886
1886/*1887/*
include/uapi/linux/perf_event.h+1−1
@@ -464,7 +464,7 @@ struct perf_event_attr { · 463 unmodified lines
464 464
465 /*465 /*
466 * User provided data if sigtrap=1, passed back to user via466 * User provided data if sigtrap=1, passed back to user via
467 * siginfo_t::si_perf, e.g. to permit user to identify the event.467 * siginfo_t::si_perf_data, e.g. to permit user to identify the event.
468 */468 */
469 __u64 sig_data;469 __u64 sig_data;
470};470};
include/uapi/linux/signalfd.h+1−3
@@ -39,8 +39,6 @@ struct signalfd_siginfo { · 38 unmodified lines
39 __s32 ssi_syscall;39 __s32 ssi_syscall;
40 __u64 ssi_call_addr;40 __u64 ssi_call_addr;
41 __u32 ssi_arch;41 __u32 ssi_arch;
42 __u32 __pad3;
43 __u64 ssi_perf;
44 42
45 /*43 /*
46 * Pad strcture to 128 bytes. Remember to update the44 * Pad strcture to 128 bytes. Remember to update the
@@ -51,7 +49,7 @@ struct signalfd_siginfo { · 4 unmodified lines
51 * comes out of a read(2) and we really don't want to have49 * comes out of a read(2) and we really don't want to have
52 * a compat on read(2).50 * a compat on read(2).
53 */51 */
54 __u8 __pad[16];52 __u8 __pad[28];
55};53};
56 54
57 55
include/uapi/linux/virtio_ids.h+1−1
@@ -54,7 +54,7 @@ · 53 unmodified lines
54#define VIRTIO_ID_SOUND 25 /* virtio sound */54#define VIRTIO_ID_SOUND 25 /* virtio sound */
55#define VIRTIO_ID_FS 26 /* virtio filesystem */55#define VIRTIO_ID_FS 26 /* virtio filesystem */
56#define VIRTIO_ID_PMEM 27 /* virtio pmem */56#define VIRTIO_ID_PMEM 27 /* virtio pmem */
57#define VIRTIO_ID_BT 28 /* virtio bluetooth */
58#define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */57#define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */
58#define VIRTIO_ID_BT 40 /* virtio bluetooth */
59 59
60#endif /* _LINUX_VIRTIO_IDS_H */60#endif /* _LINUX_VIRTIO_IDS_H */
include/uapi/misc/habanalabs.h+33−0
@@ -239,6 +239,39 @@ enum gaudi_engine_id { · 238 unmodified lines
239 GAUDI_ENGINE_ID_SIZE239 GAUDI_ENGINE_ID_SIZE
240};240};
241 241
242/*
243 * ASIC specific PLL index
244 *
245 * Used to retrieve in frequency info of different IPs via
246 * HL_INFO_PLL_FREQUENCY under HL_IOCTL_INFO IOCTL. The enums need to be
247 * used as an index in struct hl_pll_frequency_info
248 */
249
250enum hl_goya_pll_index {
251 HL_GOYA_CPU_PLL = 0,
252 HL_GOYA_IC_PLL,
253 HL_GOYA_MC_PLL,
254 HL_GOYA_MME_PLL,
255 HL_GOYA_PCI_PLL,
256 HL_GOYA_EMMC_PLL,
257 HL_GOYA_TPC_PLL,
258 HL_GOYA_PLL_MAX
259};
260
261enum hl_gaudi_pll_index {
262 HL_GAUDI_CPU_PLL = 0,
263 HL_GAUDI_PCI_PLL,
264 HL_GAUDI_SRAM_PLL,
265 HL_GAUDI_HBM_PLL,
266 HL_GAUDI_NIC_PLL,
267 HL_GAUDI_DMA_PLL,
268 HL_GAUDI_MESH_PLL,
269 HL_GAUDI_MME_PLL,
270 HL_GAUDI_TPC_PLL,
271 HL_GAUDI_IF_PLL,
272 HL_GAUDI_PLL_MAX
273};
274
242enum hl_device_status {275enum hl_device_status {
243 HL_DEVICE_STATUS_OPERATIONAL,276 HL_DEVICE_STATUS_OPERATIONAL,
244 HL_DEVICE_STATUS_IN_RESET,277 HL_DEVICE_STATUS_IN_RESET,