lael-labs/linux

include/uapi/drm/amdgpu_drm.h+11−6

  *
  * %AMDGPU_GEM_DOMAIN_DOORBELL	Doorbell. It is an MMIO region for
  * signalling user mode queues.
+ *
+ * %AMDGPU_GEM_DOMAIN_MMIO_REMAP	MMIO remap page (special mapping for HDP flushing).
  */
 #define AMDGPU_GEM_DOMAIN_CPU		0x1
 #define AMDGPU_GEM_DOMAIN_GTT		0x2
 #define AMDGPU_GEM_DOMAIN_GWS		0x10
 #define AMDGPU_GEM_DOMAIN_OA		0x20
 #define AMDGPU_GEM_DOMAIN_DOORBELL	0x40
+#define AMDGPU_GEM_DOMAIN_MMIO_REMAP	0x80
 #define AMDGPU_GEM_DOMAIN_MASK		(AMDGPU_GEM_DOMAIN_CPU | \
 					 AMDGPU_GEM_DOMAIN_GTT | \
 					 AMDGPU_GEM_DOMAIN_VRAM | \
 					 AMDGPU_GEM_DOMAIN_GDS | \
 					 AMDGPU_GEM_DOMAIN_GWS | \
-					 AMDGPU_GEM_DOMAIN_OA | \
+					 AMDGPU_GEM_DOMAIN_OA |	\
-					 AMDGPU_GEM_DOMAIN_DOORBELL)
+					 AMDGPU_GEM_DOMAIN_DOORBELL | \
+					 AMDGPU_GEM_DOMAIN_MMIO_REMAP)
 /* Flag that CPU access will be required for the case of VRAM domain */
 #define AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED	(1 << 0)
  *  Query h/w info: Flag that this is integrated (a.h.a. fusion) GPU
  *
  */
-#define AMDGPU_IDS_FLAGS_FUSION         0x1
+#define AMDGPU_IDS_FLAGS_FUSION			0x01
-#define AMDGPU_IDS_FLAGS_PREEMPTION     0x2
+#define AMDGPU_IDS_FLAGS_PREEMPTION		0x02
-#define AMDGPU_IDS_FLAGS_TMZ            0x4
+#define AMDGPU_IDS_FLAGS_TMZ			0x04
-#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD 0x8
+#define AMDGPU_IDS_FLAGS_CONFORMANT_TRUNC_COORD	0x08
+#define AMDGPU_IDS_FLAGS_GANG_SUBMIT		0x10
 /*
  *  Query h/w info: Flag identifying VF/PF/PT mode

include/uapi/linux/android/binder.h+1−1

@@ -38,7 +38,7 @@ enum { · 37 unmodified lines
38	BINDER_TYPE_PTR = B_PACK_CHARS('p', 't', '*', B_TYPE_LARGE),	38	BINDER_TYPE_PTR = B_PACK_CHARS('p', 't', '*', B_TYPE_LARGE),
39	};	39	};
40		40
41	enum {	41	enum flat_binder_object_flags {
42	FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,	42	FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,
43	FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,	43	FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,
44		44

include/uapi/linux/android/binder_netlink.h+37−0

@@ -0,0 +1,37 @@
	1	/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	2	/* Do not edit directly, auto-generated from: */
	3	/* Documentation/netlink/specs/binder.yaml */
	4	/* YNL-GEN uapi header */
	5
	6	#ifndef _UAPI_LINUX_ANDROID_BINDER_NETLINK_H
	7	#define _UAPI_LINUX_ANDROID_BINDER_NETLINK_H
	8
	9	#define BINDER_FAMILY_NAME "binder"
	10	#define BINDER_FAMILY_VERSION 1
	11
	12	enum {
	13	BINDER_A_REPORT_ERROR = 1,
	14	BINDER_A_REPORT_CONTEXT,
	15	BINDER_A_REPORT_FROM_PID,
	16	BINDER_A_REPORT_FROM_TID,
	17	BINDER_A_REPORT_TO_PID,
	18	BINDER_A_REPORT_TO_TID,
	19	BINDER_A_REPORT_IS_REPLY,
	20	BINDER_A_REPORT_FLAGS,
	21	BINDER_A_REPORT_CODE,
	22	BINDER_A_REPORT_DATA_SIZE,
	23
	24	__BINDER_A_REPORT_MAX,
	25	BINDER_A_REPORT_MAX = (__BINDER_A_REPORT_MAX - 1)
	26	};
	27
	28	enum {
	29	BINDER_CMD_REPORT = 1,
	30
	31	__BINDER_CMD_MAX,
	32	BINDER_CMD_MAX = (__BINDER_CMD_MAX - 1)
	33	};
	34
	35	#define BINDER_MCGRP_REPORT "report"
	36
	37	#endif /* _UAPI_LINUX_ANDROID_BINDER_NETLINK_H */

include/uapi/linux/aspeed-video.h+7−0

@@ -8,6 +8,13 @@ · 7 unmodified lines
8		8
9	#include <linux/v4l2-controls.h>	9	#include <linux/v4l2-controls.h>
10		10
		11	/* aspeed video's input types */
		12	enum aspeed_video_input {
		13	VIDEO_INPUT_VGA = 0,
		14	VIDEO_INPUT_GFX,
		15	VIDEO_INPUT_MAX
		16	};
		17
11	#define V4L2_CID_ASPEED_HQ_MODE (V4L2_CID_USER_ASPEED_BASE + 1)	18	#define V4L2_CID_ASPEED_HQ_MODE (V4L2_CID_USER_ASPEED_BASE + 1)
12	#define V4L2_CID_ASPEED_HQ_JPEG_QUALITY (V4L2_CID_USER_ASPEED_BASE + 2)	19	#define V4L2_CID_ASPEED_HQ_JPEG_QUALITY (V4L2_CID_USER_ASPEED_BASE + 2)
13		20

include/uapi/linux/audit.h+2−0

@@ -148,6 +148,8 @@ · 147 unmodified lines
148	#define AUDIT_IPE_POLICY_LOAD 1422 /* IPE policy load */	148	#define AUDIT_IPE_POLICY_LOAD 1422 /* IPE policy load */
149	#define AUDIT_LANDLOCK_ACCESS 1423 /* Landlock denial */	149	#define AUDIT_LANDLOCK_ACCESS 1423 /* Landlock denial */
150	#define AUDIT_LANDLOCK_DOMAIN 1424 /* Landlock domain status */	150	#define AUDIT_LANDLOCK_DOMAIN 1424 /* Landlock domain status */
		151	#define AUDIT_MAC_TASK_CONTEXTS 1425 /* Multiple LSM task contexts */
		152	#define AUDIT_MAC_OBJ_CONTEXTS 1426 /* Multiple LSM objext contexts */
151		153
152	#define AUDIT_FIRST_KERN_ANOM_MSG 1700	154	#define AUDIT_FIRST_KERN_ANOM_MSG 1700
153	#define AUDIT_LAST_KERN_ANOM_MSG 1799	155	#define AUDIT_LAST_KERN_ANOM_MSG 1799

include/uapi/linux/bpf.h+23−1

 		 * If provided, map_flags should have BPF_F_TOKEN_FD flag set.
 		 */
 		__s32	map_token_fd;
+		/* Hash of the program that has exclusive access to the map.
+		 */
+		__aligned_u64 excl_prog_hash;
+		/* Size of the passed excl_prog_hash. */
+		__u32 excl_prog_hash_size;
 	};
 	struct { /* anonymous struct used by BPF_MAP_*_ELEM and BPF_MAP_FREEZE commands */
 		 * continuous.
 		 */
 		__u32		fd_array_cnt;
+		/* Pointer to a buffer containing the signature of the BPF
+		 * program.
+		 */
+		__aligned_u64   signature;
+		/* Size of the signature buffer in bytes. */
+		__u32 		signature_size;
+		/* ID of the kernel keyring to be used for signature
+		 * verification.
+		 */
+		__s32		keyring_id;
 	};
 	struct { /* anonymous struct used by BPF_OBJ_* commands */
  *
  *		**-ENOENT** if the bpf_local_storage cannot be found.
  *
- * long bpf_d_path(struct path *path, char *buf, u32 sz)
+ * long bpf_d_path(const struct path *path, char *buf, u32 sz)
  *	Description
  *		Return full path for given **struct path** object, which
  *		needs to be the kernel BTF *path* object. The path is
 	__u32 btf_value_type_id;
 	__u32 btf_vmlinux_id;
 	__u64 map_extra;
+	__aligned_u64 hash;
+	__u32 hash_size;
 } __attribute__((aligned(8)));
 struct bpf_btf_info {
 	__u64 __opaque[2];
 } __attribute__((aligned(8)));
+struct bpf_task_work {
+	__u64 __opaque;
+} __attribute__((aligned(8)));
 struct bpf_wq {
 	__u64 __opaque[2];
 } __attribute__((aligned(8)));

include/uapi/linux/can/netlink.h+7−7

@@ -101,8 +101,8 @@ struct can_ctrlmode { · 100 unmodified lines
101	#define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */	101	#define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */
102	#define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */	102	#define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */
103	#define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */	103	#define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */
104	#define CAN_CTRLMODE_TDC_AUTO 0x200 /* CAN transiver automatically calculates TDCV */	104	#define CAN_CTRLMODE_TDC_AUTO 0x200 /* FD transceiver automatically calculates TDCV */
105	#define CAN_CTRLMODE_TDC_MANUAL 0x400 /* TDCV is manually set up by user */	105	#define CAN_CTRLMODE_TDC_MANUAL 0x400 /* FD TDCV is manually set up by user */
106		106
107	/*	107	/*
108	* CAN device statistics	108	* CAN device statistics
@@ -129,14 +129,14 @@ enum { · 20 unmodified lines
129	IFLA_CAN_RESTART_MS,	129	IFLA_CAN_RESTART_MS,
130	IFLA_CAN_RESTART,	130	IFLA_CAN_RESTART,
131	IFLA_CAN_BERR_COUNTER,	131	IFLA_CAN_BERR_COUNTER,
132	IFLA_CAN_DATA_BITTIMING,	132	IFLA_CAN_DATA_BITTIMING, /* FD */
133	IFLA_CAN_DATA_BITTIMING_CONST,	133	IFLA_CAN_DATA_BITTIMING_CONST, /* FD */
134	IFLA_CAN_TERMINATION,	134	IFLA_CAN_TERMINATION,
135	IFLA_CAN_TERMINATION_CONST,	135	IFLA_CAN_TERMINATION_CONST,
136	IFLA_CAN_BITRATE_CONST,	136	IFLA_CAN_BITRATE_CONST,
137	IFLA_CAN_DATA_BITRATE_CONST,	137	IFLA_CAN_DATA_BITRATE_CONST, /* FD */
138	IFLA_CAN_BITRATE_MAX,	138	IFLA_CAN_BITRATE_MAX,
139	IFLA_CAN_TDC,	139	IFLA_CAN_TDC, /* FD */
140	IFLA_CAN_CTRLMODE_EXT,	140	IFLA_CAN_CTRLMODE_EXT,
141		141
142	/* add new constants above here */	142	/* add new constants above here */
@@ -145,7 +145,7 @@ enum { · 2 unmodified lines
145	};	145	};
146		146
147	/*	147	/*
148	* CAN FD Transmitter Delay Compensation (TDC)	148	* CAN FD/XL Transmitter Delay Compensation (TDC)
149	*	149	*
150	* Please refer to struct can_tdc_const and can_tdc in	150	* Please refer to struct can_tdc_const and can_tdc in
151	* include/linux/can/bittiming.h for further details.	151	* include/linux/can/bittiming.h for further details.

include/uapi/linux/devlink.h+2−0

@@ -636,6 +636,8 @@ enum devlink_attr { · 635 unmodified lines
636		636
637	DEVLINK_ATTR_RATE_TC_BWS, /* nested */	637	DEVLINK_ATTR_RATE_TC_BWS, /* nested */
638		638
		639	DEVLINK_ATTR_HEALTH_REPORTER_BURST_PERIOD, /* u64 */
		640
639	/* Add new attributes above here, update the spec in	641	/* Add new attributes above here, update the spec in
640	* Documentation/netlink/specs/devlink.yaml and re-generate	642	* Documentation/netlink/specs/devlink.yaml and re-generate
641	* net/devlink/netlink_gen.c.	643	* net/devlink/netlink_gen.c.

include/uapi/linux/dpll.h+1−0

@@ -216,6 +216,7 @@ enum dpll_a { · 215 unmodified lines
216	DPLL_A_LOCK_STATUS_ERROR,	216	DPLL_A_LOCK_STATUS_ERROR,
217	DPLL_A_CLOCK_QUALITY_LEVEL,	217	DPLL_A_CLOCK_QUALITY_LEVEL,
218	DPLL_A_PHASE_OFFSET_MONITOR,	218	DPLL_A_PHASE_OFFSET_MONITOR,
		219	DPLL_A_PHASE_OFFSET_AVG_FACTOR,
219		220
220	__DPLL_A_MAX,	221	__DPLL_A_MAX,
221	DPLL_A_MAX = (__DPLL_A_MAX - 1)	222	DPLL_A_MAX = (__DPLL_A_MAX - 1)

include/uapi/linux/ethtool.h+1−0

@@ -2380,6 +2380,7 @@ enum { · 2379 unmodified lines
2380	#define RXH_L4_B_0_1 (1 << 6) /* src port in case of TCP/UDP/SCTP */	2380	#define RXH_L4_B_0_1 (1 << 6) /* src port in case of TCP/UDP/SCTP */
2381	#define RXH_L4_B_2_3 (1 << 7) /* dst port in case of TCP/UDP/SCTP */	2381	#define RXH_L4_B_2_3 (1 << 7) /* dst port in case of TCP/UDP/SCTP */
2382	#define RXH_GTP_TEID (1 << 8) /* teid in case of GTP */	2382	#define RXH_GTP_TEID (1 << 8) /* teid in case of GTP */
		2383	#define RXH_IP6_FL (1 << 9) /* IPv6 flow label */
2383	#define RXH_DISCARD (1 << 31)	2384	#define RXH_DISCARD (1 << 31)
2384		2385
2385	#define RX_CLS_FLOW_DISC 0xffffffffffffffffULL	2386	#define RX_CLS_FLOW_DISC 0xffffffffffffffffULL

include/uapi/linux/ethtool_netlink_generated.h+12−0

 	ETHTOOL_A_TUNNEL_INFO_MAX = (__ETHTOOL_A_TUNNEL_INFO_CNT - 1)
 };
+enum {
+	ETHTOOL_A_FEC_HIST_PAD = 1,
+	ETHTOOL_A_FEC_HIST_BIN_LOW,
+	ETHTOOL_A_FEC_HIST_BIN_HIGH,
+	ETHTOOL_A_FEC_HIST_BIN_VAL,
+	ETHTOOL_A_FEC_HIST_BIN_VAL_PER_LANE,
+	__ETHTOOL_A_FEC_HIST_CNT,
+	ETHTOOL_A_FEC_HIST_MAX = (__ETHTOOL_A_FEC_HIST_CNT - 1)
+};
 enum {
 	ETHTOOL_A_FEC_STAT_UNSPEC,
 	ETHTOOL_A_FEC_STAT_PAD,
 	ETHTOOL_A_FEC_STAT_CORRECTED,
 	ETHTOOL_A_FEC_STAT_UNCORR,
 	ETHTOOL_A_FEC_STAT_CORR_BITS,
+	ETHTOOL_A_FEC_STAT_HIST,
 	__ETHTOOL_A_FEC_STAT_CNT,
 	ETHTOOL_A_FEC_STAT_MAX = (__ETHTOOL_A_FEC_STAT_CNT - 1)

include/uapi/linux/ext4.h+53−0

@@ -33,6 +33,8 @@ · 32 unmodified lines
33	#define EXT4_IOC_CHECKPOINT _IOW('f', 43, __u32)	33	#define EXT4_IOC_CHECKPOINT _IOW('f', 43, __u32)
34	#define EXT4_IOC_GETFSUUID _IOR('f', 44, struct fsuuid)	34	#define EXT4_IOC_GETFSUUID _IOR('f', 44, struct fsuuid)
35	#define EXT4_IOC_SETFSUUID _IOW('f', 44, struct fsuuid)	35	#define EXT4_IOC_SETFSUUID _IOW('f', 44, struct fsuuid)
		36	#define EXT4_IOC_GET_TUNE_SB_PARAM _IOR('f', 45, struct ext4_tune_sb_params)
		37	#define EXT4_IOC_SET_TUNE_SB_PARAM _IOW('f', 46, struct ext4_tune_sb_params)
36		38
37	#define EXT4_IOC_SHUTDOWN _IOR('X', 125, __u32)	39	#define EXT4_IOC_SHUTDOWN _IOR('X', 125, __u32)
38		40
@@ -108,6 +110,57 @@ struct ext4_new_group_input { · 69 unmodified lines
108	__u16 unused;	110	__u16 unused;
109	};	111	};
110		112
		113	struct ext4_tune_sb_params {
		114	__u32 set_flags;
		115	__u32 checkinterval;
		116	__u16 errors_behavior;
		117	__u16 mnt_count;
		118	__u16 max_mnt_count;
		119	__u16 raid_stride;
		120	__u64 last_check_time;
		121	__u64 reserved_blocks;
		122	__u64 blocks_count;
		123	__u32 default_mnt_opts;
		124	__u32 reserved_uid;
		125	__u32 reserved_gid;
		126	__u32 raid_stripe_width;
		127	__u16 encoding;
		128	__u16 encoding_flags;
		129	__u8 def_hash_alg;
		130	__u8 pad_1;
		131	__u16 pad_2;
		132	__u32 feature_compat;
		133	__u32 feature_incompat;
		134	__u32 feature_ro_compat;
		135	__u32 set_feature_compat_mask;
		136	__u32 set_feature_incompat_mask;
		137	__u32 set_feature_ro_compat_mask;
		138	__u32 clear_feature_compat_mask;
		139	__u32 clear_feature_incompat_mask;
		140	__u32 clear_feature_ro_compat_mask;
		141	__u8 mount_opts[64];
		142	__u8 pad[64];
		143	};
		144
		145	#define EXT4_TUNE_FL_ERRORS_BEHAVIOR 0x00000001
		146	#define EXT4_TUNE_FL_MNT_COUNT 0x00000002
		147	#define EXT4_TUNE_FL_MAX_MNT_COUNT 0x00000004
		148	#define EXT4_TUNE_FL_CHECKINTRVAL 0x00000008
		149	#define EXT4_TUNE_FL_LAST_CHECK_TIME 0x00000010
		150	#define EXT4_TUNE_FL_RESERVED_BLOCKS 0x00000020
		151	#define EXT4_TUNE_FL_RESERVED_UID 0x00000040
		152	#define EXT4_TUNE_FL_RESERVED_GID 0x00000080
		153	#define EXT4_TUNE_FL_DEFAULT_MNT_OPTS 0x00000100
		154	#define EXT4_TUNE_FL_DEF_HASH_ALG 0x00000200
		155	#define EXT4_TUNE_FL_RAID_STRIDE 0x00000400
		156	#define EXT4_TUNE_FL_RAID_STRIPE_WIDTH 0x00000800
		157	#define EXT4_TUNE_FL_MOUNT_OPTS 0x00001000
		158	#define EXT4_TUNE_FL_FEATURES 0x00002000
		159	#define EXT4_TUNE_FL_EDIT_FEATURES 0x00004000
		160	#define EXT4_TUNE_FL_FORCE_FSCK 0x00008000
		161	#define EXT4_TUNE_FL_ENCODING 0x00010000
		162	#define EXT4_TUNE_FL_ENCODING_FLAGS 0x00020000
		163
