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
6363 /* SIGILL, SIGFPE, SIGSEGV, SIGBUS, SIGTRAP, SIGEMT */
6464 struct {
6565 void __user *_addr; /* faulting insn/memory ref. */
66−#ifdef __ARCH_SI_TRAPNO
67− int _trapno; /* TRAP # which caused the signal */
68−#endif
6966 #ifdef __ia64__
7067 int _imm; /* immediate value for "break" */
7168 unsigned int _flags; /* see ia64 si_flags */
@@ -75,6 +72,8 @@ union __sifields { · 3 unmodified lines
7572 #define __ADDR_BND_PKEY_PAD (__alignof__(void *) < sizeof(short) ? \
7673 sizeof(short) : __alignof__(void *))
7774 union {
75+ /* used on alpha and sparc */
76+ int _trapno; /* TRAP # which caused the signal */
7877 /*
7978 * used when si_code=BUS_MCEERR_AR or
8079 * used when si_code=BUS_MCEERR_AO
@@ -92,7 +91,10 @@ union __sifields { · 11 unmodified lines
9291 __u32 _pkey;
9392 } _addr_pkey;
9493 /* used when si_code=TRAP_PERF */
95− unsigned long _perf;
94+ struct {
95+ unsigned long _data;
96+ __u32 _type;
97+ } _perf;
9698 };
9799 } _sigfault;
98100
@@ -150,14 +152,13 @@ typedef struct siginfo { · 51 unmodified lines
150152 #define si_int _sifields._rt._sigval.sival_int
151153 #define si_ptr _sifields._rt._sigval.sival_ptr
152154 #define si_addr _sifields._sigfault._addr
153−#ifdef __ARCH_SI_TRAPNO
154155 #define si_trapno _sifields._sigfault._trapno
155−#endif
156156 #define si_addr_lsb _sifields._sigfault._addr_lsb
157157 #define si_lower _sifields._sigfault._addr_bnd._lower
158158 #define si_upper _sifields._sigfault._addr_bnd._upper
159159 #define si_pkey _sifields._sigfault._addr_pkey._pkey
160−#define si_perf _sifields._sigfault._perf
160+#define si_perf_data _sifields._sigfault._perf._data
161+#define si_perf_type _sifields._sigfault._perf._type
161162 #define si_band _sifields._sigpoll._band
162163 #define si_fd _sifields._sigpoll._fd
163164 #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
863863 __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)
864864 #define __NR_mount_setattr 442
865865 __SYSCALL(__NR_mount_setattr, sys_mount_setattr)
866−#define __NR_quotactl_path 443
867−__SYSCALL(__NR_quotactl_path, sys_quotactl_path)
866+/* 443 is reserved for quotactl_path */
868867
869868 #define __NR_landlock_create_ruleset 444
870869 __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
185185 #define BLKROTATIONAL _IO(0x12,126)
186186 #define BLKZEROOUT _IO(0x12,127)
187187 /*
188− * A jump here: 130-131 are reserved for zoned block devices
188+ * A jump here: 130-136 are reserved for zoned block devices
189189 * (see uapi/linux/blkzoned.h)
190190 */
191191
include/uapi/linux/in.h+3−0
@@ -289,6 +289,9 @@ struct sockaddr_in { · 288 unmodified lines
289289 /* Address indicating an error return. */
290290 #define INADDR_NONE ((unsigned long int) 0xffffffff)
291291
292+/* Dummy address for src of ICMP replies if no real address is set (RFC7600). */
293+#define INADDR_DUMMY ((unsigned long int) 0xc0000008)
294+
292295 /* Network number for local host loopback. */
293296 #define IN_LOOPBACKNET 127
294297
include/uapi/linux/input-event-codes.h+1−0
@@ -611,6 +611,7 @@ · 610 unmodified lines
611611 #define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */
612612 #define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */
613613 #define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */
614+#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */
614615
615616 #define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */
616617 #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
280280 #define IORING_FEAT_SQPOLL_NONFIXED (1U << 7)
281281 #define IORING_FEAT_EXT_ARG (1U << 8)
282282 #define IORING_FEAT_NATIVE_WORKERS (1U << 9)
283+#define IORING_FEAT_RSRC_TAGS (1U << 10)
283284
284285 /*
285286 * io_uring_register(2) opcodes and arguments
@@ -298,8 +299,12 @@ enum { · 12 unmodified lines
298299 IORING_UNREGISTER_PERSONALITY = 10,
299300 IORING_REGISTER_RESTRICTIONS = 11,
300301 IORING_REGISTER_ENABLE_RINGS = 12,
301− IORING_REGISTER_RSRC = 13,
302− IORING_REGISTER_RSRC_UPDATE = 14,
302+
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,
303308
304309 /* this goes last */
305310 IORING_REGISTER_LAST
@@ -312,14 +317,10 @@ struct io_uring_files_update { · 6 unmodified lines
312317 __aligned_u64 /* __s32 * */ fds;
313318 };
314319
315−enum {
316− IORING_RSRC_FILE = 0,
317− IORING_RSRC_BUFFER = 1,
318−};
319−
320320 struct io_uring_rsrc_register {
321− __u32 type;
322321 __u32 nr;
322+ __u32 resv;
323+ __u64 resv2;
323324 __aligned_u64 data;
324325 __aligned_u64 tags;
325326 };
@@ -335,8 +336,8 @@ struct io_uring_rsrc_update2 { · 9 unmodified lines
335336 __u32 resv;
336337 __aligned_u64 data;
337338 __aligned_u64 tags;
338− __u32 type;
339339 __u32 nr;
340+ __u32 resv2;
340341 };
341342
342343 /* 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
88 * Note: you must update KVM_API_VERSION if you change this interface.
99 */
1010
11+#include <linux/const.h>
1112 #include <linux/types.h>
1213 #include <linux/compiler.h>
1314 #include <linux/ioctl.h>
@@ -1879,8 +1880,8 @@ struct kvm_hyperv_eventfd { · 1865 unmodified lines
18791880 * conversion after harvesting an entry. Also, it must not skip any
18801881 * dirty bits, so that dirty bits are always harvested in sequence.
18811882 */
1882−#define KVM_DIRTY_GFN_F_DIRTY BIT(0)
1883−#define KVM_DIRTY_GFN_F_RESET BIT(1)
1883+#define KVM_DIRTY_GFN_F_DIRTY _BITUL(0)
1884+#define KVM_DIRTY_GFN_F_RESET _BITUL(1)
18841885 #define KVM_DIRTY_GFN_F_MASK 0x3
18851886
18861887 /*
include/uapi/linux/perf_event.h+1−1
@@ -464,7 +464,7 @@ struct perf_event_attr { · 463 unmodified lines
464464
465465 /*
466466 * 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.
468468 */
469469 __u64 sig_data;
470470 };
include/uapi/linux/signalfd.h+1−3
@@ -39,8 +39,6 @@ struct signalfd_siginfo { · 38 unmodified lines
3939 __s32 ssi_syscall;
4040 __u64 ssi_call_addr;
4141 __u32 ssi_arch;
42− __u32 __pad3;
43− __u64 ssi_perf;
4442
4543 /*
4644 * Pad strcture to 128 bytes. Remember to update the
@@ -51,7 +49,7 @@ struct signalfd_siginfo { · 4 unmodified lines
5149 * comes out of a read(2) and we really don't want to have
5250 * a compat on read(2).
5351 */
54− __u8 __pad[16];
52+ __u8 __pad[28];
5553 };
5654
5755
include/uapi/linux/virtio_ids.h+1−1
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 #define VIRTIO_ID_SOUND 25 /* virtio sound */
5555 #define VIRTIO_ID_FS 26 /* virtio filesystem */
5656 #define VIRTIO_ID_PMEM 27 /* virtio pmem */
57−#define VIRTIO_ID_BT 28 /* virtio bluetooth */
5857 #define VIRTIO_ID_MAC80211_HWSIM 29 /* virtio mac80211-hwsim */
58+#define VIRTIO_ID_BT 40 /* virtio bluetooth */
5959
6060 #endif /* _LINUX_VIRTIO_IDS_H */
include/uapi/misc/habanalabs.h+33−0
@@ -239,6 +239,39 @@ enum gaudi_engine_id { · 238 unmodified lines
239239 GAUDI_ENGINE_ID_SIZE
240240 };
241241
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+
250+enum 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+
261+enum 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+
242275 enum hl_device_status {
243276 HL_DEVICE_STATUS_OPERATIONAL,
244277 HL_DEVICE_STATUS_IN_RESET,