Skip to content

Commit 327d4b7

Browse files
Bharata B Raodgibson
Bharata B Rao
authored and
dgibson
committed
linux-headers: Update
Update to mainline commit: 79160a603bdb ("Merge tag 'usb-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb" Signed-off-by: Bharata B Rao <[email protected]> Message-Id: <[email protected]> Signed-off-by: David Gibson <[email protected]>
1 parent 21bde1e commit 327d4b7

File tree

23 files changed

+197
-17
lines changed

23 files changed

+197
-17
lines changed

‎include/standard-headers/asm-x86/kvm_para.h

+13
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#define KVM_FEATURE_PV_SCHED_YIELD 13
3434
#define KVM_FEATURE_ASYNC_PF_INT 14
3535
#define KVM_FEATURE_MSI_EXT_DEST_ID 15
36+
#define KVM_FEATURE_HC_MAP_GPA_RANGE 16
37+
#define KVM_FEATURE_MIGRATION_CONTROL 17
3638

3739
#define KVM_HINTS_REALTIME 0
3840

@@ -54,6 +56,7 @@
5456
#define MSR_KVM_POLL_CONTROL 0x4b564d05
5557
#define MSR_KVM_ASYNC_PF_INT 0x4b564d06
5658
#define MSR_KVM_ASYNC_PF_ACK 0x4b564d07
59+
#define MSR_KVM_MIGRATION_CONTROL 0x4b564d08
5760

5861
struct kvm_steal_time {
5962
uint64_t steal;
@@ -90,6 +93,16 @@ struct kvm_clock_pairing {
9093
/* MSR_KVM_ASYNC_PF_INT */
9194
#define KVM_ASYNC_PF_VEC_MASK GENMASK(7, 0)
9295

96+
/* MSR_KVM_MIGRATION_CONTROL */
97+
#define KVM_MIGRATION_READY (1 << 0)
98+
99+
/* KVM_HC_MAP_GPA_RANGE */
100+
#define KVM_MAP_GPA_RANGE_PAGE_SZ_4K 0
101+
#define KVM_MAP_GPA_RANGE_PAGE_SZ_2M (1 << 0)
102+
#define KVM_MAP_GPA_RANGE_PAGE_SZ_1G (1 << 1)
103+
#define KVM_MAP_GPA_RANGE_ENC_STAT(n) (n << 4)
104+
#define KVM_MAP_GPA_RANGE_ENCRYPTED KVM_MAP_GPA_RANGE_ENC_STAT(1)
105+
#define KVM_MAP_GPA_RANGE_DECRYPTED KVM_MAP_GPA_RANGE_ENC_STAT(0)
93106

94107
/* Operations for KVM_HC_MMU_OP */
95108
#define KVM_MMU_OP_WRITE_PTE 1

‎include/standard-headers/drm/drm_fourcc.h

+7
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,13 @@ extern "C" {
167167
#define DRM_FORMAT_RGBA1010102 fourcc_code('R', 'A', '3', '0') /* [31:0] R:G:B:A 10:10:10:2 little endian */
168168
#define DRM_FORMAT_BGRA1010102 fourcc_code('B', 'A', '3', '0') /* [31:0] B:G:R:A 10:10:10:2 little endian */
169169

170+
/* 64 bpp RGB */
171+
#define DRM_FORMAT_XRGB16161616 fourcc_code('X', 'R', '4', '8') /* [63:0] x:R:G:B 16:16:16:16 little endian */
172+
#define DRM_FORMAT_XBGR16161616 fourcc_code('X', 'B', '4', '8') /* [63:0] x:B:G:R 16:16:16:16 little endian */
173+
174+
#define DRM_FORMAT_ARGB16161616 fourcc_code('A', 'R', '4', '8') /* [63:0] A:R:G:B 16:16:16:16 little endian */
175+
#define DRM_FORMAT_ABGR16161616 fourcc_code('A', 'B', '4', '8') /* [63:0] A:B:G:R 16:16:16:16 little endian */
176+
170177
/*
171178
* Floating point 64bpp RGB
172179
* IEEE 754-2008 binary16 half-precision float

‎include/standard-headers/linux/ethtool.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ enum tunable_id {
233233
ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
234234
/*
235235
* Add your fresh new tunable attribute above and remember to update
236-
* tunable_strings[] in net/core/ethtool.c
236+
* tunable_strings[] in net/ethtool/common.c
237237
*/
238238
__ETHTOOL_TUNABLE_COUNT,
239239
};
@@ -297,7 +297,7 @@ enum phy_tunable_id {
297297
ETHTOOL_PHY_EDPD,
298298
/*
299299
* Add your fresh new phy tunable attribute above and remember to update
300-
* phy_tunable_strings[] in net/core/ethtool.c
300+
* phy_tunable_strings[] in net/ethtool/common.c
301301
*/
302302
__ETHTOOL_PHY_TUNABLE_COUNT,
303303
};

‎include/standard-headers/linux/input-event-codes.h

+1
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@
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/standard-headers/linux/virtio_ids.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
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/standard-headers/linux/virtio_vsock.h

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
#include "standard-headers/linux/virtio_ids.h"
3939
#include "standard-headers/linux/virtio_config.h"
4040

41+
/* The feature bitmap for virtio vsock */
42+
#define VIRTIO_VSOCK_F_SEQPACKET 1 /* SOCK_SEQPACKET supported */
43+
4144
struct virtio_vsock_config {
4245
uint64_t guest_cid;
4346
} QEMU_PACKED;
@@ -65,6 +68,7 @@ struct virtio_vsock_hdr {
6568

6669
enum virtio_vsock_type {
6770
VIRTIO_VSOCK_TYPE_STREAM = 1,
71+
VIRTIO_VSOCK_TYPE_SEQPACKET = 2,
6872
};
6973

7074
enum virtio_vsock_op {
@@ -91,4 +95,9 @@ enum virtio_vsock_shutdown {
9195
VIRTIO_VSOCK_SHUTDOWN_SEND = 2,
9296
};
9397

98+
/* VIRTIO_VSOCK_OP_RW flags values */
99+
enum virtio_vsock_rw {
100+
VIRTIO_VSOCK_SEQ_EOR = 1,
101+
};
102+
94103
#endif /* _LINUX_VIRTIO_VSOCK_H */

‎linux-headers/asm-arm64/kvm.h

+11
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,17 @@ struct kvm_vcpu_events {
184184
__u32 reserved[12];
185185
};
186186

187+
struct kvm_arm_copy_mte_tags {
188+
__u64 guest_ipa;
189+
__u64 length;
190+
void *addr;
191+
__u64 flags;
192+
__u64 reserved[2];
193+
};
194+
195+
#define KVM_ARM_TAGS_TO_GUEST 0
196+
#define KVM_ARM_TAGS_FROM_GUEST 1
197+
187198
/* If you need to interpret the index values, here is the key: */
188199
#define KVM_REG_ARM_COPROC_MASK 0x000000000FFF0000
189200
#define KVM_REG_ARM_COPROC_SHIFT 16

‎linux-headers/asm-generic/mman-common.h

+3
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
#define MADV_COLD 20 /* deactivate these pages */
7373
#define MADV_PAGEOUT 21 /* reclaim these pages */
7474

75+
#define MADV_POPULATE_READ 22 /* populate (prefault) page tables readable */
76+
#define MADV_POPULATE_WRITE 23 /* populate (prefault) page tables writable */
77+
7578
/* compatibility flags */
7679
#define MAP_FILE 0
7780

‎linux-headers/asm-generic/unistd.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -863,8 +863,8 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise)
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+
#define __NR_quotactl_fd 443
867+
__SYSCALL(__NR_quotactl_fd, sys_quotactl_fd)
868868

869869
#define __NR_landlock_create_ruleset 444
870870
__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)

‎linux-headers/asm-mips/mman.h

+3
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@
9898
#define MADV_COLD 20 /* deactivate these pages */
9999
#define MADV_PAGEOUT 21 /* reclaim these pages */
100100

101+
#define MADV_POPULATE_READ 22 /* populate (prefault) page tables readable */
102+
#define MADV_POPULATE_WRITE 23 /* populate (prefault) page tables writable */
103+
101104
/* compatibility flags */
102105
#define MAP_FILE 0
103106

‎linux-headers/asm-mips/unistd_n32.h

+1
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@
372372
#define __NR_process_madvise (__NR_Linux + 440)
373373
#define __NR_epoll_pwait2 (__NR_Linux + 441)
374374
#define __NR_mount_setattr (__NR_Linux + 442)
375+
#define __NR_quotactl_fd (__NR_Linux + 443)
375376
#define __NR_landlock_create_ruleset (__NR_Linux + 444)
376377
#define __NR_landlock_add_rule (__NR_Linux + 445)
377378
#define __NR_landlock_restrict_self (__NR_Linux + 446)

‎linux-headers/asm-mips/unistd_n64.h

+1
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@
348348
#define __NR_process_madvise (__NR_Linux + 440)
349349
#define __NR_epoll_pwait2 (__NR_Linux + 441)
350350
#define __NR_mount_setattr (__NR_Linux + 442)
351+
#define __NR_quotactl_fd (__NR_Linux + 443)
351352
#define __NR_landlock_create_ruleset (__NR_Linux + 444)
352353
#define __NR_landlock_add_rule (__NR_Linux + 445)
353354
#define __NR_landlock_restrict_self (__NR_Linux + 446)

‎linux-headers/asm-mips/unistd_o32.h

+1
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,7 @@
418418
#define __NR_process_madvise (__NR_Linux + 440)
419419
#define __NR_epoll_pwait2 (__NR_Linux + 441)
420420
#define __NR_mount_setattr (__NR_Linux + 442)
421+
#define __NR_quotactl_fd (__NR_Linux + 443)
421422
#define __NR_landlock_create_ruleset (__NR_Linux + 444)
422423
#define __NR_landlock_add_rule (__NR_Linux + 445)
423424
#define __NR_landlock_restrict_self (__NR_Linux + 446)

‎linux-headers/asm-powerpc/unistd_32.h

+1
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@
425425
#define __NR_process_madvise 440
426426
#define __NR_epoll_pwait2 441
427427
#define __NR_mount_setattr 442
428+
#define __NR_quotactl_fd 443
428429
#define __NR_landlock_create_ruleset 444
429430
#define __NR_landlock_add_rule 445
430431
#define __NR_landlock_restrict_self 446

‎linux-headers/asm-powerpc/unistd_64.h

+1
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@
397397
#define __NR_process_madvise 440
398398
#define __NR_epoll_pwait2 441
399399
#define __NR_mount_setattr 442
400+
#define __NR_quotactl_fd 443
400401
#define __NR_landlock_create_ruleset 444
401402
#define __NR_landlock_add_rule 445
402403
#define __NR_landlock_restrict_self 446

‎linux-headers/asm-s390/unistd_32.h

+1
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@
415415
#define __NR_process_madvise 440
416416
#define __NR_epoll_pwait2 441
417417
#define __NR_mount_setattr 442
418+
#define __NR_quotactl_fd 443
418419
#define __NR_landlock_create_ruleset 444
419420
#define __NR_landlock_add_rule 445
420421
#define __NR_landlock_restrict_self 446

‎linux-headers/asm-s390/unistd_64.h

+1
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@
363363
#define __NR_process_madvise 440
364364
#define __NR_epoll_pwait2 441
365365
#define __NR_mount_setattr 442
366+
#define __NR_quotactl_fd 443
366367
#define __NR_landlock_create_ruleset 444
367368
#define __NR_landlock_add_rule 445
368369
#define __NR_landlock_restrict_self 446

‎linux-headers/asm-x86/kvm.h

+13
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,19 @@ struct kvm_sregs {
159159
__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];
160160
};
161161

162+
struct kvm_sregs2 {
163+
/* out (KVM_GET_SREGS2) / in (KVM_SET_SREGS2) */
164+
struct kvm_segment cs, ds, es, fs, gs, ss;
165+
struct kvm_segment tr, ldt;
166+
struct kvm_dtable gdt, idt;
167+
__u64 cr0, cr2, cr3, cr4, cr8;
168+
__u64 efer;
169+
__u64 apic_base;
170+
__u64 flags;
171+
__u64 pdptrs[4];
172+
};
173+
#define KVM_SREGS2_FLAGS_PDPTRS_VALID 1
174+
162175
/* for KVM_GET_FPU and KVM_SET_FPU */
163176
struct kvm_fpu {
164177
__u8 fpr[8][16];

‎linux-headers/asm-x86/unistd_32.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _ASM_X86_UNISTD_32_H
2-
#define _ASM_X86_UNISTD_32_H 1
1+
#ifndef _ASM_UNISTD_32_H
2+
#define _ASM_UNISTD_32_H
33

44
#define __NR_restart_syscall 0
55
#define __NR_exit 1
@@ -433,9 +433,10 @@
433433
#define __NR_process_madvise 440
434434
#define __NR_epoll_pwait2 441
435435
#define __NR_mount_setattr 442
436+
#define __NR_quotactl_fd 443
436437
#define __NR_landlock_create_ruleset 444
437438
#define __NR_landlock_add_rule 445
438439
#define __NR_landlock_restrict_self 446
439440

440441

441-
#endif /* _ASM_X86_UNISTD_32_H */
442+
#endif /* _ASM_UNISTD_32_H */

‎linux-headers/asm-x86/unistd_64.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _ASM_X86_UNISTD_64_H
2-
#define _ASM_X86_UNISTD_64_H 1
1+
#ifndef _ASM_UNISTD_64_H
2+
#define _ASM_UNISTD_64_H
33

44
#define __NR_read 0
55
#define __NR_write 1
@@ -355,9 +355,10 @@
355355
#define __NR_process_madvise 440
356356
#define __NR_epoll_pwait2 441
357357
#define __NR_mount_setattr 442
358+
#define __NR_quotactl_fd 443
358359
#define __NR_landlock_create_ruleset 444
359360
#define __NR_landlock_add_rule 445
360361
#define __NR_landlock_restrict_self 446
361362

362363

363-
#endif /* _ASM_X86_UNISTD_64_H */
364+
#endif /* _ASM_UNISTD_64_H */

‎linux-headers/asm-x86/unistd_x32.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _ASM_X86_UNISTD_X32_H
2-
#define _ASM_X86_UNISTD_X32_H 1
1+
#ifndef _ASM_UNISTD_X32_H
2+
#define _ASM_UNISTD_X32_H
33

44
#define __NR_read (__X32_SYSCALL_BIT + 0)
55
#define __NR_write (__X32_SYSCALL_BIT + 1)
@@ -308,6 +308,7 @@
308308
#define __NR_process_madvise (__X32_SYSCALL_BIT + 440)
309309
#define __NR_epoll_pwait2 (__X32_SYSCALL_BIT + 441)
310310
#define __NR_mount_setattr (__X32_SYSCALL_BIT + 442)
311+
#define __NR_quotactl_fd (__X32_SYSCALL_BIT + 443)
311312
#define __NR_landlock_create_ruleset (__X32_SYSCALL_BIT + 444)
312313
#define __NR_landlock_add_rule (__X32_SYSCALL_BIT + 445)
313314
#define __NR_landlock_restrict_self (__X32_SYSCALL_BIT + 446)
@@ -349,4 +350,4 @@
349350
#define __NR_pwritev2 (__X32_SYSCALL_BIT + 547)
350351

351352

352-
#endif /* _ASM_X86_UNISTD_X32_H */
353+
#endif /* _ASM_UNISTD_X32_H */

0 commit comments

Comments
 (0)