111	/*	164	/*
112	* Returned by EXT4_IOC_GET_ES_CACHE as an additional possible flag.	165	* Returned by EXT4_IOC_GET_ES_CACHE as an additional possible flag.
113	* It indicates that the entry in extent status cache is for a hole.	166	* It indicates that the entry in extent status cache is for a hole.

include/uapi/linux/fcntl.h+1−0

@@ -111,6 +111,7 @@ · 110 unmodified lines
111	#define PIDFD_SELF_THREAD_GROUP -10001 /* Current thread group leader. */	111	#define PIDFD_SELF_THREAD_GROUP -10001 /* Current thread group leader. */
112		112
113	#define FD_PIDFS_ROOT -10002 /* Root of the pidfs filesystem */	113	#define FD_PIDFS_ROOT -10002 /* Root of the pidfs filesystem */
		114	#define FD_NSFS_ROOT -10003 /* Root of the nsfs filesystem */
114	#define FD_INVALID -10009 /* Invalid file descriptor: -10000 - EBADF = -10009 */	115	#define FD_INVALID -10009 /* Invalid file descriptor: -10000 - EBADF = -10009 */
115		116
116	/* Generic flags for the at(2) family of syscalls. /	117	/* Generic flags for the at(2) family of syscalls. /

include/uapi/linux/fs.h+4−1

 /* buffered IO that drops the cache after reading or writing data */
 #define RWF_DONTCACHE	((__force __kernel_rwf_t)0x00000080)
+/* prevent pipe and socket writes from raising SIGPIPE */
+#define RWF_NOSIGNAL	((__force __kernel_rwf_t)0x00000100)
 /* mask of flags supported by the kernel */
 #define RWF_SUPPORTED	(RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT |\
 			 RWF_APPEND | RWF_NOAPPEND | RWF_ATOMIC |\
-			 RWF_DONTCACHE)
+			 RWF_DONTCACHE | RWF_NOSIGNAL)
 #define PROCFS_IOCTL_MAGIC 'f'

include/uapi/linux/fuse.h+20−2

  *
  *  7.44
  *  - add FUSE_NOTIFY_INC_EPOCH
+ *
+ *  7.45
+ *  - add FUSE_COPY_FILE_RANGE_64
+ *  - add struct fuse_copy_file_range_out
+ *  - add FUSE_NOTIFY_PRUNE
  */
 #ifndef _LINUX_FUSE_H
 #define FUSE_KERNEL_VERSION 7
 /** Minor version number of this interface */
-#define FUSE_KERNEL_MINOR_VERSION 44
+#define FUSE_KERNEL_MINOR_VERSION 45
 /** The node ID of the root inode */
 #define FUSE_ROOT_ID 1
 	FUSE_SYNCFS		= 50,
 	FUSE_TMPFILE		= 51,
 	FUSE_STATX		= 52,
+	FUSE_COPY_FILE_RANGE_64	= 53,
 	/* CUSE specific operations */
 	CUSE_INIT		= 4096,
 	FUSE_NOTIFY_DELETE = 6,
 	FUSE_NOTIFY_RESEND = 7,
 	FUSE_NOTIFY_INC_EPOCH = 8,
-	FUSE_NOTIFY_CODE_MAX,
+	FUSE_NOTIFY_PRUNE = 9,
 };
 /* The read buffer is required to be at least 8k, but may be much larger */
 	uint64_t	dummy4;
 };
+struct fuse_notify_prune_out {
+	uint32_t	count;
+	uint32_t	padding;
+	uint64_t	spare;
+};
 struct fuse_backing_map {
 	int32_t		fd;
 	uint32_t	flags;
 #define FUSE_DEV_IOC_BACKING_OPEN	_IOW(FUSE_DEV_IOC_MAGIC, 1, \
 					     struct fuse_backing_map)
 #define FUSE_DEV_IOC_BACKING_CLOSE	_IOW(FUSE_DEV_IOC_MAGIC, 2, uint32_t)
+#define FUSE_DEV_IOC_SYNC_INIT		_IO(FUSE_DEV_IOC_MAGIC, 3)
 struct fuse_lseek_in {
 	uint64_t	fh;
 	uint64_t	flags;
 };
+/* For FUSE_COPY_FILE_RANGE_64 */
+struct fuse_copy_file_range_out {
+	uint64_t	bytes_copied;
+};
 #define FUSE_SETUPMAPPING_FLAG_WRITE (1ull << 0)
 #define FUSE_SETUPMAPPING_FLAG_READ (1ull << 1)
 struct fuse_setupmapping_in {

include/uapi/linux/hidraw.h+2−0

@@ -48,6 +48,8 @@ struct hidraw_devinfo { · 47 unmodified lines
48	#define HIDIOCGOUTPUT(len) _IOC(_IOC_WRITE\|_IOC_READ, 'H', 0x0C, len)	48	#define HIDIOCGOUTPUT(len) _IOC(_IOC_WRITE\|_IOC_READ, 'H', 0x0C, len)
49	#define HIDIOCREVOKE _IOW('H', 0x0D, int) /* Revoke device access */	49	#define HIDIOCREVOKE _IOW('H', 0x0D, int) /* Revoke device access */
50		50
		51	#define HIDIOCTL_LAST _IOC_NR(HIDIOCREVOKE)
		52
51	#define HIDRAW_FIRST_MINOR 0	53	#define HIDRAW_FIRST_MINOR 0
52	#define HIDRAW_MAX_DEVICES 64	54	#define HIDRAW_MAX_DEVICES 64
53	/* number of reports to buffer */	55	/* number of reports to buffer */

include/uapi/linux/i8k.h+2−0

@@ -36,6 +36,8 @@ · 35 unmodified lines
36	#define I8K_FAN_LOW 1	36	#define I8K_FAN_LOW 1
37	#define I8K_FAN_HIGH 2	37	#define I8K_FAN_HIGH 2
38	#define I8K_FAN_TURBO 3	38	#define I8K_FAN_TURBO 3
		39	/* Many machines treat this mode as some sort of automatic mode */
		40	#define I8K_FAN_AUTO 3
39	#define I8K_FAN_MAX I8K_FAN_TURBO	41	#define I8K_FAN_MAX I8K_FAN_TURBO
40		42
41	#define I8K_VOL_UP 1	43	#define I8K_VOL_UP 1

include/uapi/linux/if_bridge.h+3−0

 /* bridge boolean options
  * BR_BOOLOPT_NO_LL_LEARN - disable learning from link-local packets
  * BR_BOOLOPT_MCAST_VLAN_SNOOPING - control vlan multicast snooping
+ * BR_BOOLOPT_FDB_LOCAL_VLAN_0 - local FDB entries installed by the bridge
+ *                               driver itself should only be added on VLAN 0
  *
  * IMPORTANT: if adding a new option do not forget to handle
  *            it in br_boolopt_toggle/get and bridge sysfs
 	BR_BOOLOPT_MCAST_VLAN_SNOOPING,
 	BR_BOOLOPT_MST_ENABLE,
 	BR_BOOLOPT_MDB_OFFLOAD_FAIL_NOTIFICATION,
+	BR_BOOLOPT_FDB_LOCAL_VLAN_0,
 	BR_BOOLOPT_MAX
 };

include/uapi/linux/if_link.h+3−0

 	IFLA_DPLL_PIN,
 	IFLA_MAX_PACING_OFFLOAD_HORIZON,
 	IFLA_NETNS_IMMUTABLE,
+	IFLA_HEADROOM,
+	IFLA_TAILROOM,
 	__IFLA_MAX
 };
 	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,
 	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,
 	IFLA_BOND_SLAVE_PRIO,
+	IFLA_BOND_SLAVE_ACTOR_PORT_PRIO,
 	__IFLA_BOND_SLAVE_MAX,
 };

include/uapi/linux/iio/types.h+5−0

 	IIO_COLORTEMP,
 	IIO_CHROMATICITY,
 	IIO_ATTENTION,
+	IIO_ALTCURRENT,
 };
 enum iio_modifier {
 	IIO_MOD_ROLL,
 	IIO_MOD_LIGHT_UVA,
 	IIO_MOD_LIGHT_UVB,
+	IIO_MOD_RMS,
+	IIO_MOD_ACTIVE,
+	IIO_MOD_REACTIVE,
+	IIO_MOD_APPARENT,
 };
 enum iio_event_type {

include/uapi/linux/input-event-codes.h+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */	27	#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */
28	#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */	28	#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */
29	#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */	29	#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */
		30	#define INPUT_PROP_HAPTIC_TOUCHPAD 0x07 /* is a haptic touchpad */
30		31
31	#define INPUT_PROP_MAX 0x1f	32	#define INPUT_PROP_MAX 0x1f
32	#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)	33	#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1)

include/uapi/linux/input.h+21−1

 	__u16 weak_magnitude;
 };
+/**
+ * struct ff_haptic_effect
+ * @hid_usage: hid_usage according to Haptics page (WAVEFORM_CLICK, etc.)
+ * @vendor_id: the waveform vendor ID if hid_usage is in the vendor-defined range
+ * @vendor_waveform_page: the vendor waveform page if hid_usage is in the vendor-defined range
+ * @intensity: strength of the effect as percentage
+ * @repeat_count: number of times to retrigger effect
+ * @retrigger_period: time before effect is retriggered (in ms)
+ */
+struct ff_haptic_effect {
+	__u16 hid_usage;
+	__u16 vendor_id;
+	__u8  vendor_waveform_page;
+	__u16 intensity;
+	__u16 repeat_count;
+	__u16 retrigger_period;
+};
 /**
  * struct ff_effect - defines force feedback effect
  * @type: type of the effect (FF_CONSTANT, FF_PERIODIC, FF_RAMP, FF_SPRING,
 		struct ff_periodic_effect periodic;
 		struct ff_condition_effect condition[2]; /* One for each axis */
 		struct ff_rumble_effect rumble;
+		struct ff_haptic_effect haptic;
 	} u;
 };
  * Force feedback effect types
  */
+#define FF_HAPTIC		0x4f
 #define FF_RUMBLE	0x50
 #define FF_PERIODIC	0x51
 #define FF_CONSTANT	0x52
 #define FF_INERTIA	0x56
 #define FF_RAMP		0x57
-#define FF_EFFECT_MIN	FF_RUMBLE
+#define FF_EFFECT_MIN	FF_HAPTIC
 #define FF_EFFECT_MAX	FF_RAMP
 /*

include/uapi/linux/io_uring.h+38−2

 /* Use hybrid poll in iopoll process */
 #define IORING_SETUP_HYBRID_IOPOLL	(1U << 17)
+/*
+ * Allow both 16b and 32b CQEs. If a 32b CQE is posted, it will have
+ * IORING_CQE_F_32 set in cqe->flags.
+ */
+#define IORING_SETUP_CQE_MIXED		(1U << 18)
 enum io_uring_op {
 	IORING_OP_NOP,
 	IORING_OP_READV,
  * sqe->uring_cmd_flags		top 8bits aren't available for userspace
  * IORING_URING_CMD_FIXED	use registered buffer; pass this flag
  *				along with setting sqe->buf_index.
+ * IORING_URING_CMD_MULTISHOT	must be used with buffer select, like other
+ *				multishot commands. Not compatible with
+ *				IORING_URING_CMD_FIXED, for now.
  */
 #define IORING_URING_CMD_FIXED	(1U << 0)
-#define IORING_URING_CMD_MASK	IORING_URING_CMD_FIXED
+#define IORING_URING_CMD_MULTISHOT	(1U << 1)
+#define IORING_URING_CMD_MASK	(IORING_URING_CMD_FIXED | IORING_URING_CMD_MULTISHOT)
 /*
  *				will be	contiguous from the starting buffer ID.
  *
  * IORING_SEND_VECTORIZED	If set, SEND[_ZC] will take a pointer to a io_vec
- * 				to allow vectorized send operations.
+ *				to allow vectorized send operations.
  */
 #define IORING_RECVSEND_POLL_FIRST	(1U << 0)
 #define IORING_RECV_MULTISHOT		(1U << 1)
 #define IORING_NOP_FIXED_FILE		(1U << 2)
 #define IORING_NOP_FIXED_BUFFER		(1U << 3)
 #define IORING_NOP_TW			(1U << 4)
+#define IORING_NOP_CQE32		(1U << 5)
 /*
  * IO completion data structure (Completion Queue Entry)
  *			other provided buffer type, all completions with a
  *			buffer passed back is automatically returned to the
  *			application.
+ * IORING_CQE_F_SKIP	If set, then the application/liburing must ignore this
+ *			CQE. It's only purpose is to fill a gap in the ring,
+ *			if a large CQE is attempted posted when the ring has
+ *			just a single small CQE worth of space left before
+ *			wrapping.
+ * IORING_CQE_F_32	If set, this is a 32b/big-cqe posting. Use with rings
+ *			setup in a mixed CQE mode, where both 16b and 32b
+ *			CQEs may be posted to the CQ ring.
  */
 #define IORING_CQE_F_BUFFER		(1U << 0)
 #define IORING_CQE_F_MORE		(1U << 1)
 #define IORING_CQE_F_SOCK_NONEMPTY	(1U << 2)
 #define IORING_CQE_F_NOTIF		(1U << 3)
 #define IORING_CQE_F_BUF_MORE		(1U << 4)
+#define IORING_CQE_F_SKIP		(1U << 5)
+#define IORING_CQE_F_32			(1U << 15)
 #define IORING_CQE_BUFFER_SHIFT		16
 	IORING_REGISTER_MEM_REGION		= 34,
+	/* query various aspects of io_uring, see linux/io_uring/query.h */
+	IORING_REGISTER_QUERY			= 35,
+	/* return zcrx buffers back into circulation */
+	IORING_REGISTER_ZCRX_REFILL		= 36,
 	/* this goes last */
 	IORING_REGISTER_LAST,
 	__u64	__resv[3];
 };
+struct io_uring_zcrx_sync_refill {
+	__u32		zcrx_id;
+	/* the number of entries to return */
+	__u32		nr_entries;
+	/* pointer to an array of struct io_uring_zcrx_rqe */
+	__u64		rqes;
+	__u64		__resv[2];
+};
 #ifdef __cplusplus
 }
 #endif

include/uapi/linux/io_uring/query.h+41−0

@@ -0,0 +1,41 @@
	1	/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR MIT */
	2	/*
	3	* Header file for the io_uring query interface.
	4	*/
	5	#ifndef LINUX_IO_URING_QUERY_H
	6	#define LINUX_IO_URING_QUERY_H
	7
	8	#include <linux/types.h>
	9
	10	struct io_uring_query_hdr {
	11	__u64 next_entry;
	12	__u64 query_data;
	13	__u32 query_op;
	14	__u32 size;
	15	__s32 result;
	16	__u32 __resv[3];
	17	};
	18
	19	enum {
	20	IO_URING_QUERY_OPCODES = 0,
	21
	22	__IO_URING_QUERY_MAX,
	23	};
	24
	25	/* Doesn't require a ring */
	26	struct io_uring_query_opcode {
	27	/* The number of supported IORING_OP_* opcodes */
	28	__u32 nr_request_opcodes;
	29	/* The number of supported IORING_[UN]REGISTER_* opcodes */
	30	__u32 nr_register_opcodes;
	31	/* Bitmask of all supported IORING_FEAT_* flags */
	32	__u64 feature_flags;
	33	/* Bitmask of all supported IORING_SETUP_* flags */
	34	__u64 ring_setup_flags;
	35	/* Bitmask of all supported IORING_ENTER_** flags */
	36	__u64 enter_flags;
	37	/* Bitmask of all supported IOSQE_* flags */
	38	__u64 sqe_flags;
	39	};
	40
	41	#endif

include/uapi/linux/ivtv.h+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	/*	2	/*
3	Public ivtv API header	3	Public ivtv API header
4	Copyright (C) 2003-2004 Kevin Thayer <nufan_wfk at yahoo.com>	4	Copyright (C) 2003-2004 Kevin Thayer <nufan_wfk at yahoo.com>
5	Copyright (C) 2004-2007 Hans Verkuil <hverkuil@xs4all.nl>	5	Copyright (C) 2004-2007 Hans Verkuil <hverkuil@kernel.org>
6		6
7	This program is free software; you can redistribute it and/or modify	7	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by

include/uapi/linux/kexec.h+4−0

  * KEXEC_FILE_ON_CRASH : Load/unload operation belongs to kdump image.
  * KEXEC_FILE_NO_INITRAMFS : No initramfs is being loaded. Ignore the initrd
  *                           fd field.
+ * KEXEC_FILE_FORCE_DTB : Force carrying over the current boot's DTB to the new
+ *                        kernel on x86. This is already the default behavior on
+ *                        some other architectures, like ARM64 and PowerPC.
  */
 #define KEXEC_FILE_UNLOAD	0x00000001
 #define KEXEC_FILE_ON_CRASH	0x00000002
 #define KEXEC_FILE_NO_INITRAMFS	0x00000004
 #define KEXEC_FILE_DEBUG	0x00000008
 #define KEXEC_FILE_NO_CMA	0x00000010
+#define KEXEC_FILE_FORCE_DTB	0x00000020
 /* These values match the ELF architecture values.
  * Unless there is a good reason that should continue to be the case.

include/uapi/linux/kfd_ioctl.h+2−2

@@ -67,8 +67,8 @@ struct kfd_ioctl_get_version_args { · 66 unmodified lines
67		67
68	struct kfd_ioctl_create_queue_args {	68	struct kfd_ioctl_create_queue_args {
69	__u64 ring_base_address; /* to KFD */	69	__u64 ring_base_address; /* to KFD */
70	__u64 write_pointer_address; /* from KFD */	70	__u64 write_pointer_address; /* to KFD */
71	__u64 read_pointer_address; /* from KFD */	71	__u64 read_pointer_address; /* to KFD */
72	__u64 doorbell_offset; /* from KFD */	72	__u64 doorbell_offset; /* from KFD */
73		73
74	__u32 ring_size; /* to KFD */	74	__u32 ring_size; /* to KFD */

include/uapi/linux/kvm.h+2−0

 #define KVM_CAP_ARM_EL2_E2H0 241
 #define KVM_CAP_RISCV_MP_STATE_RESET 242
 #define KVM_CAP_ARM_CACHEABLE_PFNMAP_SUPPORTED 243
+#define KVM_CAP_GUEST_MEMFD_MMAP 244
 struct kvm_irq_routing_irqchip {
 	__u32 irqchip;
 #define KVM_MEMORY_ATTRIBUTE_PRIVATE           (1ULL << 3)
 #define KVM_CREATE_GUEST_MEMFD	_IOWR(KVMIO,  0xd4, struct kvm_create_guest_memfd)
+#define GUEST_MEMFD_FLAG_MMAP	(1ULL << 0)
 struct kvm_create_guest_memfd {
 	__u64 size;

include/uapi/linux/mempolicy.h+9−3

 #define MPOL_F_MORON	(1 << 4) /* Migrate On protnone Reference On Node */
 /*
- * These bit locations are exposed in the vm.zone_reclaim_mode sysctl
+ * Enabling zone reclaim means the page allocator will attempt to fulfill
- * ABI.  New bits are OK, but existing bits can never change.
+ * the allocation request on the current node by triggering reclaim and
+ * trying to shrink the current node.
+ * Fallback allocations on the next candidates in the zonelist are considered
+ * when reclaim fails to free up enough memory in the current node/zone.
+ *
+ * These bit locations are exposed in the vm.zone_reclaim_mode sysctl.
+ * New bits are OK, but existing bits should not be changed.
  */
-#define RECLAIM_ZONE	(1<<0)	/* Run shrink_inactive_list on the zone */
+#define RECLAIM_ZONE	(1<<0)	/* Enable zone reclaim */
 #define RECLAIM_WRITE	(1<<1)	/* Writeout pages during reclaim */
 #define RECLAIM_UNMAP	(1<<2)	/* Unmap pages during reclaim */

include/uapi/linux/mptcp.h+18−6

@@ -31,19 +31,28 @@ · 30 unmodified lines
31	#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)	31	#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0)
32	#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1)	32	#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1)
33		33
34	#define MPTCP_PM_ADDR_FLAG_SIGNAL (1 << 0)	34	#define MPTCP_PM_EV_FLAG_DENY_JOIN_ID0 _BITUL(0)
35	#define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1)	35	#define MPTCP_PM_EV_FLAG_SERVER_SIDE _BITUL(1)
36	#define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2)	36
37	#define MPTCP_PM_ADDR_FLAG_FULLMESH (1 << 3)	37	#define MPTCP_PM_ADDR_FLAG_SIGNAL _BITUL(0)
38	#define MPTCP_PM_ADDR_FLAG_IMPLICIT (1 << 4)	38	#define MPTCP_PM_ADDR_FLAG_SUBFLOW _BITUL(1)
		39	#define MPTCP_PM_ADDR_FLAG_BACKUP _BITUL(2)
		40	#define MPTCP_PM_ADDR_FLAG_FULLMESH _BITUL(3)
		41	#define MPTCP_PM_ADDR_FLAG_IMPLICIT _BITUL(4)
		42	#define MPTCP_PM_ADDR_FLAG_LAMINAR _BITUL(5)
39		43
40	struct mptcp_info {	44	struct mptcp_info {
41	__u8 mptcpi_subflows;	45	__u8 mptcpi_subflows;
		46	#define mptcpi_extra_subflows mptcpi_subflows
42	__u8 mptcpi_add_addr_signal;	47	__u8 mptcpi_add_addr_signal;
43	__u8 mptcpi_add_addr_accepted;	48	__u8 mptcpi_add_addr_accepted;
44	__u8 mptcpi_subflows_max;	49	__u8 mptcpi_subflows_max;
		50	#define mptcpi_limit_extra_subflows mptcpi_subflows_max
45	__u8 mptcpi_add_addr_signal_max;	51	__u8 mptcpi_add_addr_signal_max;
		52	#define mptcpi_endp_signal_max mptcpi_add_addr_signal_max
46	__u8 mptcpi_add_addr_accepted_max;	53	__u8 mptcpi_add_addr_accepted_max;
		54	#define mptcpi_limit_add_addr_accepted mptcpi_add_addr_accepted_max
		55	/* 16-bit hole that can no longer be filled */
47	__u32 mptcpi_flags;	56	__u32 mptcpi_flags;
48	__u32 mptcpi_token;	57	__u32 mptcpi_token;
49	__u64 mptcpi_write_seq;	58	__u64 mptcpi_write_seq;
@@ -51,14 +60,17 @@ struct mptcp_info { · 1 unmodified line
51	__u64 mptcpi_rcv_nxt;	60	__u64 mptcpi_rcv_nxt;
52	__u8 mptcpi_local_addr_used;	61	__u8 mptcpi_local_addr_used;
53	__u8 mptcpi_local_addr_max;	62	__u8 mptcpi_local_addr_max;
		63	#define mptcpi_endp_subflow_max mptcpi_local_addr_max
54	__u8 mptcpi_csum_enabled;	64	__u8 mptcpi_csum_enabled;
		65	/* 8-bit hole that can no longer be filled */
55	__u32 mptcpi_retransmits;	66	__u32 mptcpi_retransmits;
56	__u64 mptcpi_bytes_retrans;	67	__u64 mptcpi_bytes_retrans;
57	__u64 mptcpi_bytes_sent;	68	__u64 mptcpi_bytes_sent;
58	__u64 mptcpi_bytes_received;	69	__u64 mptcpi_bytes_received;
59	__u64 mptcpi_bytes_acked;	70	__u64 mptcpi_bytes_acked;
60	__u8 mptcpi_subflows_total;	71	__u8 mptcpi_subflows_total;
61	__u8 reserved[3];	72	__u8 mptcpi_endp_laminar_max;
		73	__u8 reserved[2];
62	__u32 mptcpi_last_data_sent;	74	__u32 mptcpi_last_data_sent;
63	__u32 mptcpi_last_data_recv;	75	__u32 mptcpi_last_data_recv;
64	__u32 mptcpi_last_ack_recv;	76	__u32 mptcpi_last_ack_recv;

include/uapi/linux/mptcp_pm.h+2−2

@@ -16,10 +16,10 @@ · 15 unmodified lines
16	* good time to allocate memory and send ADD_ADDR if needed. Depending on the	16	* good time to allocate memory and send ADD_ADDR if needed. Depending on the
17	* traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED	17	* traffic-patterns it can take a long time until the MPTCP_EVENT_ESTABLISHED
18	* is sent. Attributes: token, family, saddr4 \| saddr6, daddr4 \| daddr6,	18	* is sent. Attributes: token, family, saddr4 \| saddr6, daddr4 \| daddr6,
19	* sport, dport, server-side.	19	* sport, dport, [server-side], [flags].
20	* @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new	20	* @MPTCP_EVENT_ESTABLISHED: A MPTCP connection is established (can start new
21	* subflows). Attributes: token, family, saddr4 \| saddr6, daddr4 \| daddr6,	21	* subflows). Attributes: token, family, saddr4 \| saddr6, daddr4 \| daddr6,
22	* sport, dport, server-side.	22	* sport, dport, [server-side], [flags].
23	* @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.	23	* @MPTCP_EVENT_CLOSED: A MPTCP connection has stopped. Attribute: token.
24	* @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.	24	* @MPTCP_EVENT_ANNOUNCED: A new address has been announced by the peer.
25	* Attributes: token, rem_id, family, daddr4 \| daddr6 [, dport].	25	* Attributes: token, rem_id, family, daddr4 \| daddr6 [, dport].

include/uapi/linux/netfilter/nf_tables.h+2−0

  * @NFT_META_SDIF: slave device interface index
  * @NFT_META_SDIFNAME: slave device interface name
  * @NFT_META_BRI_BROUTE: packet br_netfilter_broute bit
+ * @NFT_META_BRI_IIFHWADDR: packet input bridge interface ethernet address
  */
 enum nft_meta_keys {
 	NFT_META_LEN,
 	NFT_META_SDIFNAME,
 	NFT_META_BRI_BROUTE,
 	__NFT_META_IIFTYPE,
+	NFT_META_BRI_IIFHWADDR,
 };
 /**

include/uapi/linux/nl80211.h+250−5

@@ -1085,8 +1085,9 @@ · 1084 unmodified lines
1085	* %NL80211_ATTR_NAN_MASTER_PREF attribute and optional	1085	* %NL80211_ATTR_NAN_MASTER_PREF attribute and optional
1086	* %NL80211_ATTR_BANDS attributes. If %NL80211_ATTR_BANDS is	1086	* %NL80211_ATTR_BANDS attributes. If %NL80211_ATTR_BANDS is
1087	* omitted or set to 0, it means don't-care and the device will	1087	* omitted or set to 0, it means don't-care and the device will
1088	* decide what to use. After this command NAN functions can be	1088	* decide what to use. Additional cluster configuration may be
1089	* added.	1089	* optionally provided with %NL80211_ATTR_NAN_CONFIG.
		1090	* After this command NAN functions can be added.
1090	* @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by	1091	* @NL80211_CMD_STOP_NAN: Stop the NAN operation, identified by
1091	* its %NL80211_ATTR_WDEV interface.	1092	* its %NL80211_ATTR_WDEV interface.
1092	* @NL80211_CMD_ADD_NAN_FUNCTION: Add a NAN function. The function is defined	1093	* @NL80211_CMD_ADD_NAN_FUNCTION: Add a NAN function. The function is defined
@@ -1115,6 +1116,10 @@ · 22 unmodified lines
1115	* current configuration is not changed. If it is present but	1116	* current configuration is not changed. If it is present but
1116	* set to zero, the configuration is changed to don't-care	1117	* set to zero, the configuration is changed to don't-care
1117	* (i.e. the device can decide what to do).	1118	* (i.e. the device can decide what to do).
		1119	* Additional parameters may be provided with
		1120	* %NL80211_ATTR_NAN_CONFIG. User space should provide all previously
		1121	* configured nested attributes under %NL80211_ATTR_NAN_CONFIG, even if
		1122	* only a subset was changed.
1118	* @NL80211_CMD_NAN_MATCH: Notification sent when a match is reported.	1123	* @NL80211_CMD_NAN_MATCH: Notification sent when a match is reported.
1119	* This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and	1124	* This will contain a %NL80211_ATTR_NAN_MATCH nested attribute and
1120	* %NL80211_ATTR_COOKIE.	1125	* %NL80211_ATTR_COOKIE.
@@ -1344,6 +1349,18 @@ · 223 unmodified lines
1344	* control EPCS configuration. Used to notify userland on the current state	1349	* control EPCS configuration. Used to notify userland on the current state
1345	* of EPCS.	1350	* of EPCS.
1346	*	1351	*
		1352	* @NL80211_CMD_NAN_NEXT_DW_NOTIFICATION: This command is used to notify
		1353	* user space about the next NAN Discovery Window (DW). User space may use
		1354	* it to prepare frames to be sent in the next DW.
		1355	* %NL80211_ATTR_WIPHY_FREQ is used to indicate the frequency of the next
		1356	* DW. SDF transmission should be requested with %NL80211_CMD_FRAME and
		1357	* the device/driver shall take care of the actual transmission timing.
		1358	* This notification is only sent to the NAN interface owning socket
		1359	* (see %NL80211_ATTR_SOCKET_OWNER flag).
		1360	* @NL80211_CMD_NAN_CLUSTER_JOINED: This command is used to notify
		1361	* user space that the NAN new cluster has been joined. The cluster ID is
		1362	* indicated by %NL80211_ATTR_MAC.
		1363	*
1347	* @NL80211_CMD_MAX: highest used command number	1364	* @NL80211_CMD_MAX: highest used command number
1348	* @__NL80211_CMD_AFTER_LAST: internal use	1365	* @__NL80211_CMD_AFTER_LAST: internal use
1349	*/	1366	*/
@@ -1604,6 +1621,9 @@ enum nl80211_commands { · 254 unmodified lines
1604	NL80211_CMD_ASSOC_MLO_RECONF,	1621	NL80211_CMD_ASSOC_MLO_RECONF,
1605	NL80211_CMD_EPCS_CFG,	1622	NL80211_CMD_EPCS_CFG,
1606		1623
		1624	NL80211_CMD_NAN_NEXT_DW_NOTIFICATION,
		1625	NL80211_CMD_NAN_CLUSTER_JOINED,
		1626
1607	/* add new commands above here */	1627	/* add new commands above here */
1608		1628
1609	/* used to define NL80211_CMD_MAX below */	1629	/* used to define NL80211_CMD_MAX below */
@@ -1943,8 +1963,9 @@ enum nl80211_commands { · 333 unmodified lines
1943	* The driver must also specify support for this with the extended	1963	* The driver must also specify support for this with the extended
1944	* features NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,	1964	* features NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
1945	* NL80211_EXT_FEATURE_BEACON_RATE_HT,	1965	* NL80211_EXT_FEATURE_BEACON_RATE_HT,
1946	* NL80211_EXT_FEATURE_BEACON_RATE_VHT and	1966	* NL80211_EXT_FEATURE_BEACON_RATE_VHT,
1947	* NL80211_EXT_FEATURE_BEACON_RATE_HE.	1967	* NL80211_EXT_FEATURE_BEACON_RATE_HE and
		1968	* NL80211_EXT_FEATURE_BEACON_RATE_EHT.
1948	*	1969	*
1949	* @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain	1970	* @NL80211_ATTR_FRAME_MATCH: A binary attribute which typically must contain
1950	* at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.	1971	* at least one byte, currently used with @NL80211_CMD_REGISTER_FRAME.
@@ -2283,7 +2304,8 @@ enum nl80211_commands { · 332 unmodified lines
2283	* @NL80211_ATTR_PEER_AID: Association ID for the peer TDLS station (u16).	2304	* @NL80211_ATTR_PEER_AID: Association ID for the peer TDLS station (u16).
2284	* This is similar to @NL80211_ATTR_STA_AID but with a difference of being	2305	* This is similar to @NL80211_ATTR_STA_AID but with a difference of being
2285	* allowed to be used with the first @NL80211_CMD_SET_STATION command to	2306	* allowed to be used with the first @NL80211_CMD_SET_STATION command to
2286	* update a TDLS peer STA entry.	2307	* update a TDLS peer STA entry. For S1G interfaces, this is limited to
		2308	* 1600 for the current mac80211 implementation.
2287	*	2309	*
2288	* @NL80211_ATTR_COALESCE_RULE: Coalesce rule information.	2310	* @NL80211_ATTR_COALESCE_RULE: Coalesce rule information.
2289	*	2311	*
@@ -2928,6 +2950,29 @@ enum nl80211_commands { · 638 unmodified lines
2928	* required alongside this attribute. Refer to	2950	* required alongside this attribute. Refer to
2929	* @enum nl80211_s1g_short_beacon_attrs for the attribute definitions.	2951	* @enum nl80211_s1g_short_beacon_attrs for the attribute definitions.
2930	*	2952	*
		2953	* @NL80211_ATTR_BSS_PARAM: nested attribute used with %NL80211_CMD_GET_WIPHY
		2954	* which indicates which BSS parameters can be modified. The attribute can
		2955	* also be used as flag attribute by user-space in %NL80211_CMD_SET_BSS to
		2956	* indicate that it wants strict checking on the BSS parameters to be
		2957	* modified.
		2958	*
		2959	* @NL80211_ATTR_NAN_CONFIG: Nested attribute for
		2960	* extended NAN cluster configuration. This is used with
		2961	* %NL80211_CMD_START_NAN and %NL80211_CMD_CHANGE_NAN_CONFIG.
		2962	* See &enum nl80211_nan_conf_attributes for details.
		2963	* This attribute is optional.
		2964	* @NL80211_ATTR_NAN_NEW_CLUSTER: Flag attribute indicating that a new
		2965	* NAN cluster has been created. This is used with
		2966	* %NL80211_CMD_NAN_CLUSTER_JOINED
		2967	* @NL80211_ATTR_NAN_CAPABILITIES: Nested attribute for NAN capabilities.
		2968	* This is used with %NL80211_CMD_GET_WIPHY to indicate the NAN
		2969	* capabilities supported by the driver. See &enum nl80211_nan_capabilities
		2970	* for details.
		2971	*
		2972	* @NL80211_ATTR_S1G_PRIMARY_2MHZ: flag attribute indicating that the S1G
		2973	* primary channel is 2 MHz wide, and the control channel designates
		2974	* the 1 MHz primary subchannel within that 2 MHz primary.
		2975	*
2931	* @NUM_NL80211_ATTR: total number of nl80211_attrs available	2976	* @NUM_NL80211_ATTR: total number of nl80211_attrs available
2932	* @NL80211_ATTR_MAX: highest attribute number currently defined	2977	* @NL80211_ATTR_MAX: highest attribute number currently defined
2933	* @__NL80211_ATTR_AFTER_LAST: internal use	2978	* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3489,6 +3534,12 @@ enum nl80211_attrs { · 555 unmodified lines
3489		3534
3490	NL80211_ATTR_S1G_LONG_BEACON_PERIOD,	3535	NL80211_ATTR_S1G_LONG_BEACON_PERIOD,
3491	NL80211_ATTR_S1G_SHORT_BEACON,	3536	NL80211_ATTR_S1G_SHORT_BEACON,
		3537	NL80211_ATTR_BSS_PARAM,
		3538	NL80211_ATTR_NAN_CONFIG,
		3539	NL80211_ATTR_NAN_NEW_CLUSTER,
		3540	NL80211_ATTR_NAN_CAPABILITIES,
		3541
		3542	NL80211_ATTR_S1G_PRIMARY_2MHZ,
3492		3543
3493	/* add attributes here, update the policy in nl80211.c */	3544	/* add attributes here, update the policy in nl80211.c */
3494		3545
@@ -3735,6 +3786,22 @@ enum nl80211_eht_gi { · 240 unmodified lines
3735	NL80211_RATE_INFO_EHT_GI_3_2,	3786	NL80211_RATE_INFO_EHT_GI_3_2,
3736	};	3787	};
3737		3788
		3789	/**
		3790	* enum nl80211_eht_ltf - EHT long training field
		3791	* @NL80211_RATE_INFO_EHT_1XLTF: 3.2 usec
		3792	* @NL80211_RATE_INFO_EHT_2XLTF: 6.4 usec
		3793	* @NL80211_RATE_INFO_EHT_4XLTF: 12.8 usec
		3794	* @NL80211_RATE_INFO_EHT_6XLTF: 19.2 usec
		3795	* @NL80211_RATE_INFO_EHT_8XLTF: 25.6 usec
		3796	*/
		3797	enum nl80211_eht_ltf {
		3798	NL80211_RATE_INFO_EHT_1XLTF,
		3799	NL80211_RATE_INFO_EHT_2XLTF,
		3800	NL80211_RATE_INFO_EHT_4XLTF,
		3801	NL80211_RATE_INFO_EHT_6XLTF,
		3802	NL80211_RATE_INFO_EHT_8XLTF,
		3803	};
		3804
3738	/**	3805	/**
3739	* enum nl80211_eht_ru_alloc - EHT RU allocation values	3806	* enum nl80211_eht_ru_alloc - EHT RU allocation values
3740	* @NL80211_RATE_INFO_EHT_RU_ALLOC_26: 26-tone RU allocation	3807	* @NL80211_RATE_INFO_EHT_RU_ALLOC_26: 26-tone RU allocation
@@ -4371,6 +4438,12 @@ enum nl80211_wmm_rule { · 630 unmodified lines
4371	* very low power (VLP) AP, despite being NO_IR.	4438	* very low power (VLP) AP, despite being NO_IR.
4372	* @NL80211_FREQUENCY_ATTR_ALLOW_20MHZ_ACTIVITY: This channel can be active in	4439	* @NL80211_FREQUENCY_ATTR_ALLOW_20MHZ_ACTIVITY: This channel can be active in
4373	* 20 MHz bandwidth, despite being NO_IR.	4440	* 20 MHz bandwidth, despite being NO_IR.
		4441	* @NL80211_FREQUENCY_ATTR_NO_4MHZ: 4 MHz operation is not allowed on this
		4442	* channel in current regulatory domain.
		4443	* @NL80211_FREQUENCY_ATTR_NO_8MHZ: 8 MHz operation is not allowed on this
		4444	* channel in current regulatory domain.
		4445	* @NL80211_FREQUENCY_ATTR_NO_16MHZ: 16 MHz operation is not allowed on this
		4446	* channel in current regulatory domain.
4374	* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number	4447	* @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number
4375	* currently defined	4448	* currently defined
4376	* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use	4449	* @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use
@@ -4416,6 +4489,9 @@ enum nl80211_frequency_attr { · 39 unmodified lines
4416	NL80211_FREQUENCY_ATTR_CAN_MONITOR,	4489	NL80211_FREQUENCY_ATTR_CAN_MONITOR,
4417	NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP,	4490	NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP,
4418	NL80211_FREQUENCY_ATTR_ALLOW_20MHZ_ACTIVITY,	4491	NL80211_FREQUENCY_ATTR_ALLOW_20MHZ_ACTIVITY,
		4492	NL80211_FREQUENCY_ATTR_NO_4MHZ,
		4493	NL80211_FREQUENCY_ATTR_NO_8MHZ,
		4494	NL80211_FREQUENCY_ATTR_NO_16MHZ,
4419		4495
4420	/* keep last */	4496	/* keep last */
4421	__NL80211_FREQUENCY_ATTR_AFTER_LAST,	4497	__NL80211_FREQUENCY_ATTR_AFTER_LAST,
@@ -5481,6 +5557,10 @@ enum nl80211_key_attributes { · 1059 unmodified lines
5481	* see &struct nl80211_txrate_he	5557	* see &struct nl80211_txrate_he
5482	* @NL80211_TXRATE_HE_GI: configure HE GI, 0.8us, 1.6us and 3.2us.	5558	* @NL80211_TXRATE_HE_GI: configure HE GI, 0.8us, 1.6us and 3.2us.
5483	* @NL80211_TXRATE_HE_LTF: configure HE LTF, 1XLTF, 2XLTF and 4XLTF.	5559	* @NL80211_TXRATE_HE_LTF: configure HE LTF, 1XLTF, 2XLTF and 4XLTF.
		5560	* @NL80211_TXRATE_EHT: EHT rates allowed for TX rate selection,
		5561	* see &struct nl80211_txrate_eht
		5562	* @NL80211_TXRATE_EHT_GI: configure EHT GI, (u8, see &enum nl80211_eht_gi)
		5563	* @NL80211_TXRATE_EHT_LTF: configure EHT LTF, (u8, see &enum nl80211_eht_ltf)
5484	* @__NL80211_TXRATE_AFTER_LAST: internal	5564	* @__NL80211_TXRATE_AFTER_LAST: internal
5485	* @NL80211_TXRATE_MAX: highest TX rate attribute	5565	* @NL80211_TXRATE_MAX: highest TX rate attribute
5486	*/	5566	*/
@@ -5493,6 +5573,9 @@ enum nl80211_tx_rate_attributes { · 6 unmodified lines
5493	NL80211_TXRATE_HE,	5573	NL80211_TXRATE_HE,
5494	NL80211_TXRATE_HE_GI,	5574	NL80211_TXRATE_HE_GI,
5495	NL80211_TXRATE_HE_LTF,	5575	NL80211_TXRATE_HE_LTF,
		5576	NL80211_TXRATE_EHT,
		5577	NL80211_TXRATE_EHT_GI,
		5578	NL80211_TXRATE_EHT_LTF,
5496		5579
5497	/* keep last */	5580	/* keep last */
5498	__NL80211_TXRATE_AFTER_LAST,	5581	__NL80211_TXRATE_AFTER_LAST,
@@ -5525,6 +5608,15 @@ enum nl80211_txrate_gi { · 26 unmodified lines
5525	NL80211_TXRATE_FORCE_LGI,	5608	NL80211_TXRATE_FORCE_LGI,
5526	};	5609	};
5527		5610
		5611	#define NL80211_EHT_NSS_MAX 16
		5612	/**
		5613	* struct nl80211_txrate_eht - EHT MCS/NSS txrate bitmap
		5614	* @mcs: MCS bitmap table for each NSS (array index 0 for 1 stream, etc.)
		5615	*/
		5616	struct nl80211_txrate_eht {
		5617	__u16 mcs[NL80211_EHT_NSS_MAX];
		5618	};
		5619
5528	/**	5620	/**
5529	* enum nl80211_band - Frequency band	5621	* enum nl80211_band - Frequency band
5530	* @NL80211_BAND_2GHZ: 2.4 GHz ISM band	5622	* @NL80211_BAND_2GHZ: 2.4 GHz ISM band
@@ -6649,6 +6741,9 @@ enum nl80211_feature_flags { · 1118 unmodified lines
6649	* (signaling and payload protected) A-MSDUs and this shall be advertised	6741	* (signaling and payload protected) A-MSDUs and this shall be advertised
6650	* in the RSNXE.	6742	* in the RSNXE.
6651	*	6743	*
		6744	* @NL80211_EXT_FEATURE_BEACON_RATE_EHT: Driver supports beacon rate
		6745	* configuration (AP/mesh) with EHT rates.
		6746	*
6652	* @NUM_NL80211_EXT_FEATURES: number of extended features.	6747	* @NUM_NL80211_EXT_FEATURES: number of extended features.
6653	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.	6748	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
6654	*/	6749	*/
@@ -6724,6 +6819,7 @@ enum nl80211_ext_feature_index { · 69 unmodified lines
6724	NL80211_EXT_FEATURE_OWE_OFFLOAD_AP,	6819	NL80211_EXT_FEATURE_OWE_OFFLOAD_AP,
6725	NL80211_EXT_FEATURE_DFS_CONCURRENT,	6820	NL80211_EXT_FEATURE_DFS_CONCURRENT,
6726	NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT,	6821	NL80211_EXT_FEATURE_SPP_AMSDU_SUPPORT,
		6822	NL80211_EXT_FEATURE_BEACON_RATE_EHT,
6727		6823
6728	/* add new features before the definition below */	6824	/* add new features before the definition below */
6729	NUM_NL80211_EXT_FEATURES,	6825	NUM_NL80211_EXT_FEATURES,
@@ -7278,6 +7374,105 @@ enum nl80211_nan_match_attributes { · 548 unmodified lines
7278	NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1	7374	NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1
7279	};	7375	};
7280		7376
		7377	/**
		7378	* enum nl80211_nan_band_conf_attributes - NAN band configuration attributes
		7379	* @__NL80211_NAN_BAND_CONF_INVALID: Invalid.
		7380	* @NL80211_NAN_BAND_CONF_BAND: Band for which the configuration is
		7381	* being set. The value is according to &enum nl80211_band (u8).
		7382	* @NL80211_NAN_BAND_CONF_FREQ: Discovery frequency. This attribute shall not
		7383	* be present on 2.4 GHZ band. On 5 GHz band its presence is optional.
		7384	* The allowed values are 5220 (channel 44) or 5745 (channel 149).
		7385	* If not present, channel 149 is used if allowed, otherwise channel 44
		7386	* will be selected. The value is in MHz (u16).
		7387	* @NL80211_NAN_BAND_CONF_RSSI_CLOSE: RSSI close threshold used for NAN state
		7388	* transition algorithm as described in chapters 3.3.6 and 3.3.7 "NAN
		7389	* Device Role and State Transition" of Wi-Fi Aware (TM) Specification
		7390	* v4.0. If not specified, default device value is used. The value should
		7391	* be greater than -60 dBm (s8).
		7392	* @NL80211_NAN_BAND_CONF_RSSI_MIDDLE: RSSI middle threshold used for NAN state
		7393	* transition algorithm as described in chapters 3.3.6 and 3.3.7 "NAN
		7394	* Device Role and State Transition" of Wi-Fi Aware (TM) Specification
		7395	* v4.0. If not present, default device value is used. The value should be
		7396	* greater than -75 dBm and less than %NL80211_NAN_BAND_CONF_RSSI_CLOSE
		7397	* (s8).
		7398	* @NL80211_NAN_BAND_CONF_WAKE_DW: Committed DW information (values 0-5).
		7399	* Value 0 means that the device will not wake up during the
		7400	* discovery window. Values 1-5 mean that the device will wake up
		7401	* during each 2^(n - 1) discovery window, where n is the value of
		7402	* this attribute. Setting this attribute to 0 is not allowed on
		7403	* 2.4 GHz band (u8). This is an optional parameter (default is 1).
		7404	* @NL80211_NAN_BAND_CONF_DISABLE_SCAN: Optional flag attribute to disable
		7405	* scanning (for cluster merge) on the band. If set, the device will not
		7406	* scan on this band anymore. Disabling scanning on 2.4 GHz band is not
		7407	* allowed.
		7408	* @NUM_NL80211_NAN_BAND_CONF_ATTR: Internal.
		7409	* @NL80211_NAN_BAND_CONF_ATTR_MAX: Highest NAN band configuration attribute.
		7410	*
		7411	* These attributes are used to configure NAN band-specific parameters. Note,
		7412	* that both RSSI attributes should be configured (or both left unset).
		7413	*/
		7414	enum nl80211_nan_band_conf_attributes {
		7415	__NL80211_NAN_BAND_CONF_INVALID,
		7416	NL80211_NAN_BAND_CONF_BAND,
		7417	NL80211_NAN_BAND_CONF_FREQ,
		7418	NL80211_NAN_BAND_CONF_RSSI_CLOSE,
		7419	NL80211_NAN_BAND_CONF_RSSI_MIDDLE,
		7420	NL80211_NAN_BAND_CONF_WAKE_DW,
		7421	NL80211_NAN_BAND_CONF_DISABLE_SCAN,
		7422
		7423	/* keep last */
		7424	NUM_NL80211_NAN_BAND_CONF_ATTR,
		7425	NL80211_NAN_BAND_CONF_ATTR_MAX = NUM_NL80211_NAN_BAND_CONF_ATTR - 1,
		7426	};
		7427
		7428	/**
		7429	* enum nl80211_nan_conf_attributes - NAN configuration attributes
		7430	* @__NL80211_NAN_CONF_INVALID: Invalid attribute, used for validation.
		7431	* @NL80211_NAN_CONF_CLUSTER_ID: ID for the NAN cluster. This is a MAC
		7432	* address that can take values from 50-6F-9A-01-00-00 to
		7433	* 50-6F-9A-01-FF-FF. This attribute is optional. If not present,
		7434	* a random Cluster ID will be chosen.
		7435	* @NL80211_NAN_CONF_EXTRA_ATTRS: Additional NAN attributes to be
		7436	* published in the beacons. This is an optional byte array.
		7437	* @NL80211_NAN_CONF_VENDOR_ELEMS: Vendor-specific elements that will
		7438	* be published in the beacons. This is an optional byte array.
		7439	* @NL80211_NAN_CONF_BAND_CONFIGS: This is a nested array attribute,
		7440	* containing multiple entries for each supported band. Each band
		7441	* configuration consists of &enum nl80211_nan_band_conf_attributes.
		7442	* @NL80211_NAN_CONF_SCAN_PERIOD: Scan period in seconds. If not configured,
		7443	* device default is used. Zero value will disable scanning.
		7444	* This is u16 (optional).
		7445	* @NL80211_NAN_CONF_SCAN_DWELL_TIME: Scan dwell time in TUs per channel.
		7446	* Only non-zero values are valid. If not configured the device default
		7447	* value is used. This is u16 (optional)
		7448	* @NL80211_NAN_CONF_DISCOVERY_BEACON_INTERVAL: Discovery beacon interval
		7449	* in TUs. Valid range is 50-200 TUs. If not configured the device default
		7450	* value is used. This is u8 (optional)
		7451	* @NL80211_NAN_CONF_NOTIFY_DW: If set, the driver will notify userspace about
		7452	* the upcoming discovery window with
		7453	* %NL80211_CMD_NAN_NEXT_DW_NOTIFICATION.
		7454	* This is a flag attribute.
		7455	* @NUM_NL80211_NAN_CONF_ATTR: Internal.
		7456	* @NL80211_NAN_CONF_ATTR_MAX: Highest NAN configuration attribute.
		7457	*
		7458	* These attributes are used to configure NAN-specific parameters.
		7459	*/
		7460	enum nl80211_nan_conf_attributes {
		7461	__NL80211_NAN_CONF_INVALID,
		7462	NL80211_NAN_CONF_CLUSTER_ID,
		7463	NL80211_NAN_CONF_EXTRA_ATTRS,
		7464	NL80211_NAN_CONF_VENDOR_ELEMS,
		7465	NL80211_NAN_CONF_BAND_CONFIGS,
		7466	NL80211_NAN_CONF_SCAN_PERIOD,
		7467	NL80211_NAN_CONF_SCAN_DWELL_TIME,
		7468	NL80211_NAN_CONF_DISCOVERY_BEACON_INTERVAL,
		7469	NL80211_NAN_CONF_NOTIFY_DW,
		7470
		7471	/* keep last */
		7472	NUM_NL80211_NAN_CONF_ATTR,
		7473	NL80211_NAN_CONF_ATTR_MAX = NUM_NL80211_NAN_CONF_ATTR - 1,
		7474	};
		7475
7281	/**	7476	/**
7282	* enum nl80211_external_auth_action - Action to perform with external	7477	* enum nl80211_external_auth_action - Action to perform with external
7283	* authentication request. Used by NL80211_ATTR_EXTERNAL_AUTH_ACTION.	7478	* authentication request. Used by NL80211_ATTR_EXTERNAL_AUTH_ACTION.
@@ -8187,4 +8382,54 @@ enum nl80211_s1g_short_beacon_attrs { · 903 unmodified lines
8187	__NL80211_S1G_SHORT_BEACON_ATTR_LAST - 1	8382	__NL80211_S1G_SHORT_BEACON_ATTR_LAST - 1
8188	};	8383	};
8189		8384
		8385	/**
		8386	* enum nl80211_nan_capabilities - NAN (Neighbor Aware Networking)
		8387	* capabilities.
		8388	*
		8389	* @__NL80211_NAN_CAPABILITIES_INVALID: Invalid.
		8390	* @NL80211_NAN_CAPA_CONFIGURABLE_SYNC: Flag attribute indicating that
		8391	* the device supports configurable synchronization. If set, the device
		8392	* should be able to handle %NL80211_ATTR_NAN_CONFIG
		8393	* attribute in the %NL80211_CMD_START_NAN (and change) command.
		8394	* @NL80211_NAN_CAPA_USERSPACE_DE: Flag attribute indicating that
		8395	* NAN Discovery Engine (DE) is not offloaded and the driver assumes
		8396	* user space DE implementation. When set, %NL80211_CMD_ADD_NAN_FUNCTION,
		8397	* %NL80211_CMD_DEL_NAN_FUNCTION and %NL80211_CMD_NAN_MATCH commands
		8398	* should not be used. In addition, the device/driver should support
		8399	* sending discovery window (DW) notifications using
		8400	* %NL80211_CMD_NAN_NEXT_DW_NOTIFICATION and handling transmission and
		8401	* reception of NAN SDF frames on NAN device interface during DW windows.
		8402	* (%NL80211_CMD_FRAME is used to transmit SDFs)
		8403	* @NL80211_NAN_CAPA_OP_MODE: u8 attribute indicating the supported operation
		8404	* modes as defined in Wi-Fi Aware (TM) specification Table 81 (Operation
		8405	* Mode field format).
		8406	* @NL80211_NAN_CAPA_NUM_ANTENNAS: u8 attribute indicating the number of
		8407	* TX and RX antennas supported by the device. Lower nibble indicates
		8408	* the number of TX antennas and upper nibble indicates the number of RX
		8409	* antennas. Value 0 indicates the information is not available.
		8410	* See table 79 of Wi-Fi Aware (TM) specification (Number of
		8411	* Antennas field).
		8412	* @NL80211_NAN_CAPA_MAX_CHANNEL_SWITCH_TIME: u16 attribute indicating the
		8413	* maximum time in microseconds that the device requires to switch
		8414	* channels.
		8415	* @NL80211_NAN_CAPA_CAPABILITIES: u8 attribute containing the
		8416	* capabilities of the device as defined in Wi-Fi Aware (TM)
		8417	* specification Table 79 (Capabilities field).
		8418	* @__NL80211_NAN_CAPABILITIES_LAST: Internal
		8419	* @NL80211_NAN_CAPABILITIES_MAX: Highest NAN capability attribute.
		8420	*/
		8421	enum nl80211_nan_capabilities {
		8422	__NL80211_NAN_CAPABILITIES_INVALID,
		8423
		8424	NL80211_NAN_CAPA_CONFIGURABLE_SYNC,
		8425	NL80211_NAN_CAPA_USERSPACE_DE,
		8426	NL80211_NAN_CAPA_OP_MODE,
		8427	NL80211_NAN_CAPA_NUM_ANTENNAS,
		8428	NL80211_NAN_CAPA_MAX_CHANNEL_SWITCH_TIME,
		8429	NL80211_NAN_CAPA_CAPABILITIES,
		8430	/* keep last */
		8431	__NL80211_NAN_CAPABILITIES_LAST,
		8432	NL80211_NAN_CAPABILITIES_MAX = __NL80211_NAN_CAPABILITIES_LAST - 1,
		8433	};
		8434
8190	#endif /* __LINUX_NL80211_H */	8435	#endif /* __LINUX_NL80211_H */

include/uapi/linux/nsfs.h+16−2

 #define NS_GET_NSTYPE		_IO(NSIO, 0x3)
 /* Get owner UID (in the caller's user namespace) for a user namespace */
 #define NS_GET_OWNER_UID	_IO(NSIO, 0x4)
-/* Get the id for a mount namespace */
-#define NS_GET_MNTNS_ID		_IOR(NSIO, 0x5, __u64)
 /* Translate pid from target pid namespace into the caller's pid namespace. */
 #define NS_GET_PID_FROM_PIDNS	_IOR(NSIO, 0x6, int)
 /* Return thread-group leader id of pid in the callers pid namespace. */
 /* Get previous namespace. */
 #define NS_MNT_GET_PREV		_IOR(NSIO, 12, struct mnt_ns_info)
+/* Retrieve namespace identifiers. */
+#define NS_GET_MNTNS_ID		_IOR(NSIO, 5,  __u64)
+#define NS_GET_ID		_IOR(NSIO, 13, __u64)
 enum init_ns_ino {
 	IPC_NS_INIT_INO		= 0xEFFFFFFFU,
 	UTS_NS_INIT_INO		= 0xEFFFFFFEU,
 	TIME_NS_INIT_INO	= 0xEFFFFFFAU,
 	NET_NS_INIT_INO		= 0xEFFFFFF9U,
 	MNT_NS_INIT_INO		= 0xEFFFFFF8U,
+#ifdef __KERNEL__
+	MNT_NS_ANON_INO		= 0xEFFFFFF7U,
+#endif
+};
+struct nsfs_file_handle {
+	__u64 ns_id;
+	__u32 ns_type;
+	__u32 ns_inum;
 };
+#define NSFS_FILE_HANDLE_SIZE_VER0 16 /* sizeof first published struct */
+#define NSFS_FILE_HANDLE_SIZE_LATEST sizeof(struct nsfs_file_handle) /* sizeof latest published struct */
 #endif /* __LINUX_NSFS_H */

include/uapi/linux/pci_regs.h+10−0

 /* Capability lists */
+#define PCI_CAP_ID_MASK		0x00ff	/* Capability ID mask */
+#define PCI_CAP_LIST_NEXT_MASK	0xff00	/* Next Capability Pointer mask */
 #define PCI_CAP_LIST_ID		0	/* Capability ID */
 #define  PCI_CAP_ID_PM		0x01	/* Power Management */
 #define  PCI_CAP_ID_AGP		0x02	/* Accelerated Graphics Port */
 #define  PCI_ERR_UNC_MCBTLP	0x00800000	/* MC blocked TLP */
 #define  PCI_ERR_UNC_ATOMEG	0x01000000	/* Atomic egress blocked */
 #define  PCI_ERR_UNC_TLPPRE	0x02000000	/* TLP prefix blocked */
+#define  PCI_ERR_UNC_POISON_BLK	0x04000000	/* Poisoned TLP Egress Blocked */
+#define  PCI_ERR_UNC_DMWR_BLK	0x08000000	/* DMWr Request Egress Blocked */
+#define  PCI_ERR_UNC_IDE_CHECK	0x10000000	/* IDE Check Failed */
+#define  PCI_ERR_UNC_MISR_IDE	0x20000000	/* Misrouted IDE TLP */
+#define  PCI_ERR_UNC_PCRC_CHECK	0x40000000	/* PCRC Check Failed */
+#define  PCI_ERR_UNC_XLAT_BLK	0x80000000	/* TLP Translation Egress Blocked */
 #define PCI_ERR_UNCOR_MASK	0x08	/* Uncorrectable Error Mask */
 	/* Same bits as above */
 #define PCI_ERR_UNCOR_SEVER	0x0c	/* Uncorrectable Error Severity */
 #define  PCI_ERR_CAP_ECRC_CHKC		0x00000080 /* ECRC Check Capable */
 #define  PCI_ERR_CAP_ECRC_CHKE		0x00000100 /* ECRC Check Enable */
 #define  PCI_ERR_CAP_PREFIX_LOG_PRESENT	0x00000800 /* TLP Prefix Log Present */
+#define  PCI_ERR_CAP_COMP_TIME_LOG	0x00001000 /* Completion Timeout Prefix/Header Log Capable */
 #define  PCI_ERR_CAP_TLP_LOG_FLIT	0x00040000 /* TLP was logged in Flit Mode */
 #define  PCI_ERR_CAP_TLP_LOG_SIZE	0x00f80000 /* Logged TLP Size (only in Flit mode) */
 #define PCI_ERR_HEADER_LOG	0x1c	/* Header Log Register (16 bytes) */

include/uapi/linux/prctl.h+10−0

@@ -177,7 +177,17 @@ struct prctl_mm_map { · 176 unmodified lines
177		177
178	#define PR_GET_TID_ADDRESS 40	178	#define PR_GET_TID_ADDRESS 40
179		179
		180	/*
		181	* Flags for PR_SET_THP_DISABLE are only applicable when disabling. Bit 0
		182	* is reserved, so PR_GET_THP_DISABLE can return "1 \| flags", to effectively
		183	* return "1" when no flags were specified for PR_SET_THP_DISABLE.
		184	*/
180	#define PR_SET_THP_DISABLE 41	185	#define PR_SET_THP_DISABLE 41
		186	/*
		187	* Don't disable THPs when explicitly advised (e.g., MADV_HUGEPAGE /
		188	* VM_HUGEPAGE, MADV_COLLAPSE).
		189	*/
		190	# define PR_THP_DISABLE_EXCEPT_ADVISED (1 << 1)
181	#define PR_GET_THP_DISABLE 42	191	#define PR_GET_THP_DISABLE 42
182		192
183	/*	193	/*

include/uapi/linux/psp-sev.h+9−1

  * @mask_chip_id: whether chip id is present in attestation reports or not
  * @mask_chip_key: whether attestation reports are signed or not
  * @vlek_en: VLEK (Version Loaded Endorsement Key) hashstick is loaded
+ * @feature_info: whether SNP_FEATURE_INFO command is available
+ * @rapl_dis: whether RAPL is disabled
+ * @ciphertext_hiding_cap: whether platform has ciphertext hiding capability
+ * @ciphertext_hiding_en: whether ciphertext hiding is enabled
  * @rsvd1: reserved
  * @guest_count: the number of guest currently managed by the firmware
  * @current_tcb_version: current TCB version
 	__u32 mask_chip_id:1;		/* Out */
 	__u32 mask_chip_key:1;		/* Out */
 	__u32 vlek_en:1;		/* Out */
-	__u32 rsvd1:29;
+	__u32 feature_info:1;		/* Out */
+	__u32 rapl_dis:1;		/* Out */
+	__u32 ciphertext_hiding_cap:1;	/* Out */
+	__u32 ciphertext_hiding_en:1;	/* Out */
+	__u32 rsvd1:25;
 	__u32 guest_count;		/* Out */
 	__u64 current_tcb_version;	/* Out */
 	__u64 reported_tcb_version;	/* Out */

include/uapi/linux/psp-sfs.h+87−0

@@ -0,0 +1,87 @@
	1	/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
	2	/*
	3	* Userspace interface for AMD Seamless Firmware Servicing (SFS)
	4	*
	5	* Copyright (C) 2025 Advanced Micro Devices, Inc.
	6	*
	7	* Author: Ashish Kalra <ashish.kalra@amd.com>
	8	*/
	9
	10	#ifndef __PSP_SFS_USER_H__
	11	#define __PSP_SFS_USER_H__
	12
	13	#include <linux/types.h>
	14
	15	/**
	16	* SFS: AMD Seamless Firmware Support (SFS) interface
	17	*/
	18
	19	#define PAYLOAD_NAME_SIZE 64
	20	#define TEE_EXT_CMD_BUFFER_SIZE 4096
	21
	22	/**
	23	* struct sfs_user_get_fw_versions - get current level of base firmware (output).
	24	* @blob: current level of base firmware for ASP and patch levels (input/output).
	25	* @sfs_status: 32-bit SFS status value (output).
	26	* @sfs_extended_status: 32-bit SFS extended status value (output).
	27	*/
	28	struct sfs_user_get_fw_versions {
	29	__u8 blob[TEE_EXT_CMD_BUFFER_SIZE];
	30	__u32 sfs_status;
	31	__u32 sfs_extended_status;
	32	} __packed;
	33
	34	/**
	35	* struct sfs_user_update_package - update SFS package (input).
	36	* @payload_name: name of SFS package to load, verify and execute (input).
	37	* @sfs_status: 32-bit SFS status value (output).
	38	* @sfs_extended_status: 32-bit SFS extended status value (output).
	39	*/
	40	struct sfs_user_update_package {
	41	char payload_name[PAYLOAD_NAME_SIZE];
	42	__u32 sfs_status;
	43	__u32 sfs_extended_status;
	44	} __packed;
	45
	46	/**
	47	* Seamless Firmware Support (SFS) IOC
	48	*
	49	* possible return codes for all SFS IOCTLs:
	50	* 0: success
	51	* -EINVAL: invalid input
	52	* -E2BIG: excess data passed
	53	* -EFAULT: failed to copy to/from userspace
	54	* -EBUSY: mailbox in recovery or in use
	55	* -ENODEV: driver not bound with PSP device
	56	* -EACCES: request isn't authorized
	57	* -EINVAL: invalid parameter
	58	* -ETIMEDOUT: request timed out
	59	* -EAGAIN: invalid request for state machine
	60	* -ENOENT: not implemented
	61	* -ENFILE: overflow
	62	* -EPERM: invalid signature
	63	* -EIO: PSP I/O error
	64	*/
	65	#define SFS_IOC_TYPE 'S'
	66
	67	/**
	68	* SFSIOCFWVERS - returns blob containing FW versions
	69	* ASP provides the current level of Base Firmware for the ASP
	70	* and the other microprocessors as well as current patch
	71	* level(s).
	72	*/
	73	#define SFSIOCFWVERS _IOWR(SFS_IOC_TYPE, 0x1, struct sfs_user_get_fw_versions)
	74
	75	/**
	76	* SFSIOCUPDATEPKG - updates package/payload
	77	* ASP loads, verifies and executes the SFS package.
	78	* By default, the SFS package/payload is loaded from
	79	* /lib/firmware/amd, but alternative firmware loading
	80	* path can be specified using kernel parameter
	81	* firmware_class.path or the firmware loading path
	82	* can be customized using sysfs file:
	83	* /sys/module/firmware_class/parameters/path.
	84	*/
	85	#define SFSIOCUPDATEPKG _IOWR(SFS_IOC_TYPE, 0x2, struct sfs_user_update_package)
	86
	87	#endif /* __PSP_SFS_USER_H__ */

include/uapi/linux/psp.h+66−0

@@ -0,0 +1,66 @@
	1	/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
	2	/* Do not edit directly, auto-generated from: */
	3	/* Documentation/netlink/specs/psp.yaml */
	4	/* YNL-GEN uapi header */
	5
	6	#ifndef _UAPI_LINUX_PSP_H
	7	#define _UAPI_LINUX_PSP_H
	8
	9	#define PSP_FAMILY_NAME "psp"
	10	#define PSP_FAMILY_VERSION 1
	11
	12	enum psp_version {
	13	PSP_VERSION_HDR0_AES_GCM_128,
	14	PSP_VERSION_HDR0_AES_GCM_256,
	15	PSP_VERSION_HDR0_AES_GMAC_128,
	16	PSP_VERSION_HDR0_AES_GMAC_256,
	17	};
	18
	19	enum {
	20	PSP_A_DEV_ID = 1,
	21	PSP_A_DEV_IFINDEX,
	22	PSP_A_DEV_PSP_VERSIONS_CAP,
	23	PSP_A_DEV_PSP_VERSIONS_ENA,
	24
	25	__PSP_A_DEV_MAX,
	26	PSP_A_DEV_MAX = (__PSP_A_DEV_MAX - 1)
	27	};
	28
	29	enum {
	30	PSP_A_ASSOC_DEV_ID = 1,
	31	PSP_A_ASSOC_VERSION,
	32	PSP_A_ASSOC_RX_KEY,
	33	PSP_A_ASSOC_TX_KEY,
	34	PSP_A_ASSOC_SOCK_FD,
	35
	36	__PSP_A_ASSOC_MAX,
	37	PSP_A_ASSOC_MAX = (__PSP_A_ASSOC_MAX - 1)
	38	};
	39
	40	enum {
	41	PSP_A_KEYS_KEY = 1,
	42	PSP_A_KEYS_SPI,
	43
	44	__PSP_A_KEYS_MAX,
	45	PSP_A_KEYS_MAX = (__PSP_A_KEYS_MAX - 1)
	46	};
	47
	48	enum {
	49	PSP_CMD_DEV_GET = 1,
	50	PSP_CMD_DEV_ADD_NTF,
	51	PSP_CMD_DEV_DEL_NTF,
	52	PSP_CMD_DEV_SET,
	53	PSP_CMD_DEV_CHANGE_NTF,
	54	PSP_CMD_KEY_ROTATE,
	55	PSP_CMD_KEY_ROTATE_NTF,
	56	PSP_CMD_RX_ASSOC,
	57	PSP_CMD_TX_ASSOC,
	58
	59	__PSP_CMD_MAX,
	60	PSP_CMD_MAX = (__PSP_CMD_MAX - 1)
	61	};
	62
	63	#define PSP_MCGRP_MGMT "mgmt"
	64	#define PSP_MCGRP_USE "use"
	65
	66	#endif /* _UAPI_LINUX_PSP_H */

include/uapi/linux/ptp_clock.h+7−0

 /*
  * flag fields valid for the new PTP_EXTTS_REQUEST2 ioctl.
+ *
+ * Note: PTP_STRICT_FLAGS is always enabled by the kernel for
+ * PTP_EXTTS_REQUEST2 regardless of whether it is set by userspace.
  */
 #define PTP_EXTTS_VALID_FLAGS	(PTP_ENABLE_FEATURE |	\
 				 PTP_RISING_EDGE |	\
 	_IOWR(PTP_CLK_MAGIC, 18, struct ptp_sys_offset_extended)
 #define PTP_MASK_CLEAR_ALL  _IO(PTP_CLK_MAGIC, 19)
 #define PTP_MASK_EN_SINGLE  _IOW(PTP_CLK_MAGIC, 20, unsigned int)
+#define PTP_SYS_OFFSET_PRECISE_CYCLES \
+	_IOWR(PTP_CLK_MAGIC, 21, struct ptp_sys_offset_precise)
+#define PTP_SYS_OFFSET_EXTENDED_CYCLES \
+	_IOWR(PTP_CLK_MAGIC, 22, struct ptp_sys_offset_extended)
 struct ptp_extts_event {
 	struct ptp_clock_time t; /* Time event occurred. */

include/uapi/linux/stddef.h+2−0

@@ -2,7 +2,9 @@ · 1 unmodified line
2	#ifndef _UAPI_LINUX_STDDEF_H	2	#ifndef _UAPI_LINUX_STDDEF_H
3	#define _UAPI_LINUX_STDDEF_H	3	#define _UAPI_LINUX_STDDEF_H
4		4
		5	#ifdef __KERNEL__
5	#include <linux/compiler_types.h>	6	#include <linux/compiler_types.h>
		7	#endif
6		8
7	#ifndef __always_inline	9	#ifndef __always_inline
8	#define __always_inline inline	10	#define __always_inline inline

include/uapi/linux/tcp.h+9−0

@@ -316,6 +316,15 @@ struct tcp_info { · 315 unmodified lines
316	* in milliseconds, including any	316	* in milliseconds, including any
317	* unfinished recovery.	317	* unfinished recovery.
318	*/	318	*/
		319	__u32 tcpi_received_ce; /* # of CE marks received */
		320	__u32 tcpi_delivered_e1_bytes; /* Accurate ECN byte counters */
		321	__u32 tcpi_delivered_e0_bytes;
		322	__u32 tcpi_delivered_ce_bytes;
		323	__u32 tcpi_received_e1_bytes;
		324	__u32 tcpi_received_e0_bytes;
		325	__u32 tcpi_received_ce_bytes;
		326	__u16 tcpi_accecn_fail_mode;
		327	__u16 tcpi_accecn_opt_seen;
319	};	328	};
320		329
321	/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */	330	/* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */

include/uapi/linux/tee.h+79−8

@@ -42,14 +42,16 @@ · 41 unmodified lines
42	#define TEE_IOC_MAGIC 0xa4	42	#define TEE_IOC_MAGIC 0xa4
43	#define TEE_IOC_BASE 0	43	#define TEE_IOC_BASE 0
44		44
45	#define TEE_MAX_ARG_SIZE 1024	45	#define TEE_MAX_ARG_SIZE 4096
46		46
47	#define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */	47	#define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */
48	#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */	48	#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */
49	#define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */	49	#define TEE_GEN_CAP_REG_MEM (1 << 2)/* Supports registering shared memory */
50	#define TEE_GEN_CAP_MEMREF_NULL (1 << 3)/* NULL MemRef support */	50	#define TEE_GEN_CAP_MEMREF_NULL (1 << 3)/* NULL MemRef support */
		51	#define TEE_GEN_CAP_OBJREF (1 << 4)/* Supports generic object reference */
51		52
52	#define TEE_MEMREF_NULL (__u64)(-1) /* NULL MemRef Buffer */	53	#define TEE_MEMREF_NULL ((__u64)(-1)) /* NULL MemRef Buffer */
		54	#define TEE_OBJREF_NULL ((__u64)(-1)) /* NULL ObjRef Object */
53		55
54	/*	56	/*
55	* TEE Implementation ID	57	* TEE Implementation ID
@@ -57,6 +59,7 @@ · 1 unmodified line
57	#define TEE_IMPL_ID_OPTEE 1	59	#define TEE_IMPL_ID_OPTEE 1
58	#define TEE_IMPL_ID_AMDTEE 2	60	#define TEE_IMPL_ID_AMDTEE 2
59	#define TEE_IMPL_ID_TSTEE 3	61	#define TEE_IMPL_ID_TSTEE 3
		62	#define TEE_IMPL_ID_QTEE 4
60		63
61	/*	64	/*
62	* OP-TEE specific capabilities	65	* OP-TEE specific capabilities
@@ -151,6 +154,20 @@ struct tee_ioctl_buf_data { · 88 unmodified lines
151	#define TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT 6	154	#define TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT 6
152	#define TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT 7 /* input and output */	155	#define TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT 7 /* input and output */
153		156
		157	/*
		158	* These defines userspace buffer parameters.
		159	*/
		160	#define TEE_IOCTL_PARAM_ATTR_TYPE_UBUF_INPUT 8
		161	#define TEE_IOCTL_PARAM_ATTR_TYPE_UBUF_OUTPUT 9
		162	#define TEE_IOCTL_PARAM_ATTR_TYPE_UBUF_INOUT 10 /* input and output */
		163
		164	/*
		165	* These defines object reference parameters.
		166	*/
		167	#define TEE_IOCTL_PARAM_ATTR_TYPE_OBJREF_INPUT 11
		168	#define TEE_IOCTL_PARAM_ATTR_TYPE_OBJREF_OUTPUT 12
		169	#define TEE_IOCTL_PARAM_ATTR_TYPE_OBJREF_INOUT 13
		170
154	/*	171	/*
155	* Mask for the type part of the attribute, leaves room for more types	172	* Mask for the type part of the attribute, leaves room for more types
156	*/	173	*/
@@ -186,14 +203,18 @@ struct tee_ioctl_buf_data { · 29 unmodified lines
186	/**	203	/**
187	* struct tee_ioctl_param - parameter	204	* struct tee_ioctl_param - parameter
188	* @attr: attributes	205	* @attr: attributes
189	* @a: if a memref, offset into the shared memory object, else a value parameter	206	* @a: if a memref, offset into the shared memory object,
190	* @b: if a memref, size of the buffer, else a value parameter	207	* else if a ubuf, address of the user buffer,
		208	* else if an objref, object identifier, else a value parameter
		209	* @b: if a memref or ubuf, size of the buffer,
		210	* else if objref, flags for the object, else a value parameter
191	* @c: if a memref, shared memory identifier, else a value parameter	211	* @c: if a memref, shared memory identifier, else a value parameter
192	*	212	*
193	* @attr & TEE_PARAM_ATTR_TYPE_MASK indicates if memref or value is used in	213	* @attr & TEE_PARAM_ATTR_TYPE_MASK indicates if memref, ubuf, or value is
194	* the union. TEE_PARAM_ATTR_TYPE_VALUE_* indicates value and	214	* used in the union. TEE_PARAM_ATTR_TYPE_VALUE_* indicates value,
195	* TEE_PARAM_ATTR_TYPE_MEMREF_* indicates memref. TEE_PARAM_ATTR_TYPE_NONE	215	* TEE_PARAM_ATTR_TYPE_MEMREF_* indicates memref, TEE_PARAM_ATTR_TYPE_UBUF_*
196	* indicates that none of the members are used.	216	* indicates ubuf, and TEE_PARAM_ATTR_TYPE_OBJREF_* indicates objref.
		217	* TEE_PARAM_ATTR_TYPE_NONE indicates that none of the members are used.
197	*	218	*
198	* Shared memory is allocated with TEE_IOC_SHM_ALLOC which returns an	219	* Shared memory is allocated with TEE_IOC_SHM_ALLOC which returns an
199	* identifier representing the shared memory object. A memref can reference	220	* identifier representing the shared memory object. A memref can reference
@@ -378,6 +399,37 @@ struct tee_ioctl_shm_register_data { · 178 unmodified lines
378	__s32 id;	399	__s32 id;
379	};	400	};
380		401
		402	/**
		403	* struct tee_ioctl_shm_register_fd_data - Shared memory registering argument
		404	* @fd: [in] File descriptor identifying dmabuf reference
		405	* @size: [out] Size of referenced memory
		406	* @flags: [in] Flags to/from allocation.
		407	* @id: [out] Identifier of the shared memory
		408	*
		409	* The flags field should currently be zero as input. Updated by the call
		410	* with actual flags as defined by TEE_IOCTL_SHM_* above.
		411	* This structure is used as argument for TEE_IOC_SHM_REGISTER_FD below.
		412	*/
		413	struct tee_ioctl_shm_register_fd_data {
		414	__s64 fd;
		415	__u64 size;
		416	__u32 flags;
		417	__s32 id;
		418	};
		419
		420	/**
		421	* TEE_IOC_SHM_REGISTER_FD - register a shared memory from a file descriptor
		422	*
		423	* Returns a file descriptor on success or < 0 on failure
		424	*
		425	* The returned file descriptor refers to the shared memory object in the
		426	* kernel. The supplied file deccriptor can be closed if it's not needed
		427	* for other purposes. The shared memory is freed when the descriptor is
		428	* closed.
		429	*/
		430	#define TEE_IOC_SHM_REGISTER_FD _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 8, \
		431	struct tee_ioctl_shm_register_fd_data)
		432
381	/**	433	/**
382	* TEE_IOC_SHM_REGISTER - Register shared memory argument	434	* TEE_IOC_SHM_REGISTER - Register shared memory argument
383	*	435	*
@@ -401,4 +453,23 @@ struct tee_ioctl_shm_register_data { · 17 unmodified lines
401	* munmap(): unmaps previously shared memory	453	* munmap(): unmaps previously shared memory
402	*/	454	*/
403		455
		456	/**
		457	* struct tee_ioctl_invoke_func_arg - Invokes an object in a Trusted Application
		458	* @id: [in] Object id
		459	* @op: [in] Object operation, specific to the object
		460	* @ret: [out] return value
		461	* @num_params: [in] number of parameters following this struct
		462	*/
		463	struct tee_ioctl_object_invoke_arg {
		464	__u64 id;
		465	__u32 op;
		466	__u32 ret;
		467	__u32 num_params;
		468	/* num_params tells the actual number of element in params */
		469	struct tee_ioctl_param params[];
		470	};
		471
		472	#define TEE_IOC_OBJECT_INVOKE _IOR(TEE_IOC_MAGIC, TEE_IOC_BASE + 10, \
		473	struct tee_ioctl_buf_data)
		474
404	#endif /__TEE_H/	475	#endif /__TEE_H/

include/uapi/linux/v4l2-controls.h+60−61

 #define V4L2_CID_JPEG_CLASS_BASE		(V4L2_CTRL_CLASS_JPEG | 0x900)
 #define V4L2_CID_JPEG_CLASS			(V4L2_CTRL_CLASS_JPEG | 1)
-#define	V4L2_CID_JPEG_CHROMA_SUBSAMPLING	(V4L2_CID_JPEG_CLASS_BASE + 1)
+#define V4L2_CID_JPEG_CHROMA_SUBSAMPLING	(V4L2_CID_JPEG_CLASS_BASE + 1)
 enum v4l2_jpeg_chroma_subsampling {
 	V4L2_JPEG_CHROMA_SUBSAMPLING_444	= 0,
 	V4L2_JPEG_CHROMA_SUBSAMPLING_422	= 1,
 	V4L2_JPEG_CHROMA_SUBSAMPLING_410	= 4,
 	V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY	= 5,
 };
-#define	V4L2_CID_JPEG_RESTART_INTERVAL		(V4L2_CID_JPEG_CLASS_BASE + 2)
+#define V4L2_CID_JPEG_RESTART_INTERVAL		(V4L2_CID_JPEG_CLASS_BASE + 2)
-#define	V4L2_CID_JPEG_COMPRESSION_QUALITY	(V4L2_CID_JPEG_CLASS_BASE + 3)
+#define V4L2_CID_JPEG_COMPRESSION_QUALITY	(V4L2_CID_JPEG_CLASS_BASE + 3)
-#define	V4L2_CID_JPEG_ACTIVE_MARKER		(V4L2_CID_JPEG_CLASS_BASE + 4)
+#define V4L2_CID_JPEG_ACTIVE_MARKER		(V4L2_CID_JPEG_CLASS_BASE + 4)
-#define	V4L2_JPEG_ACTIVE_MARKER_APP0		(1 << 0)
+#define V4L2_JPEG_ACTIVE_MARKER_APP0		(1 << 0)
-#define	V4L2_JPEG_ACTIVE_MARKER_APP1		(1 << 1)
+#define V4L2_JPEG_ACTIVE_MARKER_APP1		(1 << 1)
-#define	V4L2_JPEG_ACTIVE_MARKER_COM		(1 << 16)
+#define V4L2_JPEG_ACTIVE_MARKER_COM		(1 << 16)
-#define	V4L2_JPEG_ACTIVE_MARKER_DQT		(1 << 17)
+#define V4L2_JPEG_ACTIVE_MARKER_DQT		(1 << 17)
-#define	V4L2_JPEG_ACTIVE_MARKER_DHT		(1 << 18)
+#define V4L2_JPEG_ACTIVE_MARKER_DHT		(1 << 18)
 /* Image source controls */
 #define V4L2_CID_DV_CLASS_BASE			(V4L2_CTRL_CLASS_DV | 0x900)
 #define V4L2_CID_DV_CLASS			(V4L2_CTRL_CLASS_DV | 1)
-#define	V4L2_CID_DV_TX_HOTPLUG			(V4L2_CID_DV_CLASS_BASE + 1)
+#define V4L2_CID_DV_TX_HOTPLUG			(V4L2_CID_DV_CLASS_BASE + 1)
-#define	V4L2_CID_DV_TX_RXSENSE			(V4L2_CID_DV_CLASS_BASE + 2)
+#define V4L2_CID_DV_TX_RXSENSE			(V4L2_CID_DV_CLASS_BASE + 2)
-#define	V4L2_CID_DV_TX_EDID_PRESENT		(V4L2_CID_DV_CLASS_BASE + 3)
+#define V4L2_CID_DV_TX_EDID_PRESENT		(V4L2_CID_DV_CLASS_BASE + 3)
-#define	V4L2_CID_DV_TX_MODE			(V4L2_CID_DV_CLASS_BASE + 4)
+#define V4L2_CID_DV_TX_MODE			(V4L2_CID_DV_CLASS_BASE + 4)
 enum v4l2_dv_tx_mode {
 	V4L2_DV_TX_MODE_DVI_D	= 0,
 	V4L2_DV_TX_MODE_HDMI	= 1,
 	V4L2_DV_IT_CONTENT_TYPE_NO_ITC	  = 4,
 };
-#define	V4L2_CID_DV_RX_POWER_PRESENT		(V4L2_CID_DV_CLASS_BASE + 100)
+#define V4L2_CID_DV_RX_POWER_PRESENT		(V4L2_CID_DV_CLASS_BASE + 100)
 #define V4L2_CID_DV_RX_RGB_RANGE		(V4L2_CID_DV_CLASS_BASE + 101)
 #define V4L2_CID_DV_RX_IT_CONTENT_TYPE		(V4L2_CID_DV_CLASS_BASE + 102)
 	struct v4l2_h264_weight_factors weight_factors[2];
 };
-#define V4L2_H264_SLICE_TYPE_P				0
-#define V4L2_H264_SLICE_TYPE_B				1
-#define V4L2_H264_SLICE_TYPE_I				2
-#define V4L2_H264_SLICE_TYPE_SP				3
-#define V4L2_H264_SLICE_TYPE_SI				4
-#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED	0x01
-#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH		0x02
 #define V4L2_H264_TOP_FIELD_REF				0x1
 #define V4L2_H264_BOTTOM_FIELD_REF			0x2
 #define V4L2_H264_FRAME_REF				0x3
  * Maximum DPB size, as specified by section 'A.3.1 Level limits
  * common to the Baseline, Main, and Extended profiles'.
  */
-#define V4L2_H264_NUM_DPB_ENTRIES 16
+#define V4L2_H264_NUM_DPB_ENTRIES		16
-#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES)
+#define V4L2_H264_REF_LIST_LEN			(2 * V4L2_H264_NUM_DPB_ENTRIES)
+#define V4L2_H264_SLICE_TYPE_P				0
+#define V4L2_H264_SLICE_TYPE_B				1
+#define V4L2_H264_SLICE_TYPE_I				2
+#define V4L2_H264_SLICE_TYPE_SP				3
+#define V4L2_H264_SLICE_TYPE_SI				4
+#define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED		0x01
+#define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH			0x02
 #define V4L2_CID_STATELESS_H264_SLICE_PARAMS	(V4L2_CID_CODEC_STATELESS_BASE + 6)
 /**
 	__u32 flags;
 };
 /* Stateless FWHT control, used by the vicodec driver */
 /* Current FWHT version */
 	__u8	scaling_list_dc_coef_32x32[2];
 };
-#define V4L2_CID_COLORIMETRY_CLASS_BASE	(V4L2_CTRL_CLASS_COLORIMETRY | 0x900)
-#define V4L2_CID_COLORIMETRY_CLASS	(V4L2_CTRL_CLASS_COLORIMETRY | 1)
-#define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO	(V4L2_CID_COLORIMETRY_CLASS_BASE + 0)
-struct v4l2_ctrl_hdr10_cll_info {
-	__u16 max_content_light_level;
-	__u16 max_pic_average_light_level;
-};
-#define V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY	(V4L2_CID_COLORIMETRY_CLASS_BASE + 1)
-#define V4L2_HDR10_MASTERING_PRIMARIES_X_LOW	5
-#define V4L2_HDR10_MASTERING_PRIMARIES_X_HIGH	37000
-#define V4L2_HDR10_MASTERING_PRIMARIES_Y_LOW	5
-#define V4L2_HDR10_MASTERING_PRIMARIES_Y_HIGH	42000
-#define V4L2_HDR10_MASTERING_WHITE_POINT_X_LOW	5
-#define V4L2_HDR10_MASTERING_WHITE_POINT_X_HIGH	37000
-#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_LOW	5
-#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_HIGH	42000
-#define V4L2_HDR10_MASTERING_MAX_LUMA_LOW	50000
-#define V4L2_HDR10_MASTERING_MAX_LUMA_HIGH	100000000
-#define V4L2_HDR10_MASTERING_MIN_LUMA_LOW	1
-#define V4L2_HDR10_MASTERING_MIN_LUMA_HIGH	50000
-struct v4l2_ctrl_hdr10_mastering_display {
-	__u16 display_primaries_x[3];
-	__u16 display_primaries_y[3];
-	__u16 white_point_x;
-	__u16 white_point_y;
-	__u32 max_display_mastering_luminance;
-	__u32 min_display_mastering_luminance;
-};
 /* Stateless VP9 controls */
 #define V4L2_VP9_LOOP_FILTER_FLAG_DELTA_ENABLED	0x1
-#define	V4L2_VP9_LOOP_FILTER_FLAG_DELTA_UPDATE	0x2
+#define V4L2_VP9_LOOP_FILTER_FLAG_DELTA_UPDATE	0x2
 /**
  * struct v4l2_vp9_loop_filter - VP9 loop filter parameters
 #define V4L2_CID_MPEG_MFC51_BASE        V4L2_CID_CODEC_MFC51_BASE
 #endif
+#define V4L2_CID_COLORIMETRY_CLASS_BASE	(V4L2_CTRL_CLASS_COLORIMETRY | 0x900)
+#define V4L2_CID_COLORIMETRY_CLASS	(V4L2_CTRL_CLASS_COLORIMETRY | 1)
+#define V4L2_CID_COLORIMETRY_HDR10_CLL_INFO	(V4L2_CID_COLORIMETRY_CLASS_BASE + 0)
+struct v4l2_ctrl_hdr10_cll_info {
+	__u16 max_content_light_level;
+	__u16 max_pic_average_light_level;
+};
+#define V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY	(V4L2_CID_COLORIMETRY_CLASS_BASE + 1)
+#define V4L2_HDR10_MASTERING_PRIMARIES_X_LOW	5
+#define V4L2_HDR10_MASTERING_PRIMARIES_X_HIGH	37000
+#define V4L2_HDR10_MASTERING_PRIMARIES_Y_LOW	5
+#define V4L2_HDR10_MASTERING_PRIMARIES_Y_HIGH	42000
+#define V4L2_HDR10_MASTERING_WHITE_POINT_X_LOW	5
+#define V4L2_HDR10_MASTERING_WHITE_POINT_X_HIGH	37000
+#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_LOW	5
+#define V4L2_HDR10_MASTERING_WHITE_POINT_Y_HIGH	42000
+#define V4L2_HDR10_MASTERING_MAX_LUMA_LOW	50000
+#define V4L2_HDR10_MASTERING_MAX_LUMA_HIGH	100000000
+#define V4L2_HDR10_MASTERING_MIN_LUMA_LOW	1
+#define V4L2_HDR10_MASTERING_MIN_LUMA_HIGH	50000
+struct v4l2_ctrl_hdr10_mastering_display {
+	__u16 display_primaries_x[3];
+	__u16 display_primaries_y[3];
+	__u16 white_point_x;
+	__u16 white_point_y;
+	__u32 max_display_mastering_luminance;
+	__u32 min_display_mastering_luminance;
+};
 #endif

include/uapi/linux/v4l2-dv-timings.h+1−1

@@ -2,7 +2,7 @@ · 1 unmodified line
2	/*	2	/*
3	* V4L2 DV timings header.	3	* V4L2 DV timings header.
4	*	4	*
5	* Copyright (C) 2012-2016 Hans Verkuil <hansverk@cisco.com>	5	* Copyright (C) 2012-2016 Hans Verkuil <hverkuil@kernel.org>
6	*/	6	*/
7		7
8	#ifndef _V4L2_DV_TIMINGS_H	8	#ifndef _V4L2_DV_TIMINGS_H

include/uapi/linux/vduse.h+1−1

@@ -237,7 +237,7 @@ struct vduse_iova_umem { · 236 unmodified lines
237	* struct vduse_iova_info - information of one IOVA region	237	* struct vduse_iova_info - information of one IOVA region
238	* @start: start of the IOVA region	238	* @start: start of the IOVA region
239	* @last: last of the IOVA region	239	* @last: last of the IOVA region
240	* @capability: capability of the IOVA regsion	240	* @capability: capability of the IOVA region
241	* @reserved: for future use, needs to be initialized to zero	241	* @reserved: for future use, needs to be initialized to zero
242	*	242	*
243	* Structure used by VDUSE_IOTLB_GET_INFO ioctl to get information of	243	* Structure used by VDUSE_IOTLB_GET_INFO ioctl to get information of

include/uapi/linux/videodev2.h+10−10

include/uapi/linux/virtio_ids.h+1−0

@@ -68,6 +68,7 @@ · 67 unmodified lines
68	#define VIRTIO_ID_AUDIO_POLICY 39 /* virtio audio policy */	68	#define VIRTIO_ID_AUDIO_POLICY 39 /* virtio audio policy */
69	#define VIRTIO_ID_BT 40 /* virtio bluetooth */	69	#define VIRTIO_ID_BT 40 /* virtio bluetooth */
70	#define VIRTIO_ID_GPIO 41 /* virtio gpio */	70	#define VIRTIO_ID_GPIO 41 /* virtio gpio */
		71	#define VIRTIO_ID_SPI 45 /* virtio spi */
71		72
72	/*	73	/*
73	* Virtio Transitional IDs	74	* Virtio Transitional IDs

include/uapi/linux/virtio_spi.h+181−0

@@ -0,0 +1,181 @@
	1	/* SPDX-License-Identifier: BSD-3-Clause */
	2	/*
	3	* Copyright (C) 2023 OpenSynergy GmbH
	4	* Copyright (C) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
	5	*/
	6	#ifndef _LINUX_VIRTIO_VIRTIO_SPI_H
	7	#define _LINUX_VIRTIO_VIRTIO_SPI_H
	8
	9	#include <linux/types.h>
	10	#include <linux/virtio_config.h>
	11	#include <linux/virtio_ids.h>
	12	#include <linux/virtio_types.h>
	13
	14	/* Sample data on trailing clock edge */
	15	#define VIRTIO_SPI_CPHA _BITUL(0)
	16	/* Clock is high when IDLE */
	17	#define VIRTIO_SPI_CPOL _BITUL(1)
	18	/* Chip Select is active high */
	19	#define VIRTIO_SPI_CS_HIGH _BITUL(2)
	20	/* Transmit LSB first */
	21	#define VIRTIO_SPI_MODE_LSB_FIRST _BITUL(3)
	22	/* Loopback mode */
	23	#define VIRTIO_SPI_MODE_LOOP _BITUL(4)
	24
	25	/**
	26	* struct virtio_spi_config - All config fields are read-only for the
	27	* Virtio SPI driver
	28	* @cs_max_number: maximum number of chipselect the host SPI controller
	29	* supports.
	30	* @cs_change_supported: indicates if the host SPI controller supports to toggle
	31	* chipselect after each transfer in one message:
	32	* 0: unsupported, chipselect will be kept in active state throughout the
	33	* message transaction;
	34	* 1: supported.
	35	* Note: Message here contains a sequence of SPI transfers.
	36	* @tx_nbits_supported: indicates the supported number of bit for writing:
	37	* bit 0: DUAL (2-bit transfer), 1 for supported
	38	* bit 1: QUAD (4-bit transfer), 1 for supported
	39	* bit 2: OCTAL (8-bit transfer), 1 for supported
	40	* other bits are reserved as 0, 1-bit transfer is always supported.
	41	* @rx_nbits_supported: indicates the supported number of bit for reading:
	42	* bit 0: DUAL (2-bit transfer), 1 for supported
	43	* bit 1: QUAD (4-bit transfer), 1 for supported
	44	* bit 2: OCTAL (8-bit transfer), 1 for supported
	45	* other bits are reserved as 0, 1-bit transfer is always supported.
	46	* @bits_per_word_mask: mask indicating which values of bits_per_word are
	47	* supported. If not set, no limitation for bits_per_word.
	48	* @mode_func_supported: indicates the following features are supported or not:
	49	* bit 0-1: CPHA feature
	50	* 0b00: invalid, should support as least one CPHA setting
	51	* 0b01: supports CPHA=0 only
	52	* 0b10: supports CPHA=1 only
	53	* 0b11: supports CPHA=0 and CPHA=1.
	54	* bit 2-3: CPOL feature
	55	* 0b00: invalid, should support as least one CPOL setting
	56	* 0b01: supports CPOL=0 only
	57	* 0b10: supports CPOL=1 only
	58	* 0b11: supports CPOL=0 and CPOL=1.
	59	* bit 4: chipselect active high feature, 0 for unsupported and 1 for
	60	* supported, chipselect active low is supported by default.
	61	* bit 5: LSB first feature, 0 for unsupported and 1 for supported,
	62	* MSB first is supported by default.
	63	* bit 6: loopback mode feature, 0 for unsupported and 1 for supported,
	64	* normal mode is supported by default.
	65	* @max_freq_hz: the maximum clock rate supported in Hz unit, 0 means no
	66	* limitation for transfer speed.
	67	* @max_word_delay_ns: the maximum word delay supported, in nanoseconds.
	68	* A value of 0 indicates that word delay is unsupported.
	69	* Each transfer may consist of a sequence of words.
	70	* @max_cs_setup_ns: the maximum delay supported after chipselect is asserted,
	71	* in ns unit, 0 means delay is not supported to introduce after chipselect is
	72	* asserted.
	73	* @max_cs_hold_ns: the maximum delay supported before chipselect is deasserted,
	74	* in ns unit, 0 means delay is not supported to introduce before chipselect
	75	* is deasserted.
	76	* @max_cs_incative_ns: maximum delay supported after chipselect is deasserted,
	77	* in ns unit, 0 means delay is not supported to introduce after chipselect is
	78	* deasserted.
	79	*/
	80	struct virtio_spi_config {
	81	__u8 cs_max_number;
	82	__u8 cs_change_supported;
	83	#define VIRTIO_SPI_RX_TX_SUPPORT_DUAL _BITUL(0)
	84	#define VIRTIO_SPI_RX_TX_SUPPORT_QUAD _BITUL(1)
	85	#define VIRTIO_SPI_RX_TX_SUPPORT_OCTAL _BITUL(2)
	86	__u8 tx_nbits_supported;
	87	__u8 rx_nbits_supported;
	88	__le32 bits_per_word_mask;
	89	#define VIRTIO_SPI_MF_SUPPORT_CPHA_0 _BITUL(0)
	90	#define VIRTIO_SPI_MF_SUPPORT_CPHA_1 _BITUL(1)
	91	#define VIRTIO_SPI_MF_SUPPORT_CPOL_0 _BITUL(2)
	92	#define VIRTIO_SPI_MF_SUPPORT_CPOL_1 _BITUL(3)
	93	#define VIRTIO_SPI_MF_SUPPORT_CS_HIGH _BITUL(4)
	94	#define VIRTIO_SPI_MF_SUPPORT_LSB_FIRST _BITUL(5)
	95	#define VIRTIO_SPI_MF_SUPPORT_LOOPBACK _BITUL(6)
	96	__le32 mode_func_supported;
	97	__le32 max_freq_hz;
	98	__le32 max_word_delay_ns;
	99	__le32 max_cs_setup_ns;
	100	__le32 max_cs_hold_ns;
	101	__le32 max_cs_inactive_ns;
	102	};
	103
	104	/**
	105	* struct spi_transfer_head - virtio SPI transfer descriptor
	106	* @chip_select_id: chipselect index the SPI transfer used.
	107	* @bits_per_word: the number of bits in each SPI transfer word.
	108	* @cs_change: whether to deselect device after finishing this transfer
	109	* before starting the next transfer, 0 means cs keep asserted and
	110	* 1 means cs deasserted then asserted again.
	111	* @tx_nbits: bus width for write transfer.
	112	* 0,1: bus width is 1, also known as SINGLE
	113	* 2 : bus width is 2, also known as DUAL
	114	* 4 : bus width is 4, also known as QUAD
	115	* 8 : bus width is 8, also known as OCTAL
	116	* other values are invalid.
	117	* @rx_nbits: bus width for read transfer.
	118	* 0,1: bus width is 1, also known as SINGLE
	119	* 2 : bus width is 2, also known as DUAL
	120	* 4 : bus width is 4, also known as QUAD
	121	* 8 : bus width is 8, also known as OCTAL
	122	* other values are invalid.
	123	* @reserved: for future use.
	124	* @mode: SPI transfer mode.
	125	* bit 0: CPHA, determines the timing (i.e. phase) of the data
	126	* bits relative to the clock pulses.For CPHA=0, the
	127	* "out" side changes the data on the trailing edge of the
	128	* preceding clock cycle, while the "in" side captures the data
	129	* on (or shortly after) the leading edge of the clock cycle.
	130	* For CPHA=1, the "out" side changes the data on the leading
	131	* edge of the current clock cycle, while the "in" side
	132	* captures the data on (or shortly after) the trailing edge of
	133	* the clock cycle.
	134	* bit 1: CPOL, determines the polarity of the clock. CPOL=0 is a
	135	* clock which idles at 0, and each cycle consists of a pulse
	136	* of 1. CPOL=1 is a clock which idles at 1, and each cycle
	137	* consists of a pulse of 0.
	138	* bit 2: CS_HIGH, if 1, chip select active high, else active low.
	139	* bit 3: LSB_FIRST, determines per-word bits-on-wire, if 0, MSB
	140	* first, else LSB first.
	141	* bit 4: LOOP, loopback mode.
	142	* @freq: the transfer speed in Hz.
	143	* @word_delay_ns: delay to be inserted between consecutive words of a
	144	* transfer, in ns unit.
	145	* @cs_setup_ns: delay to be introduced after CS is asserted, in ns
	146	* unit.
	147	* @cs_delay_hold_ns: delay to be introduced before CS is deasserted
	148	* for each transfer, in ns unit.
	149	* @cs_change_delay_inactive_ns: delay to be introduced after CS is
	150	* deasserted and before next asserted, in ns unit.
	151	*/
	152	struct spi_transfer_head {
	153	__u8 chip_select_id;
	154	__u8 bits_per_word;
	155	__u8 cs_change;
	156	__u8 tx_nbits;
	157	__u8 rx_nbits;
	158	__u8 reserved[3];
	159	__le32 mode;
	160	__le32 freq;
	161	__le32 word_delay_ns;
	162	__le32 cs_setup_ns;
	163	__le32 cs_delay_hold_ns;
	164	__le32 cs_change_delay_inactive_ns;
	165	};
	166
	167	/**
	168	* struct spi_transfer_result - virtio SPI transfer result
	169	* @result: Transfer result code.
	170	* VIRTIO_SPI_TRANS_OK: Transfer successful.
	171	* VIRTIO_SPI_PARAM_ERR: Parameter error.
	172	* VIRTIO_SPI_TRANS_ERR: Transfer error.
	173	*/
	174	struct spi_transfer_result {
	175	#define VIRTIO_SPI_TRANS_OK 0
	176	#define VIRTIO_SPI_PARAM_ERR 1
	177	#define VIRTIO_SPI_TRANS_ERR 2
	178	__u8 result;
	179	};
	180
	181	#endif /* #ifndef _LINUX_VIRTIO_VIRTIO_SPI_H */

include/uapi/misc/fastrpc.h+1−1

@@ -134,7 +134,7 @@ struct fastrpc_mem_unmap { · 133 unmodified lines
134	};	134	};
135		135
136	struct fastrpc_ioctl_capability {	136	struct fastrpc_ioctl_capability {
137	__u32 domain;	137	__u32 unused; /* deprecated, ignored by the kernel */
138	__u32 attribute_id;	138	__u32 attribute_id;
139	__u32 capability; /* dsp capability */	139	__u32 capability; /* dsp capability */
140	__u32 reserved[4];	140	__u32 reserved[4];

include/uapi/misc/uacce/hisi_qm.h+1−0

@@ -31,6 +31,7 @@ struct hisi_qp_info { · 30 unmodified lines
31	#define HISI_QM_API_VER_BASE "hisi_qm_v1"	31	#define HISI_QM_API_VER_BASE "hisi_qm_v1"
32	#define HISI_QM_API_VER2_BASE "hisi_qm_v2"	32	#define HISI_QM_API_VER2_BASE "hisi_qm_v2"
33	#define HISI_QM_API_VER3_BASE "hisi_qm_v3"	33	#define HISI_QM_API_VER3_BASE "hisi_qm_v3"
		34	#define HISI_QM_API_VER5_BASE "hisi_qm_v5"
34		35
35	/* UACCE_CMD_QM_SET_QP_CTX: Set qp algorithm type */	36	/* UACCE_CMD_QM_SET_QP_CTX: Set qp algorithm type */
36	#define UACCE_CMD_QM_SET_QP_CTX _IOWR('H', 10, struct hisi_qp_ctx)	37	#define UACCE_CMD_QM_SET_QP_CTX _IOWR('H', 10, struct hisi_qp_ctx)

include/uapi/rdma/ib_user_ioctl_verbs.h+1−0

@@ -255,6 +255,7 @@ enum rdma_driver_id { · 254 unmodified lines
255	RDMA_DRIVER_SIW,	255	RDMA_DRIVER_SIW,
256	RDMA_DRIVER_ERDMA,	256	RDMA_DRIVER_ERDMA,
257	RDMA_DRIVER_MANA,	257	RDMA_DRIVER_MANA,
		258	RDMA_DRIVER_IONIC,
258	};	259	};
259		260
260	enum ib_uverbs_gid_type {	261	enum ib_uverbs_gid_type {

include/uapi/rdma/ib_user_sa.h+14−0

@@ -74,4 +74,18 @@ struct ib_user_path_rec { · 73 unmodified lines
74	__u8 preference;	74	__u8 preference;
75	};	75	};
76		76
		77	struct ib_user_service_rec {
		78	__be64 id;
		79	__u8 gid[16];
		80	__be16 pkey;
		81	__u8 reserved[2];
		82	__be32 lease;
		83	__u8 key[16];
		84	__u8 name[64];
		85	__u8 data_8[16];
		86	__be16 data_16[8];
		87	__be32 data_32[4];
		88	__be64 data_64[2];
		89	};
		90
77	#endif /* IB_USER_SA_H */	91	#endif /* IB_USER_SA_H */

include/uapi/rdma/ionic-abi.h+115−0

@@ -0,0 +1,115 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	/* Copyright (C) 2018-2025, Advanced Micro Devices, Inc */
	3
	4	#ifndef IONIC_ABI_H
	5	#define IONIC_ABI_H
	6
	7	#include <linux/types.h>
	8
	9	#define IONIC_ABI_VERSION 1
	10
	11	#define IONIC_EXPDB_64 1
	12	#define IONIC_EXPDB_128 2
	13	#define IONIC_EXPDB_256 4
	14	#define IONIC_EXPDB_512 8
	15
	16	#define IONIC_EXPDB_SQ 1
	17	#define IONIC_EXPDB_RQ 2
	18
	19	#define IONIC_CMB_ENABLE 1
	20	#define IONIC_CMB_REQUIRE 2
	21	#define IONIC_CMB_EXPDB 4
	22	#define IONIC_CMB_WC 8
	23	#define IONIC_CMB_UC 16
	24
	25	struct ionic_ctx_req {
	26	__u32 rsvd[2];
	27	};
	28
	29	struct ionic_ctx_resp {
	30	__u32 rsvd;
	31	__u32 page_shift;
	32
	33	__aligned_u64 dbell_offset;
	34
	35	__u16 version;
	36	__u8 qp_opcodes;
	37	__u8 admin_opcodes;
	38
	39	__u8 sq_qtype;
	40	__u8 rq_qtype;
	41	__u8 cq_qtype;
	42	__u8 admin_qtype;
	43
	44	__u8 max_stride;
	45	__u8 max_spec;
	46	__u8 udma_count;
	47	__u8 expdb_mask;
	48	__u8 expdb_qtypes;
	49
	50	__u8 rsvd2[3];
	51	};
	52
	53	struct ionic_qdesc {
	54	__aligned_u64 addr;
	55	__u32 size;
	56	__u16 mask;
	57	__u8 depth_log2;
	58	__u8 stride_log2;
	59	};
	60
	61	struct ionic_ah_resp {
	62	__u32 ahid;
	63	__u32 pad;
	64	};
	65
	66	struct ionic_cq_req {
	67	struct ionic_qdesc cq[2];
	68	__u8 udma_mask;
	69	__u8 rsvd[7];
	70	};
	71
	72	struct ionic_cq_resp {
	73	__u32 cqid[2];
	74	__u8 udma_mask;
	75	__u8 rsvd[7];
	76	};
	77
	78	struct ionic_qp_req {
	79	struct ionic_qdesc sq;
	80	struct ionic_qdesc rq;
	81	__u8 sq_spec;
	82	__u8 rq_spec;
	83	__u8 sq_cmb;
	84	__u8 rq_cmb;
	85	__u8 udma_mask;
	86	__u8 rsvd[3];
	87	};
	88
	89	struct ionic_qp_resp {
	90	__u32 qpid;
	91	__u8 sq_cmb;
	92	__u8 rq_cmb;
	93	__u8 udma_idx;
	94	__u8 rsvd[1];
	95	__aligned_u64 sq_cmb_offset;
	96	__aligned_u64 rq_cmb_offset;
	97	};
	98
	99	struct ionic_srq_req {
	100	struct ionic_qdesc rq;
	101	__u8 rq_spec;
	102	__u8 rq_cmb;
	103	__u8 udma_mask;
	104	__u8 rsvd[5];
	105	};
	106
	107	struct ionic_srq_resp {
	108	__u32 qpid;
	109	__u8 rq_cmb;
	110	__u8 udma_idx;
	111	__u8 rsvd[2];
	112	__aligned_u64 rq_cmb_offset;
	113	};
	114
	115	#endif /* IONIC_ABI_H */

include/uapi/rdma/irdma-abi.h+15−1

 	IRDMA_MEMREG_TYPE_MEM  = 0,
 	IRDMA_MEMREG_TYPE_QP   = 1,
 	IRDMA_MEMREG_TYPE_CQ   = 2,
+	IRDMA_MEMREG_TYPE_SRQ  = 3,
 };
 enum {
 	IRDMA_ALLOC_UCTX_USE_RAW_ATTR = 1 << 0,
 	IRDMA_ALLOC_UCTX_MIN_HW_WQ_SIZE = 1 << 1,
+	IRDMA_ALLOC_UCTX_MAX_HW_SRQ_QUANTA = 1 << 2,
+	IRDMA_SUPPORT_WQE_FORMAT_V2 = 1 << 3,
 };
 struct irdma_alloc_ucontext_req {
 	__u8 rsvd2;
 	__aligned_u64 comp_mask;
 	__u16 min_hw_wq_size;
-	__u8 rsvd3[6];
+	__u32 max_hw_srq_quanta;
+	__u8 rsvd3[2];
 };
 struct irdma_alloc_pd_resp {
 	__aligned_u64 user_shadow_area;
 };
+struct irdma_create_srq_req {
+	__aligned_u64 user_srq_buf;
+	__aligned_u64 user_shadow_area;
+};
+struct irdma_create_srq_resp {
+	__u32 srq_id;
+	__u32 srq_size;
+};
 struct irdma_create_qp_req {
 	__aligned_u64 user_wqe_bufs;
 	__aligned_u64 user_compl_ctx;

include/uapi/rdma/rdma_user_cm.h+40−2

@@ -67,7 +67,9 @@ enum { · 66 unmodified lines
67	RDMA_USER_CM_CMD_QUERY,	67	RDMA_USER_CM_CMD_QUERY,
68	RDMA_USER_CM_CMD_BIND,	68	RDMA_USER_CM_CMD_BIND,
69	RDMA_USER_CM_CMD_RESOLVE_ADDR,	69	RDMA_USER_CM_CMD_RESOLVE_ADDR,
70	RDMA_USER_CM_CMD_JOIN_MCAST	70	RDMA_USER_CM_CMD_JOIN_MCAST,
		71	RDMA_USER_CM_CMD_RESOLVE_IB_SERVICE,
		72	RDMA_USER_CM_CMD_WRITE_CM_EVENT,
71	};	73	};
72		74
73	/* See IBTA Annex A11, servies ID bytes 4 & 5 */	75	/* See IBTA Annex A11, servies ID bytes 4 & 5 */
@@ -147,7 +149,8 @@ struct rdma_ucm_resolve_route { · 73 unmodified lines
147	enum {	149	enum {
148	RDMA_USER_CM_QUERY_ADDR,	150	RDMA_USER_CM_QUERY_ADDR,
149	RDMA_USER_CM_QUERY_PATH,	151	RDMA_USER_CM_QUERY_PATH,
150	RDMA_USER_CM_QUERY_GID	152	RDMA_USER_CM_QUERY_GID,
		153	RDMA_USER_CM_QUERY_IB_SERVICE
151	};	154	};
152		155
153	struct rdma_ucm_query {	156	struct rdma_ucm_query {
@@ -187,6 +190,11 @@ struct rdma_ucm_query_path_resp { · 33 unmodified lines
187	struct ib_path_rec_data path_data[];	190	struct ib_path_rec_data path_data[];
188	};	191	};
189		192
		193	struct rdma_ucm_query_ib_service_resp {
		194	__u32 num_service_recs;
		195	struct ib_user_service_rec recs[];
		196	};
		197
190	struct rdma_ucm_conn_param {	198	struct rdma_ucm_conn_param {
191	__u32 qp_num;	199	__u32 qp_num;
192	__u32 qkey;	200	__u32 qkey;
@@ -297,6 +305,7 @@ struct rdma_ucm_event_resp { · 104 unmodified lines
297	union {	305	union {
298	struct rdma_ucm_conn_param conn;	306	struct rdma_ucm_conn_param conn;
299	struct rdma_ucm_ud_param ud;	307	struct rdma_ucm_ud_param ud;
		308	__u32 arg32[2];
300	} param;	309	} param;
301	__u32 reserved;	310	__u32 reserved;
302	struct rdma_ucm_ece ece;	311	struct rdma_ucm_ece ece;
@@ -338,4 +347,33 @@ struct rdma_ucm_migrate_resp { · 35 unmodified lines
338	__u32 events_reported;	347	__u32 events_reported;
339	};	348	};
340		349
		350	enum {
		351	RDMA_USER_CM_IB_SERVICE_FLAG_ID = 1 << 0,
		352	RDMA_USER_CM_IB_SERVICE_FLAG_NAME = 1 << 1,
		353	};
		354
		355	#define RDMA_USER_CM_IB_SERVICE_NAME_SIZE 64
		356	struct rdma_ucm_ib_service {
		357	__u64 service_id;
		358	__u8 service_name[RDMA_USER_CM_IB_SERVICE_NAME_SIZE];
		359	__u32 flags;
		360	__u32 reserved;
		361	};
		362
		363	struct rdma_ucm_resolve_ib_service {
		364	__u32 id;
		365	struct rdma_ucm_ib_service ibs;
		366	};
		367
		368	struct rdma_ucm_write_cm_event {
		369	__u32 id;
		370	__u32 reserved;
		371	__u32 event;
		372	__u32 status;
		373	union {
		374	struct rdma_ucm_conn_param conn;
		375	struct rdma_ucm_ud_param ud;
		376	__u64 arg;
		377	} param;
		378	};
341	#endif /* RDMA_USER_CM_H */	379	#endif /* RDMA_USER_CM_H */

include/uapi/scsi/fc/fc_els.h+39−19

@@ -11,6 +11,12 @@ · 10 unmodified lines
11	#include <linux/types.h>	11	#include <linux/types.h>
12	#include <asm/byteorder.h>	12	#include <asm/byteorder.h>
13		13
		14	#ifdef __KERNEL__
		15	#include <linux/stddef.h> /* for offsetof */
		16	#else
		17	#include <stddef.h> /* for offsetof */
		18	#endif
		19
14	/*	20	/*
15	* Fibre Channel Switch - Enhanced Link Services definitions.	21	* Fibre Channel Switch - Enhanced Link Services definitions.
16	* From T11 FC-LS Rev 1.2 June 7, 2005.	22	* From T11 FC-LS Rev 1.2 June 7, 2005.
@@ -1109,12 +1115,15 @@ struct fc_els_fpin { · 1092 unmodified lines
1109		1115
1110	/* Diagnostic Function Descriptor - FPIN Registration */	1116	/* Diagnostic Function Descriptor - FPIN Registration */
1111	struct fc_df_desc_fpin_reg {	1117	struct fc_df_desc_fpin_reg {
1112	__be32 desc_tag; /* FPIN Registration (0x00030001) */	1118	/* New members MUST be added within the __struct_group() macro below. */
1113	__be32 desc_len; /* Length of Descriptor (in bytes).	1119	__struct_group(fc_df_desc_fpin_reg_hdr, __hdr, /* no attrs */,
1114	* Size of descriptor excluding	1120	__be32 desc_tag; /* FPIN Registration (0x00030001) */
1115	* desc_tag and desc_len fields.	1121	__be32 desc_len; /* Length of Descriptor (in bytes).
1116	*/	1122	* Size of descriptor excluding
1117	__be32 count; /* Number of desc_tags elements */	1123	* desc_tag and desc_len fields.
		1124	*/
		1125	__be32 count; /* Number of desc_tags elements */
		1126	);
1118	__be32 desc_tags[]; /* Array of Descriptor Tags.	1127	__be32 desc_tags[]; /* Array of Descriptor Tags.
1119	* Each tag indicates a function	1128	* Each tag indicates a function
1120	* supported by the N_Port (request)	1129	* supported by the N_Port (request)
@@ -1124,33 +1133,44 @@ struct fc_df_desc_fpin_reg { · 3 unmodified lines
1124	* See ELS_FN_DTAG_xxx for tag values.	1133	* See ELS_FN_DTAG_xxx for tag values.
1125	*/	1134	*/
1126	};	1135	};
		1136	_Static_assert(offsetof(struct fc_df_desc_fpin_reg, desc_tags) == sizeof(struct fc_df_desc_fpin_reg_hdr),
		1137	"struct member likely outside of __struct_group()");
1127		1138
1128	/*	1139	/*
1129	* ELS_RDF - Register Diagnostic Functions	1140	* ELS_RDF - Register Diagnostic Functions
1130	*/	1141	*/
1131	struct fc_els_rdf {	1142	struct fc_els_rdf {
1132	__u8 fpin_cmd; /* command (0x19) */	1143	/* New members MUST be added within the __struct_group() macro below. */
1133	__u8 fpin_zero[3]; /* specified as zero - part of cmd */	1144	__struct_group(fc_els_rdf_hdr, __hdr, /* no attrs */,
1134	__be32 desc_len; /* Length of Descriptor List (in bytes).	1145	__u8 fpin_cmd; /* command (0x19) */
1135	* Size of ELS excluding fpin_cmd,	1146	__u8 fpin_zero[3]; /* specified as zero - part of cmd */
1136	* fpin_zero and desc_len fields.	1147	__be32 desc_len; /* Length of Descriptor List (in bytes).
1137	*/	1148	* Size of ELS excluding fpin_cmd,
		1149	* fpin_zero and desc_len fields.
		1150	*/
		1151	);
1138	struct fc_tlv_desc desc[]; /* Descriptor list */	1152	struct fc_tlv_desc desc[]; /* Descriptor list */
1139	};	1153	};
		1154	_Static_assert(offsetof(struct fc_els_rdf, desc) == sizeof(struct fc_els_rdf_hdr),
		1155	"struct member likely outside of __struct_group()");
1140		1156
1141	/*	1157	/*
1142	* ELS RDF LS_ACC Response.	1158	* ELS RDF LS_ACC Response.
1143	*/	1159	*/
1144	struct fc_els_rdf_resp {	1160	struct fc_els_rdf_resp {
1145	struct fc_els_ls_acc acc_hdr;	1161	/* New members MUST be added within the __struct_group() macro below. */
1146	__be32 desc_list_len; /* Length of response (in	1162	__struct_group(fc_els_rdf_resp_hdr, __hdr, /* no attrs */,
1147	* bytes). Excludes acc_hdr	1163	struct fc_els_ls_acc acc_hdr;
1148	* and desc_list_len fields.	1164	__be32 desc_list_len; /* Length of response (in
1149	*/	1165	* bytes). Excludes acc_hdr
1150	struct fc_els_lsri_desc lsri;	1166	* and desc_list_len fields.
		1167	*/
		1168	struct fc_els_lsri_desc lsri;
		1169	);
1151	struct fc_tlv_desc desc[]; /* Supported Descriptor list */	1170	struct fc_tlv_desc desc[]; /* Supported Descriptor list */
1152	};	1171	};
1153		1172	_Static_assert(offsetof(struct fc_els_rdf_resp, desc) == sizeof(struct fc_els_rdf_resp_hdr),
		1173	"struct member likely outside of __struct_group()");
1154		1174
1155	/*	1175	/*
1156	* Diagnostic Capability Descriptors for EDC ELS	1176	* Diagnostic Capability Descriptors for EDC ELS

include/uapi/sound/compress_offload.h+33−2

@@ -13,8 +13,7 @@ · 12 unmodified lines
13	#include <sound/asound.h>	13	#include <sound/asound.h>
14	#include <sound/compress_params.h>	14	#include <sound/compress_params.h>
15		15
16		16	#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 4, 1)
17	#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 3, 0)
18	/**	17	/**
19	* struct snd_compressed_buffer - compressed buffer	18	* struct snd_compressed_buffer - compressed buffer
20	* @fragment_size: size of buffer fragment in bytes	19	* @fragment_size: size of buffer fragment in bytes
@@ -56,6 +55,25 @@ struct snd_compr_tstamp { · 35 unmodified lines
56	__u32 sampling_rate;	55	__u32 sampling_rate;
57	} __attribute__((packed, aligned(4)));	56	} __attribute__((packed, aligned(4)));
58		57
		58	/**
		59	* struct snd_compr_tstamp64 - timestamp descriptor with fields in 64 bit
		60	* @byte_offset: Byte offset in ring buffer to DSP
		61	* @copied_total: Total number of bytes copied from/to ring buffer to/by DSP
		62	* @pcm_frames: Frames decoded or encoded by DSP. This field will evolve by
		63	* large steps and should only be used to monitor encoding/decoding
		64	* progress. It shall not be used for timing estimates.
		65	* @pcm_io_frames: Frames rendered or received by DSP into a mixer or an audio
		66	* output/input. This field should be used for A/V sync or time estimates.
		67	* @sampling_rate: sampling rate of audio
		68	*/
		69	struct snd_compr_tstamp64 {
		70	__u32 byte_offset;
		71	__u64 copied_total;
		72	__u64 pcm_frames;
		73	__u64 pcm_io_frames;
		74	__u32 sampling_rate;
		75	} __attribute__((packed, aligned(4)));
		76
59	/**	77	/**
60	* struct snd_compr_avail - avail descriptor	78	* struct snd_compr_avail - avail descriptor
61	* @avail: Number of bytes available in ring buffer for writing/reading	79	* @avail: Number of bytes available in ring buffer for writing/reading
@@ -66,6 +84,16 @@ struct snd_compr_avail { · 4 unmodified lines
66	struct snd_compr_tstamp tstamp;	84	struct snd_compr_tstamp tstamp;
67	} __attribute__((packed, aligned(4)));	85	} __attribute__((packed, aligned(4)));
68		86
		87	/**
		88	* struct snd_compr_avail64 - avail descriptor with tstamp in 64 bit format
		89	* @avail: Number of bytes available in ring buffer for writing/reading
		90	* @tstamp: timestamp information
		91	*/
		92	struct snd_compr_avail64 {
		93	__u64 avail;
		94	struct snd_compr_tstamp64 tstamp;
		95	} __attribute__((packed, aligned(4)));
		96
69	enum snd_compr_direction {	97	enum snd_compr_direction {
70	SND_COMPRESS_PLAYBACK = 0,	98	SND_COMPRESS_PLAYBACK = 0,
71	SND_COMPRESS_CAPTURE,	99	SND_COMPRESS_CAPTURE,
@@ -189,6 +217,7 @@ struct snd_compr_task_status { · 117 unmodified lines
189	* Note: only codec params can be changed runtime and stream params cant be	217	* Note: only codec params can be changed runtime and stream params cant be
190	* SNDRV_COMPRESS_GET_PARAMS: Query codec params	218	* SNDRV_COMPRESS_GET_PARAMS: Query codec params
191	* SNDRV_COMPRESS_TSTAMP: get the current timestamp value	219	* SNDRV_COMPRESS_TSTAMP: get the current timestamp value
		220	* SNDRV_COMPRESS_TSTAMP64: get the current timestamp value in 64 bit format
192	* SNDRV_COMPRESS_AVAIL: get the current buffer avail value.	221	* SNDRV_COMPRESS_AVAIL: get the current buffer avail value.
193	* This also queries the tstamp properties	222	* This also queries the tstamp properties
194	* SNDRV_COMPRESS_PAUSE: Pause the running stream	223	* SNDRV_COMPRESS_PAUSE: Pause the running stream
@@ -211,6 +240,8 @@ struct snd_compr_task_status { · 16 unmodified lines
211	struct snd_compr_metadata)	240	struct snd_compr_metadata)
212	#define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp)	241	#define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp)
213	#define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail)	242	#define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail)
		243	#define SNDRV_COMPRESS_TSTAMP64 _IOR('C', 0x22, struct snd_compr_tstamp64)
		244	#define SNDRV_COMPRESS_AVAIL64 _IOR('C', 0x23, struct snd_compr_avail64)
214	#define SNDRV_COMPRESS_PAUSE _IO('C', 0x30)	245	#define SNDRV_COMPRESS_PAUSE _IO('C', 0x30)
215	#define SNDRV_COMPRESS_RESUME _IO('C', 0x31)	246	#define SNDRV_COMPRESS_RESUME _IO('C', 0x31)
216	#define SNDRV_COMPRESS_START _IO('C', 0x32)	247	#define SNDRV_COMPRESS_START _IO('C', 0x32)

include/uapi/sound/compress_params.h+40−1

@@ -43,7 +43,8 @@ · 42 unmodified lines
43	#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)	43	#define SND_AUDIOCODEC_BESPOKE ((__u32) 0x0000000E)
44	#define SND_AUDIOCODEC_ALAC ((__u32) 0x0000000F)	44	#define SND_AUDIOCODEC_ALAC ((__u32) 0x0000000F)
45	#define SND_AUDIOCODEC_APE ((__u32) 0x00000010)	45	#define SND_AUDIOCODEC_APE ((__u32) 0x00000010)
46	#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_APE	46	#define SND_AUDIOCODEC_OPUS_RAW ((__u32) 0x00000011)
		47	#define SND_AUDIOCODEC_MAX SND_AUDIOCODEC_OPUS_RAW
47		48
48	/*	49	/*
49	* Profile and modes are listed with bit masks. This allows for a	50	* Profile and modes are listed with bit masks. This allows for a
@@ -324,6 +325,43 @@ struct snd_dec_ape { · 274 unmodified lines
324	__u32 seek_table_present;	325	__u32 seek_table_present;
325	} __attribute__((packed, aligned(4)));	326	} __attribute__((packed, aligned(4)));
326		327
		328	/**
		329	* struct snd_dec_opus - Opus decoder parameters (raw opus packets)
		330	* @version: Usually should be '1' but can be split into major (4 upper bits)
		331	* and minor (4 lower bits) sub-fields.
		332	* @num_channels: Number of output channels.
		333	* @pre_skip: Number of samples to discard at 48 kHz.
		334	* @sample_rate: Sample rate of original input.
		335	* @output_gain: Gain to apply when decoding (in Q7.8 format).
		336	* @mapping_family: Order and meaning of output channels. Only values 0 and 1
		337	* are expected; values 2..255 are not recommended for playback.
		338	*
		339	* @chan_map: Optional channel mapping table. Describes mapping of opus streams
		340	* to decoded channels. Fields:
		341	* @chan_map.stream_count: Number of streams encoded in each Ogg packet.
		342	* @chan_map.coupled_count: Number of streams whose decoders are used
		343	* for two channels.
		344	* @chan_map.channel_map: Which decoded channel to be used for each one.
		345	* Supports only mapping families 0 and 1,
		346	* max number of channels is 8.
		347	*
		348	* These options were extracted from RFC7845 Section 5.
		349	*/
		350
		351	struct snd_dec_opus {
		352	__u8 version;
		353	__u8 num_channels;
		354	__u16 pre_skip;
		355	__u32 sample_rate;
		356	__u16 output_gain;
		357	__u8 mapping_family;
		358	struct snd_dec_opus_ch_map {
		359	__u8 stream_count;
		360	__u8 coupled_count;
		361	__u8 channel_map[8];
		362	} chan_map;
		363	} __attribute__((packed, aligned(4)));
		364
327	union snd_codec_options {	365	union snd_codec_options {
328	struct snd_enc_wma wma;	366	struct snd_enc_wma wma;
329	struct snd_enc_vorbis vorbis;	367	struct snd_enc_vorbis vorbis;
@@ -334,6 +372,7 @@ union snd_codec_options { · 4 unmodified lines
334	struct snd_dec_wma wma_d;	372	struct snd_dec_wma wma_d;
335	struct snd_dec_alac alac_d;	373	struct snd_dec_alac alac_d;
336	struct snd_dec_ape ape_d;	374	struct snd_dec_ape ape_d;
		375	struct snd_dec_opus opus_d;
337	struct {	376	struct {
338	__u32 out_sample_rate;	377	__u32 out_sample_rate;
339	} src_d;	378	} src_d;

include/uapi/sound/intel/avs/tokens.h+15−0

@@ -133,6 +133,21 @@ enum avs_tplg_token { · 132 unmodified lines
133	AVS_TKN_PATH_FE_FMT_ID_U32 = 1902,	133	AVS_TKN_PATH_FE_FMT_ID_U32 = 1902,
134	AVS_TKN_PATH_BE_FMT_ID_U32 = 1903,	134	AVS_TKN_PATH_BE_FMT_ID_U32 = 1903,
135		135
		136	/* struct avs_tplg_path_template (conditional) */
		137	AVS_TKN_CONDPATH_TMPL_ID_U32 = 1801,
		138	AVS_TKN_CONDPATH_TMPL_SOURCE_TPLG_NAME_STRING = 2002,
		139	AVS_TKN_CONDPATH_TMPL_SOURCE_PATH_TMPL_ID_U32 = 2003,
		140	AVS_TKN_CONDPATH_TMPL_SINK_TPLG_NAME_STRING = 2004,
		141	AVS_TKN_CONDPATH_TMPL_SINK_PATH_TMPL_ID_U32 = 2005,
		142	AVS_TKN_CONDPATH_TMPL_COND_TYPE_U32 = 2006,
		143	AVS_TKN_CONDPATH_TMPL_OVERRIDABLE_BOOL = 2007,
		144	AVS_TKN_CONDPATH_TMPL_PRIORITY_U8 = 2008,
		145
		146	/* struct avs_tplg_path (conditional) */
		147	AVS_TKN_CONDPATH_ID_U32 = 1901,
		148	AVS_TKN_CONDPATH_SOURCE_PATH_ID_U32 = 2102,
		149	AVS_TKN_CONDPATH_SINK_PATH_ID_U32 = 2103,
		150
136	/* struct avs_tplg_pin_format */	151	/* struct avs_tplg_pin_format */
137	AVS_TKN_PIN_FMT_INDEX_U32 = 2201,	152	AVS_TKN_PIN_FMT_INDEX_U32 = 2201,
138	AVS_TKN_PIN_FMT_IOBS_U32 = 2202,	153	AVS_TKN_PIN_FMT_IOBS_U32 = 2202,

include/uapi/sound/snd_ar_tokens.h+18−2

 #ifndef __SND_AR_TOKENS_H__
 #define __SND_AR_TOKENS_H__
+#include <linux/types.h>
 #define APM_SUB_GRAPH_PERF_MODE_LOW_POWER	0x1
 #define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY	0x2
  *						LPAIF_WSA = 2,
  *						LPAIF_VA = 3,
  *						LPAIF_AXI = 4
+ * Possible values for MI2S
+ *						I2S_INTF_TYPE_PRIMARY = 0,
+ *						I2S_INTF_TYPE_SECONDARY = 1,
+ *						I2S_INTF_TYPE_TERTIARY = 2,
+ *						I2S_INTF_TYPE_QUATERNARY = 3,
+ *						I2S_INTF_TYPE_QUINARY = 4,
  *
  * %AR_TKN_U32_MODULE_FMT_INTERLEAVE:		PCM Interleaving
  *						PCM_INTERLEAVED = 1,
 #define AR_TKN_U32_MODULE_INSTANCE_ID		201
 #define AR_TKN_U32_MODULE_MAX_IP_PORTS		202
 #define AR_TKN_U32_MODULE_MAX_OP_PORTS		203
-#define AR_TKN_U32_MODULE_IN_PORTS		204
+#define AR_TKN_U32_MODULE_IN_PORTS		204 /* deprecated */
-#define AR_TKN_U32_MODULE_OUT_PORTS		205
+#define AR_TKN_U32_MODULE_OUT_PORTS		205 /* deprecated */
 #define AR_TKN_U32_MODULE_SRC_OP_PORT_ID	206
 #define AR_TKN_U32_MODULE_DST_IN_PORT_ID	207
 #define AR_TKN_U32_MODULE_SRC_INSTANCE_ID	208
 #define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID	260
 #define AR_TKN_U32_MODULE_LOG_MODE		261
+#define SND_SOC_AR_TPLG_MODULE_CFG_TYPE 0x01001006
+struct audioreach_module_priv_data {
+	__le32 size;	/* size in bytes of the array, including all elements */
+	__le32 type;	/* SND_SOC_AR_TPLG_MODULE_CFG_TYPE */
+	__le32 priv[2];	/* Private data for future expansion */
+	__le32 data[0];	/* config data */
+};
 #endif /* __SND_AR_TOKENS_H__ */

include/uapi/sound/sof/tokens.h+2−0

@@ -106,6 +106,8 @@ · 105 unmodified lines
106	*/	106	*/
107	#define SOF_TKN_COMP_NO_WNAME_IN_KCONTROL_NAME 417	107	#define SOF_TKN_COMP_NO_WNAME_IN_KCONTROL_NAME 417
108		108
		109	#define SOF_TKN_COMP_SCHED_DOMAIN 418
		110
109	/* SSP */	111	/* SSP */
110	#define SOF_TKN_INTEL_SSP_CLKS_CONTROL 500	112	#define SOF_TKN_INTEL_SSP_CLKS_CONTROL 500
111	#define SOF_TKN_INTEL_SSP_MCLK_ID 501	113	#define SOF_TKN_INTEL_SSP_MCLK_ID 501

@@ -51,7 +51,7 @@ · 50 unmodified lines
51	*	51	*
52	* Author: Bill Dirks <bill@thedirks.org>	52	* Author: Bill Dirks <bill@thedirks.org>
53	* Justin Schoeman	53	* Justin Schoeman
54	* Hans Verkuil <hverkuil@xs4all.nl>	54	* Hans Verkuil <hverkuil@kernel.org>
55	* et al.	55	* et al.
56	*/	56	*/
57	#ifndef _UAPI__LINUX_VIDEODEV2_H	57	#ifndef _UAPI__LINUX_VIDEODEV2_H
@@ -1607,8 +1607,8 @@ struct v4l2_bt_timings { · 1549 unmodified lines
1607	} __attribute__ ((packed));	1607	} __attribute__ ((packed));
1608		1608
1609	/* Interlaced or progressive format */	1609	/* Interlaced or progressive format */
1610	#define V4L2_DV_PROGRESSIVE 0	1610	#define V4L2_DV_PROGRESSIVE 0
1611	#define V4L2_DV_INTERLACED 1	1611	#define V4L2_DV_INTERLACED 1
1612		1612
1613	/* Polarities. If bit is not set, it is assumed to be negative polarity */	1613	/* Polarities. If bit is not set, it is assumed to be negative polarity */
1614	#define V4L2_DV_VSYNC_POS_POL 0x00000001	1614	#define V4L2_DV_VSYNC_POS_POL 0x00000001
@@ -2788,15 +2788,15 @@ struct v4l2_remove_buffers { · 1173 unmodified lines
2788	* Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.	2788	* Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
2789	* You must be root to use these ioctls. Never use these in applications!	2789	* You must be root to use these ioctls. Never use these in applications!
2790	*/	2790	*/
2791	#define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register)	2791	#define VIDIOC_DBG_S_REGISTER _IOW('V', 79, struct v4l2_dbg_register)
2792	#define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register)	2792	#define VIDIOC_DBG_G_REGISTER _IOWR('V', 80, struct v4l2_dbg_register)
2793		2793
2794	#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)	2794	#define VIDIOC_S_HW_FREQ_SEEK _IOW('V', 82, struct v4l2_hw_freq_seek)
2795	#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)	2795	#define VIDIOC_S_DV_TIMINGS _IOWR('V', 87, struct v4l2_dv_timings)
2796	#define VIDIOC_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings)	2796	#define VIDIOC_G_DV_TIMINGS _IOWR('V', 88, struct v4l2_dv_timings)
2797	#define VIDIOC_DQEVENT _IOR('V', 89, struct v4l2_event)	2797	#define VIDIOC_DQEVENT _IOR('V', 89, struct v4l2_event)
2798	#define VIDIOC_SUBSCRIBE_EVENT _IOW('V', 90, struct v4l2_event_subscription)	2798	#define VIDIOC_SUBSCRIBE_EVENT _IOW('V', 90, struct v4l2_event_subscription)
2799	#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)	2799	#define VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
2800	#define VIDIOC_CREATE_BUFS _IOWR('V', 92, struct v4l2_create_buffers)	2800	#define VIDIOC_CREATE_BUFS _IOWR('V', 92, struct v4l2_create_buffers)
2801	#define VIDIOC_PREPARE_BUF _IOWR('V', 93, struct v4l2_buffer)	2801	#define VIDIOC_PREPARE_BUF _IOWR('V', 93, struct v4l2_buffer)
2802	#define VIDIOC_G_SELECTION _IOWR('V', 94, struct v4l2_selection)	2802	#define VIDIOC_G_SELECTION _IOWR('V', 94, struct v4l2_selection)