lael-labs/linux

include/uapi/asm-generic/mman-common.h+3−0

@@ -27,6 +27,9 @@ · 26 unmodified lines
27	# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */	27	# define MAP_UNINITIALIZED 0x0 /* Don't support this flag */
28	#endif	28	#endif
29		29
		30	/* 0x0100 - 0x80000 flags are defined in asm-generic/mman.h */
		31	#define MAP_FIXED_NOREPLACE 0x100000 /* MAP_FIXED which doesn't unmap underlying mapping */
		32
30	/*	33	/*
31	* Flags for mlock	34	* Flags for mlock
32	*/	35	*/

include/uapi/asm-generic/siginfo.h+22−50

 			unsigned int _flags;	/* see ia64 si_flags */
 			unsigned long _isr;	/* isr */
 #endif
+#define __ADDR_BND_PKEY_PAD  (__alignof__(void *) < sizeof(short) ? \
+			      sizeof(short) : __alignof__(void *))
 			union {
 				/*
 				 * used when si_code=BUS_MCEERR_AR or
 				short _addr_lsb; /* LSB of the reported address */
 				/* used when si_code=SEGV_BNDERR */
 				struct {
-					void *_dummy_bnd;
+					char _dummy_bnd[__ADDR_BND_PKEY_PAD];
 					void __user *_lower;
 					void __user *_upper;
 				} _addr_bnd;
 				/* used when si_code=SEGV_PKUERR */
 				struct {
-					void *_dummy_pkey;
+					char _dummy_pkey[__ADDR_BND_PKEY_PAD];
 					__u32 _pkey;
 				} _addr_pkey;
 			};
  * SIGILL si_codes
  */
 #define ILL_ILLOPC	1	/* illegal opcode */
-#ifdef __bfin__
-# define ILL_ILLPARAOP	2	/* illegal opcode combine */
-#endif
 #define ILL_ILLOPN	2	/* illegal operand */
 #define ILL_ILLADR	3	/* illegal addressing mode */
 #define ILL_ILLTRP	4	/* illegal trap */
-#ifdef __bfin__
-# define ILL_ILLEXCPT	4	/* unrecoverable exception */
-#endif
 #define ILL_PRVOPC	5	/* privileged opcode */
 #define ILL_PRVREG	6	/* privileged register */
 #define ILL_COPROC	7	/* coprocessor error */
 #define ILL_BADSTK	8	/* internal stack error */
-#ifdef __bfin__
+#define ILL_BADIADDR	9	/* unimplemented instruction address */
-# define ILL_CPLB_VI	9	/* D/I CPLB protect violation */
+#define __ILL_BREAK	10	/* illegal break */
-# define ILL_CPLB_MISS	10	/* D/I CPLB miss */
+#define __ILL_BNDMOD	11	/* bundle-update (modification) in progress */
-# define ILL_CPLB_MULHIT 11	/* D/I CPLB multiple hit */
-#endif
-#ifdef __tile__
-# define ILL_DBLFLT	9	/* double fault */
-# define ILL_HARDWALL	10	/* user networks hardwall violation */
-#endif
-#ifdef __ia64__
-# define ILL_BADIADDR	9	/* unimplemented instruction address */
-# define __ILL_BREAK	10	/* illegal break */
-# define __ILL_BNDMOD	11	/* bundle-update (modification) in progress */
-#endif
 #define NSIGILL		11
 /*
 #define FPE_FLTRES	6	/* floating point inexact result */
 #define FPE_FLTINV	7	/* floating point invalid operation */
 #define FPE_FLTSUB	8	/* subscript out of range */
-#ifdef __frv__
+#define __FPE_DECOVF	9	/* decimal overflow */
-# define FPE_MDAOVF	9	/* media overflow */
+#define __FPE_DECDIV	10	/* decimal division by zero */
-#endif
+#define __FPE_DECERR	11	/* packed decimal error */
-#ifdef __ia64__
+#define __FPE_INVASC	12	/* invalid ASCII digit */
-# define __FPE_DECOVF	9	/* decimal overflow */
+#define __FPE_INVDEC	13	/* invalid decimal digit */
-# define __FPE_DECDIV	10	/* decimal division by zero */
+#define FPE_FLTUNK	14	/* undiagnosed floating-point exception */
-# define __FPE_DECERR	11	/* packed decimal error */
+#define FPE_CONDTRAP	15	/* trap on condition */
-# define __FPE_INVASC	12	/* invalid ASCII digit */
+#define NSIGFPE		15
-# define __FPE_INVDEC	13	/* invalid decimal digit */
-#endif
-#define NSIGFPE		13
 /*
  * SIGSEGV si_codes
  */
 #define SEGV_MAPERR	1	/* address not mapped to object */
 #define SEGV_ACCERR	2	/* invalid permissions for mapped object */
-#ifdef __bfin__
+#define SEGV_BNDERR	3	/* failed address bound checks */
-# define SEGV_STACKFLOW	3	/* stack overflow */
-#else
-# define SEGV_BNDERR	3	/* failed address bound checks */
-#endif
 #ifdef __ia64__
 # define __SEGV_PSTKOVF	4	/* paragraph stack overflow */
 #else
 # define SEGV_PKUERR	4	/* failed protection key checks */
 #endif
-#define NSIGSEGV	4
+#define SEGV_ACCADI	5	/* ADI not enabled for mapped object */
+#define SEGV_ADIDERR	6	/* Disrupting MCD error */
+#define SEGV_ADIPERR	7	/* Precise MCD exception */
+#define NSIGSEGV	7
 /*
  * SIGBUS si_codes
 #define BUS_ADRALN	1	/* invalid address alignment */
 #define BUS_ADRERR	2	/* non-existent physical address */
 #define BUS_OBJERR	3	/* object specific hardware error */
-#ifdef __bfin__
-# define BUS_OPFETCH	4	/* error from instruction fetch */
-#else
 /* hardware memory error consumed on a machine check: action required */
-# define BUS_MCEERR_AR	4
+#define BUS_MCEERR_AR	4
-#endif
 /* hardware memory error detected in process but not consumed: action optional*/
 #define BUS_MCEERR_AO	5
 #define NSIGBUS		5
 #define TRAP_TRACE	2	/* process trace trap */
 #define TRAP_BRANCH     3	/* process taken branch trap */
 #define TRAP_HWBKPT     4	/* hardware breakpoint/watchpoint */
-#ifdef __bfin__
-# define TRAP_STEP	1	/* single-step breakpoint */
-# define TRAP_TRACEFLOW	2	/* trace buffer overflow */
-# define TRAP_WATCHPT	3	/* watchpoint match */
-# define TRAP_ILLTRAP	4	/* illegal trap */
-#endif
 #define NSIGTRAP	4
 /*

include/uapi/asm-generic/unistd.h+0−163

@@ -736,169 +736,6 @@ __SYSCALL(__NR_statx, sys_statx) · 735 unmodified lines
736	#undef __NR_syscalls	736	#undef __NR_syscalls
737	#define __NR_syscalls 292	737	#define __NR_syscalls 292
738		738
739	/*
740	* All syscalls below here should go away really,
741	* these are provided for both review and as a porting
742	* help for the C library version.
743	*
744	* Last chance: are any of these important enough to
745	* enable by default?
746	*/
747	#ifdef __ARCH_WANT_SYSCALL_NO_AT
748	#define __NR_open 1024
749	__SYSCALL(__NR_open, sys_open)
750	#define __NR_link 1025
751	__SYSCALL(__NR_link, sys_link)
752	#define __NR_unlink 1026
753	__SYSCALL(__NR_unlink, sys_unlink)
754	#define __NR_mknod 1027
755	__SYSCALL(__NR_mknod, sys_mknod)
756	#define __NR_chmod 1028
757	__SYSCALL(__NR_chmod, sys_chmod)
758	#define __NR_chown 1029
759	__SYSCALL(__NR_chown, sys_chown)
760	#define __NR_mkdir 1030
761	__SYSCALL(__NR_mkdir, sys_mkdir)
762	#define __NR_rmdir 1031
763	__SYSCALL(__NR_rmdir, sys_rmdir)
764	#define __NR_lchown 1032
765	__SYSCALL(__NR_lchown, sys_lchown)
766	#define __NR_access 1033
767	__SYSCALL(__NR_access, sys_access)
768	#define __NR_rename 1034
769	__SYSCALL(__NR_rename, sys_rename)
770	#define __NR_readlink 1035
771	__SYSCALL(__NR_readlink, sys_readlink)
772	#define __NR_symlink 1036
773	__SYSCALL(__NR_symlink, sys_symlink)
774	#define __NR_utimes 1037
775	__SYSCALL(__NR_utimes, sys_utimes)
776	#define __NR3264_stat 1038
777	__SC_3264(__NR3264_stat, sys_stat64, sys_newstat)
778	#define __NR3264_lstat 1039
779	__SC_3264(__NR3264_lstat, sys_lstat64, sys_newlstat)
780
781	#undef __NR_syscalls
782	#define __NR_syscalls (__NR3264_lstat+1)
783	#endif /* __ARCH_WANT_SYSCALL_NO_AT */
784
785	#ifdef __ARCH_WANT_SYSCALL_NO_FLAGS
786	#define __NR_pipe 1040
787	__SYSCALL(__NR_pipe, sys_pipe)
788	#define __NR_dup2 1041
789	__SYSCALL(__NR_dup2, sys_dup2)
790	#define __NR_epoll_create 1042
791	__SYSCALL(__NR_epoll_create, sys_epoll_create)
792	#define __NR_inotify_init 1043
793	__SYSCALL(__NR_inotify_init, sys_inotify_init)
794	#define __NR_eventfd 1044
795	__SYSCALL(__NR_eventfd, sys_eventfd)
796	#define __NR_signalfd 1045
797	__SYSCALL(__NR_signalfd, sys_signalfd)
798
799	#undef __NR_syscalls
800	#define __NR_syscalls (__NR_signalfd+1)
801	#endif /* __ARCH_WANT_SYSCALL_NO_FLAGS */
802
803	#if (__BITS_PER_LONG == 32 \|\| defined(__SYSCALL_COMPAT)) && \
804	defined(__ARCH_WANT_SYSCALL_OFF_T)
805	#define __NR_sendfile 1046
806	__SYSCALL(__NR_sendfile, sys_sendfile)
807	#define __NR_ftruncate 1047
808	__SYSCALL(__NR_ftruncate, sys_ftruncate)
809	#define __NR_truncate 1048
810	__SYSCALL(__NR_truncate, sys_truncate)
811	#define __NR_stat 1049
812	__SYSCALL(__NR_stat, sys_newstat)
813	#define __NR_lstat 1050
814	__SYSCALL(__NR_lstat, sys_newlstat)
815	#define __NR_fstat 1051
816	__SYSCALL(__NR_fstat, sys_newfstat)
817	#define __NR_fcntl 1052
818	__SYSCALL(__NR_fcntl, sys_fcntl)
819	#define __NR_fadvise64 1053
820	#define __ARCH_WANT_SYS_FADVISE64
821	__SYSCALL(__NR_fadvise64, sys_fadvise64)
822	#define __NR_newfstatat 1054
823	#define __ARCH_WANT_SYS_NEWFSTATAT
824	__SYSCALL(__NR_newfstatat, sys_newfstatat)
825	#define __NR_fstatfs 1055
826	__SYSCALL(__NR_fstatfs, sys_fstatfs)
827	#define __NR_statfs 1056
828	__SYSCALL(__NR_statfs, sys_statfs)
829	#define __NR_lseek 1057
830	__SYSCALL(__NR_lseek, sys_lseek)
831	#define __NR_mmap 1058
832	__SYSCALL(__NR_mmap, sys_mmap)
833
834	#undef __NR_syscalls
835	#define __NR_syscalls (__NR_mmap+1)
836	#endif /* 32 bit off_t syscalls */
837
838	#ifdef __ARCH_WANT_SYSCALL_DEPRECATED
839	#define __NR_alarm 1059
840	#define __ARCH_WANT_SYS_ALARM
841	__SYSCALL(__NR_alarm, sys_alarm)
842	#define __NR_getpgrp 1060
843	#define __ARCH_WANT_SYS_GETPGRP
844	__SYSCALL(__NR_getpgrp, sys_getpgrp)
845	#define __NR_pause 1061
846	#define __ARCH_WANT_SYS_PAUSE
847	__SYSCALL(__NR_pause, sys_pause)
848	#define __NR_time 1062
849	#define __ARCH_WANT_SYS_TIME
850	#define __ARCH_WANT_COMPAT_SYS_TIME
851	__SYSCALL(__NR_time, sys_time)
852	#define __NR_utime 1063
853	#define __ARCH_WANT_SYS_UTIME
854	__SYSCALL(__NR_utime, sys_utime)
855
856	#define __NR_creat 1064
857	__SYSCALL(__NR_creat, sys_creat)
858	#define __NR_getdents 1065
859	#define __ARCH_WANT_SYS_GETDENTS
860	__SYSCALL(__NR_getdents, sys_getdents)
861	#define __NR_futimesat 1066
862	__SYSCALL(__NR_futimesat, sys_futimesat)
863	#define __NR_select 1067
864	#define __ARCH_WANT_SYS_SELECT
865	__SYSCALL(__NR_select, sys_select)
866	#define __NR_poll 1068
867	__SYSCALL(__NR_poll, sys_poll)
868	#define __NR_epoll_wait 1069
869	__SYSCALL(__NR_epoll_wait, sys_epoll_wait)
870	#define __NR_ustat 1070
871	__SYSCALL(__NR_ustat, sys_ustat)
872	#define __NR_vfork 1071
873	__SYSCALL(__NR_vfork, sys_vfork)
874	#define __NR_oldwait4 1072
875	__SYSCALL(__NR_oldwait4, sys_wait4)
876	#define __NR_recv 1073
877	__SYSCALL(__NR_recv, sys_recv)
878	#define __NR_send 1074
879	__SYSCALL(__NR_send, sys_send)
880	#define __NR_bdflush 1075
881	__SYSCALL(__NR_bdflush, sys_bdflush)
882	#define __NR_umount 1076
883	__SYSCALL(__NR_umount, sys_oldumount)
884	#define __ARCH_WANT_SYS_OLDUMOUNT
885	#define __NR_uselib 1077
886	__SYSCALL(__NR_uselib, sys_uselib)
887	#define __NR__sysctl 1078
888	__SYSCALL(__NR__sysctl, sys_sysctl)
889
890	#define __NR_fork 1079
891	#ifdef CONFIG_MMU
892	__SYSCALL(__NR_fork, sys_fork)
893	#else
894	__SYSCALL(__NR_fork, sys_ni_syscall)
895	#endif /* CONFIG_MMU */
896
897	#undef __NR_syscalls
898	#define __NR_syscalls (__NR_fork+1)
899
900	#endif /* __ARCH_WANT_SYSCALL_DEPRECATED */
901
902	/*	739	/*
903	* 32 bit systems traditionally used different	740	* 32 bit systems traditionally used different
904	* syscalls for off_t and loff_t arguments, while	741	* syscalls for off_t and loff_t arguments, while

include/uapi/linux/batadv_packet.h+3−12

 /* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
-/* Copyright (C) 2007-2017  B.A.T.M.A.N. contributors:
+/* Copyright (C) 2007-2018  B.A.T.M.A.N. contributors:
  *
  * Marek Lindner, Simon Wunderlich
  *
 	__be16 group;		/* group id */
 };
-#pragma pack()
 /**
  * struct batadv_ogm_packet - ogm (routing protocol) packet
  * @packet_type: batman-adv packet type, part of the general header
 	__u8   reserved;
 	__u8   tq;
 	__be16 tvlv_len;
-	/* __packed is not needed as the struct size is divisible by 4,
-	 * and the largest data type in this struct has a size of 4.
-	 */
 };
 #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet)
 	__u8   orig[ETH_ALEN];
 	__be16 tvlv_len;
 	__be32 throughput;
-	/* __packed is not needed as the struct size is divisible by 4,
-	 * and the largest data type in this struct has a size of 4.
-	 */
 };
 #define BATADV_OGM2_HLEN sizeof(struct batadv_ogm2_packet)
  * misalignment of the payload after the ethernet header. It may also lead to
  * leakage of information when the padding it not initialized before sending.
  */
-#pragma pack(2)
 /**
  * struct batadv_unicast_packet - unicast packet for network payload
 	__be16 coded_len;
 };
-#pragma pack()
 /**
  * struct batadv_unicast_tvlv_packet - generic unicast packet with tvlv payload
  * @packet_type: batman-adv packet type, part of the general header
 	__u8 reserved[3];
 };
+#pragma pack()
 #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */

include/uapi/linux/batman_adv.h+83−1

@@ -1,5 +1,5 @@
1	/* SPDX-License-Identifier: MIT */	1	/* SPDX-License-Identifier: MIT */
2	/* Copyright (C) 2016-2017 B.A.T.M.A.N. contributors:	2	/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors:
3	*	3	*
4	* Matthias Schiffer	4	* Matthias Schiffer
5	*	5	*
@@ -91,6 +91,53 @@ enum batadv_tt_client_flags { · 85 unmodified lines
91	BATADV_TT_CLIENT_TEMP = (1 << 11),	91	BATADV_TT_CLIENT_TEMP = (1 << 11),
92	};	92	};
93		93
		94	/**
		95	* enum batadv_mcast_flags_priv - Private, own multicast flags
		96	*
		97	* These are internal, multicast related flags. Currently they describe certain
		98	* multicast related attributes of the segment this originator bridges into the
		99	* mesh.
		100	*
		101	* Those attributes are used to determine the public multicast flags this
		102	* originator is going to announce via TT.
		103	*
		104	* For netlink, if BATADV_MCAST_FLAGS_BRIDGED is unset then all querier
		105	* related flags are undefined.
		106	*/
		107	enum batadv_mcast_flags_priv {
		108	/**
		109	* @BATADV_MCAST_FLAGS_BRIDGED: There is a bridge on top of the mesh
		110	* interface.
		111	*/
		112	BATADV_MCAST_FLAGS_BRIDGED = (1 << 0),
		113
		114	/**
		115	* @BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS: Whether an IGMP querier
		116	* exists in the mesh
		117	*/
		118	BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS = (1 << 1),
		119
		120	/**
		121	* @BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS: Whether an MLD querier
		122	* exists in the mesh
		123	*/
		124	BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS = (1 << 2),
		125
		126	/**
		127	* @BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING: If an IGMP querier
		128	* exists, whether it is potentially shadowing multicast listeners
		129	* (i.e. querier is behind our own bridge segment)
		130	*/
		131	BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING = (1 << 3),
		132
		133	/**
		134	* @BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING: If an MLD querier
		135	* exists, whether it is potentially shadowing multicast listeners
		136	* (i.e. querier is behind our own bridge segment)
		137	*/
		138	BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),
		139	};
		140
94	/**	141	/**
95	* enum batadv_nl_attrs - batman-adv netlink attributes	142	* enum batadv_nl_attrs - batman-adv netlink attributes
96	*/	143	*/
@@ -272,6 +319,31 @@ enum batadv_nl_attrs { · 175 unmodified lines
272	*/	319	*/
273	BATADV_ATTR_BLA_CRC,	320	BATADV_ATTR_BLA_CRC,
274		321
		322	/**
		323	* @BATADV_ATTR_DAT_CACHE_IP4ADDRESS: Client IPv4 address
		324	*/
		325	BATADV_ATTR_DAT_CACHE_IP4ADDRESS,
		326
		327	/**
		328	* @BATADV_ATTR_DAT_CACHE_HWADDRESS: Client MAC address
		329	*/
		330	BATADV_ATTR_DAT_CACHE_HWADDRESS,
		331
		332	/**
		333	* @BATADV_ATTR_DAT_CACHE_VID: VLAN ID
		334	*/
		335	BATADV_ATTR_DAT_CACHE_VID,
		336
		337	/**
		338	* @BATADV_ATTR_MCAST_FLAGS: Per originator multicast flags
		339	*/
		340	BATADV_ATTR_MCAST_FLAGS,
		341
		342	/**
		343	* @BATADV_ATTR_MCAST_FLAGS_PRIV: Private, own multicast flags
		344	*/
		345	BATADV_ATTR_MCAST_FLAGS_PRIV,
		346
275	/* add attributes above here, update the policy in netlink.c */	347	/* add attributes above here, update the policy in netlink.c */
276		348
277	/**	349	/**
@@ -361,6 +433,16 @@ enum batadv_nl_commands { · 83 unmodified lines
361	*/	433	*/
362	BATADV_CMD_GET_BLA_BACKBONE,	434	BATADV_CMD_GET_BLA_BACKBONE,
363		435
		436	/**
		437	* @BATADV_CMD_GET_DAT_CACHE: Query list of DAT cache entries
		438	*/
		439	BATADV_CMD_GET_DAT_CACHE,
		440
		441	/**
		442	* @BATADV_CMD_GET_MCAST_FLAGS: Query list of multicast flags
		443	*/
		444	BATADV_CMD_GET_MCAST_FLAGS,
		445
364	/* add new commands above here */	446	/* add new commands above here */
365		447
366	/**	448	/**

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

@@ -101,7 +101,7 @@ enum blktrace_notify { · 100 unmodified lines
101	struct blk_io_trace {	101	struct blk_io_trace {
102	__u32 magic; /* MAGIC << 8 \| version */	102	__u32 magic; /* MAGIC << 8 \| version */
103	__u32 sequence; /* event number */	103	__u32 sequence; /* event number */
104	__u64 time; /* in microseconds */	104	__u64 time; /* in nanoseconds */
105	__u64 sector; /* disk offset */	105	__u64 sector; /* disk offset */
106	__u32 bytes; /* transfer length */	106	__u32 bytes; /* transfer length */
107	__u32 action; /* what happened */	107	__u32 action; /* what happened */

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

@@ -94,6 +94,7 @@ enum bpf_cmd { · 93 unmodified lines
94	BPF_MAP_GET_FD_BY_ID,	94	BPF_MAP_GET_FD_BY_ID,
95	BPF_OBJ_GET_INFO_BY_FD,	95	BPF_OBJ_GET_INFO_BY_FD,
96	BPF_PROG_QUERY,	96	BPF_PROG_QUERY,
		97	BPF_RAW_TRACEPOINT_OPEN,
97	};	98	};
98		99
99	enum bpf_map_type {	100	enum bpf_map_type {
@@ -133,6 +134,9 @@ enum bpf_prog_type { · 33 unmodified lines
133	BPF_PROG_TYPE_SOCK_OPS,	134	BPF_PROG_TYPE_SOCK_OPS,
134	BPF_PROG_TYPE_SK_SKB,	135	BPF_PROG_TYPE_SK_SKB,
135	BPF_PROG_TYPE_CGROUP_DEVICE,	136	BPF_PROG_TYPE_CGROUP_DEVICE,
		137	BPF_PROG_TYPE_SK_MSG,
		138	BPF_PROG_TYPE_RAW_TRACEPOINT,
		139	BPF_PROG_TYPE_CGROUP_SOCK_ADDR,
136	};	140	};
137		141
138	enum bpf_attach_type {	142	enum bpf_attach_type {
@@ -143,6 +147,13 @@ enum bpf_attach_type { · 4 unmodified lines
143	BPF_SK_SKB_STREAM_PARSER,	147	BPF_SK_SKB_STREAM_PARSER,
144	BPF_SK_SKB_STREAM_VERDICT,	148	BPF_SK_SKB_STREAM_VERDICT,
145	BPF_CGROUP_DEVICE,	149	BPF_CGROUP_DEVICE,
		150	BPF_SK_MSG_VERDICT,
		151	BPF_CGROUP_INET4_BIND,
		152	BPF_CGROUP_INET6_BIND,
		153	BPF_CGROUP_INET4_CONNECT,
		154	BPF_CGROUP_INET6_CONNECT,
		155	BPF_CGROUP_INET4_POST_BIND,
		156	BPF_CGROUP_INET6_POST_BIND,
146	__MAX_BPF_ATTACH_TYPE	157	__MAX_BPF_ATTACH_TYPE
147	};	158	};
148		159
@@ -231,6 +242,28 @@ enum bpf_attach_type { · 82 unmodified lines
231	#define BPF_F_RDONLY (1U << 3)	242	#define BPF_F_RDONLY (1U << 3)
232	#define BPF_F_WRONLY (1U << 4)	243	#define BPF_F_WRONLY (1U << 4)
233		244
		245	/* Flag for stack_map, store build_id+offset instead of pointer */
		246	#define BPF_F_STACK_BUILD_ID (1U << 5)
		247
		248	enum bpf_stack_build_id_status {
		249	/* user space need an empty entry to identify end of a trace */
		250	BPF_STACK_BUILD_ID_EMPTY = 0,
		251	/* with valid build_id and offset */
		252	BPF_STACK_BUILD_ID_VALID = 1,
		253	/* couldn't get build_id, fallback to ip */
		254	BPF_STACK_BUILD_ID_IP = 2,
		255	};
		256
		257	#define BPF_BUILD_ID_SIZE 20
		258	struct bpf_stack_build_id {
		259	__s32 status;
		260	unsigned char build_id[BPF_BUILD_ID_SIZE];
		261	union {
		262	__u64 offset;
		263	__u64 ip;
		264	};
		265	};
		266
234	union bpf_attr {	267	union bpf_attr {
235	struct { /* anonymous struct used by BPF_MAP_CREATE command */	268	struct { /* anonymous struct used by BPF_MAP_CREATE command */
236	__u32 map_type; /* one of enum bpf_map_type */	269	__u32 map_type; /* one of enum bpf_map_type */
@@ -270,6 +303,11 @@ union bpf_attr { · 33 unmodified lines
270	__u32 prog_flags;	303	__u32 prog_flags;
271	char prog_name[BPF_OBJ_NAME_LEN];	304	char prog_name[BPF_OBJ_NAME_LEN];
272	__u32 prog_ifindex; /* ifindex of netdev to prep for */	305	__u32 prog_ifindex; /* ifindex of netdev to prep for */
		306	/* For some prog types expected attach type must be known at
		307	* load time to verify attach type specific parts of prog
		308	* (context accesses, allowed helpers, etc).
		309	*/
		310	__u32 expected_attach_type;
273	};	311	};
274		312
275	struct { /* anonymous struct used by BPF_OBJ_* commands */	313	struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -320,6 +358,11 @@ union bpf_attr { · 44 unmodified lines
320	__aligned_u64 prog_ids;	358	__aligned_u64 prog_ids;
321	__u32 prog_cnt;	359	__u32 prog_cnt;
322	} query;	360	} query;
		361
		362	struct {
		363	__u64 name;
		364	__u32 prog_fd;
		365	} raw_tracepoint;
323	} __attribute__((aligned(8)));	366	} __attribute__((aligned(8)));
324		367
325	/* BPF helper function descriptions:	368	/* BPF helper function descriptions:
@@ -696,6 +739,22 @@ union bpf_attr { · 370 unmodified lines
696	* int bpf_override_return(pt_regs, rc)	739	* int bpf_override_return(pt_regs, rc)
697	* @pt_regs: pointer to struct pt_regs	740	* @pt_regs: pointer to struct pt_regs
698	* @rc: the return value to set	741	* @rc: the return value to set
		742	*
		743	* int bpf_msg_redirect_map(map, key, flags)
		744	* Redirect msg to a sock in map using key as a lookup key for the
		745	* sock in map.
		746	* @map: pointer to sockmap
		747	* @key: key to lookup sock in map
		748	* @flags: reserved for future use
		749	* Return: SK_PASS
		750	*
		751	* int bpf_bind(ctx, addr, addr_len)
		752	* Bind socket to address. Only binding to IP is supported, no port can be
		753	* set in addr.
		754	* @ctx: pointer to context of type bpf_sock_addr
		755	* @addr: pointer to struct sockaddr to bind socket to
		756	* @addr_len: length of sockaddr structure
		757	* Return: 0 on success or negative error code
699	*/	758	*/
700	#define __BPF_FUNC_MAPPER(FN) \	759	#define __BPF_FUNC_MAPPER(FN) \
701	FN(unspec), \	760	FN(unspec), \
@@ -757,7 +816,12 @@ union bpf_attr { · 55 unmodified lines
757	FN(perf_prog_read_value), \	816	FN(perf_prog_read_value), \
758	FN(getsockopt), \	817	FN(getsockopt), \
759	FN(override_return), \	818	FN(override_return), \
760	FN(sock_ops_cb_flags_set),	819	FN(sock_ops_cb_flags_set), \
		820	FN(msg_redirect_map), \
		821	FN(msg_apply_bytes), \
		822	FN(msg_cork_bytes), \
		823	FN(msg_pull_data), \
		824	FN(bind),
761		825
762	/* integer value in 'imm' field of BPF_CALL instruction selects which helper	826	/* integer value in 'imm' field of BPF_CALL instruction selects which helper
763	* function eBPF program intends to call	827	* function eBPF program intends to call
@@ -800,6 +864,7 @@ enum bpf_func_id { · 36 unmodified lines
800	/* BPF_FUNC_skb_set_tunnel_key flags. */	864	/* BPF_FUNC_skb_set_tunnel_key flags. */
801	#define BPF_F_ZERO_CSUM_TX (1ULL << 1)	865	#define BPF_F_ZERO_CSUM_TX (1ULL << 1)
802	#define BPF_F_DONT_FRAGMENT (1ULL << 2)	866	#define BPF_F_DONT_FRAGMENT (1ULL << 2)
		867	#define BPF_F_SEQ_NUMBER (1ULL << 3)
803		868
804	/* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and	869	/* BPF_FUNC_perf_event_output, BPF_FUNC_perf_event_read and
805	* BPF_FUNC_perf_event_read_value flags.	870	* BPF_FUNC_perf_event_read_value flags.
@@ -885,6 +950,15 @@ struct bpf_sock { · 79 unmodified lines
885	__u32 protocol;	950	__u32 protocol;
886	__u32 mark;	951	__u32 mark;
887	__u32 priority;	952	__u32 priority;
		953	__u32 src_ip4; /* Allows 1,2,4-byte read.
		954	* Stored in network byte order.
		955	*/
		956	__u32 src_ip6[4]; /* Allows 1,2,4-byte read.
		957	* Stored in network byte order.
		958	*/
		959	__u32 src_port; /* Allows 4-byte read.
		960	* Stored in host byte order
		961	*/
888	};	962	};
889		963
890	#define XDP_PACKET_HEADROOM 256	964	#define XDP_PACKET_HEADROOM 256
@@ -919,6 +993,14 @@ enum sk_action { · 28 unmodified lines
919	SK_PASS,	993	SK_PASS,
920	};	994	};
921		995
		996	/* user accessible metadata for SK_MSG packet hook, new fields must
		997	* be added to the end of this structure
		998	*/
		999	struct sk_msg_md {
		1000	void *data;
		1001	void *data_end;
		1002	};
		1003
922	#define BPF_TAG_SIZE 8	1004	#define BPF_TAG_SIZE 8
923		1005
924	struct bpf_prog_info {	1006	struct bpf_prog_info {
@@ -952,6 +1034,26 @@ struct bpf_map_info { · 27 unmodified lines
952	__u64 netns_ino;	1034	__u64 netns_ino;
953	} __attribute__((aligned(8)));	1035	} __attribute__((aligned(8)));
954		1036
		1037	/* User bpf_sock_addr struct to access socket fields and sockaddr struct passed
		1038	* by user and intended to be used by socket (e.g. to bind to, depends on
		1039	* attach attach type).
		1040	*/
		1041	struct bpf_sock_addr {
		1042	__u32 user_family; /* Allows 4-byte read, but no write. */
		1043	__u32 user_ip4; /* Allows 1,2,4-byte read and 4-byte write.
		1044	* Stored in network byte order.
		1045	*/
		1046	__u32 user_ip6[4]; /* Allows 1,2,4-byte read an 4-byte write.
		1047	* Stored in network byte order.
		1048	*/
		1049	__u32 user_port; /* Allows 4-byte read and write.
		1050	* Stored in network byte order
		1051	*/
		1052	__u32 family; /* Allows 4-byte read, but no write */
		1053	__u32 type; /* Allows 4-byte read, but no write */
		1054	__u32 protocol; /* Allows 4-byte read, but no write */
		1055	};
		1056
955	/* User bpf_sock_ops struct to access socket values and specify request ops	1057	/* User bpf_sock_ops struct to access socket values and specify request ops
956	* and their replies.	1058	* and their replies.
957	* Some of this fields are in network (bigendian) byte order and may need	1059	* Some of this fields are in network (bigendian) byte order and may need
@@ -1106,4 +1208,8 @@ struct bpf_cgroup_dev_ctx { · 148 unmodified lines
1106	__u32 minor;	1208	__u32 minor;
1107	};	1209	};
1108		1210
		1211	struct bpf_raw_tracepoint_args {
		1212	__u64 args[0];
		1213	};
		1214
1109	#endif /* _UAPI__LINUX_BPF_H__ */	1215	#endif /* _UAPI__LINUX_BPF_H__ */

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

@@ -13,6 +13,7 @@ · 12 unmodified lines
13	struct bpf_perf_event_data {	13	struct bpf_perf_event_data {
14	bpf_user_pt_regs_t regs;	14	bpf_user_pt_regs_t regs;
15	__u64 sample_period;	15	__u64 sample_period;
		16	__u64 addr;
16	};	17	};
17		18
18	#endif /* _UAPI__LINUX_BPF_PERF_EVENT_H__ */	19	#endif /* _UAPI__LINUX_BPF_PERF_EVENT_H__ */

include/uapi/linux/cec-funcs.h+0−29

@@ -3,35 +3,6 @@ · 2 unmodified lines
3	* cec - HDMI Consumer Electronics Control message functions	3	* cec - HDMI Consumer Electronics Control message functions
4	*	4	*
5	* Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.	5	* Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
6	*
7	* This program is free software; you may redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; version 2 of the License.
10	*
11	* Alternatively you can redistribute this file under the terms of the
12	* BSD license as stated below:
13	*
14	* Redistribution and use in source and binary forms, with or without
15	* modification, are permitted provided that the following conditions
16	* are met:
17	* 1. Redistributions of source code must retain the above copyright
18	* notice, this list of conditions and the following disclaimer.
19	* 2. Redistributions in binary form must reproduce the above copyright
20	* notice, this list of conditions and the following disclaimer in
21	* the documentation and/or other materials provided with the
22	* distribution.
23	* 3. The names of its contributors may not be used to endorse or promote
24	* products derived from this software without specific prior written
25	* permission.
26	*
27	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
28	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
29	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
30	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
31	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
32	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
33	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
34	* SOFTWARE.
35	*/	6	*/
36		7
37	#ifndef _CEC_UAPI_FUNCS_H	8	#ifndef _CEC_UAPI_FUNCS_H

include/uapi/linux/cec.h+0−29

@@ -3,35 +3,6 @@ · 2 unmodified lines
3	* cec - HDMI Consumer Electronics Control public header	3	* cec - HDMI Consumer Electronics Control public header
4	*	4	*
5	* Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.	5	* Copyright 2016 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
6	*
7	* This program is free software; you may redistribute it and/or modify
8	* it under the terms of the GNU General Public License as published by
9	* the Free Software Foundation; version 2 of the License.
10	*
11	* Alternatively you can redistribute this file under the terms of the
12	* BSD license as stated below:
13	*
14	* Redistribution and use in source and binary forms, with or without
15	* modification, are permitted provided that the following conditions
16	* are met:
17	* 1. Redistributions of source code must retain the above copyright
18	* notice, this list of conditions and the following disclaimer.
19	* 2. Redistributions in binary form must reproduce the above copyright
20	* notice, this list of conditions and the following disclaimer in
21	* the documentation and/or other materials provided with the
22	* distribution.
23	* 3. The names of its contributors may not be used to endorse or promote
24	* products derived from this software without specific prior written
25	* permission.
26	*
27	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
28	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
29	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
30	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
31	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
32	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
33	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
34	* SOFTWARE.
35	*/	6	*/
36		7
37	#ifndef _CEC_UAPI_H	8	#ifndef _CEC_UAPI_H

include/uapi/linux/const.h+8−5

 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /* const.h: Macros for dealing with constants.  */
-#ifndef _LINUX_CONST_H
+#ifndef _UAPI_LINUX_CONST_H
-#define _LINUX_CONST_H
+#define _UAPI_LINUX_CONST_H
 /* Some constant macros are used in both assembler and
  * C code.  Therefore we cannot annotate them always with
 #define _AT(T,X)	((T)(X))
 #endif
-#define _BITUL(x)	(_AC(1,UL) << (x))
+#define _UL(x)		(_AC(x, UL))
-#define _BITULL(x)	(_AC(1,ULL) << (x))
+#define _ULL(x)		(_AC(x, ULL))
-#endif /* !(_LINUX_CONST_H) */
+#define _BITUL(x)	(_UL(1) << (x))
+#define _BITULL(x)	(_ULL(1) << (x))
+#endif /* _UAPI_LINUX_CONST_H */

include/uapi/linux/dm-ioctl.h+2−2

@@ -270,9 +270,9 @@ enum { · 269 unmodified lines
270	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)	270	#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
271		271
272	#define DM_VERSION_MAJOR 4	272	#define DM_VERSION_MAJOR 4
273	#define DM_VERSION_MINOR 37	273	#define DM_VERSION_MINOR 39
274	#define DM_VERSION_PATCHLEVEL 0	274	#define DM_VERSION_PATCHLEVEL 0
275	#define DM_VERSION_EXTRA "-ioctl (2017-09-20)"	275	#define DM_VERSION_EXTRA "-ioctl (2018-04-03)"
276		276
277	/* Status bits */	277	/* Status bits */
278	#define DM_READONLY_FLAG (1 << 0) /* In/Out */	278	#define DM_READONLY_FLAG (1 << 0) /* In/Out */

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

 #define NT_ARM_HW_WATCH	0x403		/* ARM hardware watchpoint registers */
 #define NT_ARM_SYSTEM_CALL	0x404	/* ARM system call number */
 #define NT_ARM_SVE	0x405		/* ARM Scalable Vector Extension registers */
-#define NT_METAG_CBUF	0x500		/* Metag catch buffer registers */
-#define NT_METAG_RPIPE	0x501		/* Metag read pipeline state */
-#define NT_METAG_TLS	0x502		/* Metag TLS pointer */
 #define NT_ARC_V2	0x600		/* ARCv2 accumulator/extra registers */
 /* Note header in a PT_NOTE section */

include/uapi/linux/ethtool.h+30−6

 	__u32	data;
 };
+#define PFC_STORM_PREVENTION_AUTO	0xffff
+#define PFC_STORM_PREVENTION_DISABLE	0
 enum tunable_id {
 	ETHTOOL_ID_UNSPEC,
 	ETHTOOL_RX_COPYBREAK,
 	ETHTOOL_TX_COPYBREAK,
+	ETHTOOL_PFC_PREVENTION_TOUT, /* timeout in msecs */
 	/*
 	 * Add your fresh new tubale attribute above and remember to update
 	 * tunable_strings[] in net/core/ethtool.c
  * @flow_type: Type of flow to be affected, e.g. %TCP_V4_FLOW
  * @data: Command-dependent value
  * @fs: Flow classification rule
+ * @rss_context: RSS context to be affected
  * @rule_cnt: Number of rules to be affected
  * @rule_locs: Array of used rule locations
  *
  * For %ETHTOOL_GRXFH and %ETHTOOL_SRXFH, @data is a bitmask indicating
  * the fields included in the flow hash, e.g. %RXH_IP_SRC.  The following
- * structure fields must not be used.
+ * structure fields must not be used, except that if @flow_type includes
+ * the %FLOW_RSS flag, then @rss_context determines which RSS context to
+ * act on.
  *
  * For %ETHTOOL_GRXRINGS, @data is set to the number of RX rings/queues
  * on return.
  * set in @data then special location values should not be used.
  *
  * For %ETHTOOL_GRXCLSRULE, @fs.@location specifies the location of an
- * existing rule on entry and @fs contains the rule on return.
+ * existing rule on entry and @fs contains the rule on return; if
+ * @fs.@flow_type includes the %FLOW_RSS flag, then @rss_context is
+ * filled with the RSS context ID associated with the rule.
  *
  * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the
  * user buffer for @rule_locs on entry.  On return, @data is the size
  * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update.
  * @fs.@location either specifies the location to use or is a special
  * location value with %RX_CLS_LOC_SPECIAL flag set.  On return,
- * @fs.@location is the actual rule location.
+ * @fs.@location is the actual rule location.  If @fs.@flow_type
+ * includes the %FLOW_RSS flag, @rss_context is the RSS context ID to
+ * use for flow spreading traffic which matches this rule.  The value
+ * from the rxfh indirection table will be added to @fs.@ring_cookie
+ * to choose which ring to deliver to.
  *
  * For %ETHTOOL_SRXCLSRLDEL, @fs.@location specifies the location of an
  * existing rule on entry.
 	__u32				flow_type;
 	__u64				data;
 	struct ethtool_rx_flow_spec	fs;
-	__u32				rule_cnt;
+	union {
+		__u32			rule_cnt;
+		__u32			rss_context;
+	};
 	__u32				rule_locs[0];
 };
 /**
  * struct ethtool_rxfh - command to get/set RX flow hash indir or/and hash key.
  * @cmd: Specific command number - %ETHTOOL_GRSSH or %ETHTOOL_SRSSH
- * @rss_context: RSS context identifier.
+ * @rss_context: RSS context identifier.  Context 0 is the default for normal
+ *	traffic; other contexts can be referenced as the destination for RX flow
+ *	classification rules.  %ETH_RXFH_CONTEXT_ALLOC is used with command
+ *	%ETHTOOL_SRSSH to allocate a new RSS context; on return this field will
+ *	contain the ID of the newly allocated context.
  * @indir_size: On entry, the array size of the user buffer for the
  *	indirection table, which may be zero, or (for %ETHTOOL_SRSSH),
  *	%ETH_RXFH_INDIR_NO_CHANGE.  On return from %ETHTOOL_GRSSH,
  * size should be returned.  For %ETHTOOL_SRSSH, an @indir_size of
  * %ETH_RXFH_INDIR_NO_CHANGE means that indir table setting is not requested
  * and a @indir_size of zero means the indir table should be reset to default
- * values. An hfunc of zero means that hash function setting is not requested.
+ * values (if @rss_context == 0) or that the RSS context should be deleted.
+ * An hfunc of zero means that hash function setting is not requested.
  */
 struct ethtool_rxfh {
 	__u32   cmd;
 	__u32	rsvd32;
 	__u32   rss_config[0];
 };
+#define ETH_RXFH_CONTEXT_ALLOC		0xffffffff
 #define ETH_RXFH_INDIR_NO_CHANGE	0xffffffff
 /**
 /* Flag to enable additional fields in struct ethtool_rx_flow_spec */
 #define	FLOW_EXT	0x80000000
 #define	FLOW_MAC_EXT	0x40000000
+/* Flag to enable RSS spreading of traffic matching rule (nfc only) */
+#define	FLOW_RSS	0x20000000
 /* L3-L4 network traffic flow hash options */
 #define	RXH_L2DA	(1 << 1)

include/uapi/linux/fib_rules.h+10−1

 	__u8		tos;
 	__u8		table;
-	__u8		res1;	/* reserved */
+	__u8		res1;   /* reserved */
 	__u8		res2;	/* reserved */
 	__u8		action;
 	__u32		end;
 };
+struct fib_rule_port_range {
+	__u16		start;
+	__u16		end;
+};
 enum {
 	FRA_UNSPEC,
 	FRA_DST,	/* destination address */
 	FRA_PAD,
 	FRA_L3MDEV,	/* iif or oif is l3mdev goto its table */
 	FRA_UID_RANGE,	/* UID range */
+	FRA_PROTOCOL,   /* Originator of the rule */
+	FRA_IP_PROTO,	/* ip proto */
+	FRA_SPORT_RANGE, /* sport */
+	FRA_DPORT_RANGE, /* dport */
 	__FRA_MAX
 };

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

@@ -89,6 +89,7 @@ · 88 unmodified lines
89	#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */	89	#define ETH_P_AOE 0x88A2 /* ATA over Ethernet */
90	#define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */	90	#define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */
91	#define ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */	91	#define ETH_P_802_EX1 0x88B5 /* 802.1 Local Experimental 1. */
		92	#define ETH_P_PREAUTH 0x88C7 /* 802.11 Preauthentication */
92	#define ETH_P_TIPC 0x88CA /* TIPC */	93	#define ETH_P_TIPC 0x88CA /* TIPC */
93	#define ETH_P_MACSEC 0x88E5 /* 802.1ae MACsec */	94	#define ETH_P_MACSEC 0x88E5 /* 802.1ae MACsec */
94	#define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */	95	#define ETH_P_8021AH 0x88E7 /* 802.1ah Backbone Service Tag */

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

@@ -941,4 +941,43 @@ enum { · 940 unmodified lines
941	IFLA_EVENT_BONDING_OPTIONS, /* change in bonding options */	941	IFLA_EVENT_BONDING_OPTIONS, /* change in bonding options */
942	};	942	};
943		943
		944	/* tun section */
		945
		946	enum {
		947	IFLA_TUN_UNSPEC,
		948	IFLA_TUN_OWNER,
		949	IFLA_TUN_GROUP,
		950	IFLA_TUN_TYPE,
		951	IFLA_TUN_PI,
		952	IFLA_TUN_VNET_HDR,
		953	IFLA_TUN_PERSIST,
		954	IFLA_TUN_MULTI_QUEUE,
		955	IFLA_TUN_NUM_QUEUES,
		956	IFLA_TUN_NUM_DISABLED_QUEUES,
		957	__IFLA_TUN_MAX,
		958	};
		959
		960	#define IFLA_TUN_MAX (__IFLA_TUN_MAX - 1)
		961
		962	/* rmnet section */
		963
		964	#define RMNET_FLAGS_INGRESS_DEAGGREGATION (1U << 0)
		965	#define RMNET_FLAGS_INGRESS_MAP_COMMANDS (1U << 1)
		966	#define RMNET_FLAGS_INGRESS_MAP_CKSUMV4 (1U << 2)
		967	#define RMNET_FLAGS_EGRESS_MAP_CKSUMV4 (1U << 3)
		968
		969	enum {
		970	IFLA_RMNET_UNSPEC,
		971	IFLA_RMNET_MUX_ID,
		972	IFLA_RMNET_FLAGS,
		973	__IFLA_RMNET_MAX,
		974	};
		975
		976	#define IFLA_RMNET_MAX (__IFLA_RMNET_MAX - 1)
		977
		978	struct ifla_rmnet_flags {
		979	__u32 flags;
		980	__u32 mask;
		981	};
		982
944	#endif /* _UAPI_LINUX_IF_LINK_H */	983	#endif /* _UAPI_LINUX_IF_LINK_H */

include/uapi/linux/inotify.h+8−0

@@ -71,5 +71,13 @@ struct inotify_event { · 70 unmodified lines
71	#define IN_CLOEXEC O_CLOEXEC	71	#define IN_CLOEXEC O_CLOEXEC
72	#define IN_NONBLOCK O_NONBLOCK	72	#define IN_NONBLOCK O_NONBLOCK
73		73
		74	/*
		75	* ioctl numbers: inotify uses 'I' prefix for all ioctls,
		76	* except historical FIONREAD, which is based on 'T'.
		77	*
		78	* INOTIFY_IOC_SETNEXTWD: set desired number of next created
		79	* watch descriptor.
		80	*/
		81	#define INOTIFY_IOC_SETNEXTWD _IOW('I', 0, __s32)
74		82
75	#endif /* _UAPI_LINUX_INOTIFY_H */	83	#endif /* _UAPI_LINUX_INOTIFY_H */

include/uapi/linux/ipmi.h+0−20

@@ -10,26 +10,6 @@ · 9 unmodified lines
10	*	10	*
11	* Copyright 2002 MontaVista Software Inc.	11	* Copyright 2002 MontaVista Software Inc.
12	*	12	*
13	* This program is free software; you can redistribute it and/or modify it
14	* under the terms of the GNU General Public License as published by the
15	* Free Software Foundation; either version 2 of the License, or (at your
16	* option) any later version.
17	*
18	*
19	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
20	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
21	* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24	* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
25	* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
27	* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
28	* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29	*
30	* You should have received a copy of the GNU General Public License along
31	* with this program; if not, write to the Free Software Foundation, Inc.,
32	* 675 Mass Ave, Cambridge, MA 02139, USA.
33	*/	13	*/
34		14
35	#ifndef _UAPI__LINUX_IPMI_H	15	#ifndef _UAPI__LINUX_IPMI_H

include/uapi/linux/ipmi_bmc.h+16−0

@@ -0,0 +1,16 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	/*
	3	* Copyright (c) 2015-2018, Intel Corporation.
	4	*/
	5
	6	#ifndef _UAPI_LINUX_IPMI_BMC_H
	7	#define _UAPI_LINUX_IPMI_BMC_H
	8
	9	#include <linux/ioctl.h>
	10
	11	#define __IPMI_BMC_IOCTL_MAGIC 0xB1
	12	#define IPMI_BMC_IOCTL_SET_SMS_ATN _IO(__IPMI_BMC_IOCTL_MAGIC, 0x00)
	13	#define IPMI_BMC_IOCTL_CLEAR_SMS_ATN _IO(__IPMI_BMC_IOCTL_MAGIC, 0x01)
	14	#define IPMI_BMC_IOCTL_FORCE_ABORT _IO(__IPMI_BMC_IOCTL_MAGIC, 0x02)
	15
	16	#endif /* _UAPI_LINUX_IPMI_BMC_H */

include/uapi/linux/ipmi_msgdefs.h+0−20

@@ -10,26 +10,6 @@ · 9 unmodified lines
10	*	10	*
11	* Copyright 2002 MontaVista Software Inc.	11	* Copyright 2002 MontaVista Software Inc.
12	*	12	*
13	* This program is free software; you can redistribute it and/or modify it
14	* under the terms of the GNU General Public License as published by the
15	* Free Software Foundation; either version 2 of the License, or (at your
16	* option) any later version.
17	*
18	*
19	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
20	* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
21	* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
23	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24	* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
25	* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
26	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
27	* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
28	* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29	*
30	* You should have received a copy of the GNU General Public License along
31	* with this program; if not, write to the Free Software Foundation, Inc.,
32	* 675 Mass Ave, Cambridge, MA 02139, USA.
33	*/	13	*/
34		14
35	#ifndef __LINUX_IPMI_MSGDEFS_H	15	#ifndef __LINUX_IPMI_MSGDEFS_H

include/uapi/linux/irda.h+0−252

@@ -1,252 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
2	/*********************************************************************
3	*
4	* Filename: irda.h
5	* Version:
6	* Description:
7	* Status: Experimental.
8	* Author: Dag Brattli <dagb@cs.uit.no>
9	* Created at: Mon Mar 8 14:06:12 1999
10	* Modified at: Sat Dec 25 16:06:42 1999
11	* Modified by: Dag Brattli <dagb@cs.uit.no>
12	*
13	* Copyright (c) 1999 Dag Brattli, All Rights Reserved.
14	*
15	* This program is free software; you can redistribute it and/or
16	* modify it under the terms of the GNU General Public License as
17	* published by the Free Software Foundation; either version 2 of
18	* the License, or (at your option) any later version.
19	*
20	* Neither Dag Brattli nor University of Tromsø admit liability nor
21	* provide warranty for any of this software. This material is
22	* provided "AS-IS" and at no charge.
23	*
24	********************************************************************/
25
26	#ifndef KERNEL_IRDA_H
27	#define KERNEL_IRDA_H
28
29	#include <linux/types.h>
30	#include <linux/socket.h>
31
32	/* Note that this file is shared with user space. */
33
34	/* Hint bit positions for first hint byte */
35	#define HINT_PNP 0x01
36	#define HINT_PDA 0x02
37	#define HINT_COMPUTER 0x04
38	#define HINT_PRINTER 0x08
39	#define HINT_MODEM 0x10
40	#define HINT_FAX 0x20
41	#define HINT_LAN 0x40
42	#define HINT_EXTENSION 0x80
43
44	/* Hint bit positions for second hint byte (first extension byte) */
45	#define HINT_TELEPHONY 0x01
46	#define HINT_FILE_SERVER 0x02
47	#define HINT_COMM 0x04
48	#define HINT_MESSAGE 0x08
49	#define HINT_HTTP 0x10
50	#define HINT_OBEX 0x20
51
52	/* IrLMP character code values */
53	#define CS_ASCII 0x00
54	#define CS_ISO_8859_1 0x01
55	#define CS_ISO_8859_2 0x02
56	#define CS_ISO_8859_3 0x03
57	#define CS_ISO_8859_4 0x04
58	#define CS_ISO_8859_5 0x05
59	#define CS_ISO_8859_6 0x06
60	#define CS_ISO_8859_7 0x07
61	#define CS_ISO_8859_8 0x08
62	#define CS_ISO_8859_9 0x09
63	#define CS_UNICODE 0xff
64
65	/* These are the currently known dongles */
66	typedef enum {
67	IRDA_TEKRAM_DONGLE = 0,
68	IRDA_ESI_DONGLE = 1,
69	IRDA_ACTISYS_DONGLE = 2,
70	IRDA_ACTISYS_PLUS_DONGLE = 3,
71	IRDA_GIRBIL_DONGLE = 4,
72	IRDA_LITELINK_DONGLE = 5,
73	IRDA_AIRPORT_DONGLE = 6,
74	IRDA_OLD_BELKIN_DONGLE = 7,
75	IRDA_EP7211_IR = 8,
76	IRDA_MCP2120_DONGLE = 9,
77	IRDA_ACT200L_DONGLE = 10,
78	IRDA_MA600_DONGLE = 11,
79	IRDA_TOIM3232_DONGLE = 12,
80	IRDA_EP7211_DONGLE = 13,
81	} IRDA_DONGLE;
82
83	/* Protocol types to be used for SOCK_DGRAM */
84	enum {
85	IRDAPROTO_UNITDATA = 0,
86	IRDAPROTO_ULTRA = 1,
87	IRDAPROTO_MAX
88	};
89
90	#define SOL_IRLMP 266 /* Same as SOL_IRDA for now */
91	#define SOL_IRTTP 266 /* Same as SOL_IRDA for now */
92
93	#define IRLMP_ENUMDEVICES 1 /* Return discovery log */
94	#define IRLMP_IAS_SET 2 /* Set an attribute in local IAS */
95	#define IRLMP_IAS_QUERY 3 /* Query remote IAS for attribute */
96	#define IRLMP_HINTS_SET 4 /* Set hint bits advertised */
97	#define IRLMP_QOS_SET 5
98	#define IRLMP_QOS_GET 6
99	#define IRLMP_MAX_SDU_SIZE 7
100	#define IRLMP_IAS_GET 8 /* Get an attribute from local IAS */
101	#define IRLMP_IAS_DEL 9 /* Remove attribute from local IAS */
102	#define IRLMP_HINT_MASK_SET 10 /* Set discovery filter */
103	#define IRLMP_WAITDEVICE 11 /* Wait for a new discovery */
104
105	#define IRTTP_MAX_SDU_SIZE IRLMP_MAX_SDU_SIZE /* Compatibility */
106
107	#define IAS_MAX_STRING 256 /* See IrLMP 1.1, 4.3.3.2 */
108	#define IAS_MAX_OCTET_STRING 1024 /* See IrLMP 1.1, 4.3.3.2 */
109	#define IAS_MAX_CLASSNAME 60 /* See IrLMP 1.1, 4.3.1 */
110	#define IAS_MAX_ATTRIBNAME 60 /* See IrLMP 1.1, 4.3.3.1 */
111	#define IAS_MAX_ATTRIBNUMBER 256 /* See IrLMP 1.1, 4.3.3.1 */
112	/* For user space backward compatibility - may be fixed in kernel 2.5.X
113	* Note : need 60+1 ('\0'), make it 64 for alignement - Jean II */
114	#define IAS_EXPORT_CLASSNAME 64
115	#define IAS_EXPORT_ATTRIBNAME 256
116
117	/* Attribute type needed for struct irda_ias_set */
118	#define IAS_MISSING 0
119	#define IAS_INTEGER 1
120	#define IAS_OCT_SEQ 2
121	#define IAS_STRING 3
122
123	#define LSAP_ANY 0xff
124
125	struct sockaddr_irda {
126	__kernel_sa_family_t sir_family; /* AF_IRDA */
127	__u8 sir_lsap_sel; /* LSAP selector */
128	__u32 sir_addr; /* Device address */
129	char sir_name[25]; /* Usually <service>:IrDA:TinyTP */
130	};
131
132	struct irda_device_info {
133	__u32 saddr; /* Address of local interface */
134	__u32 daddr; /* Address of remote device */
135	char info[22]; /* Description */
136	__u8 charset; /* Charset used for description */
137	__u8 hints[2]; /* Hint bits */
138	};
139
140	struct irda_device_list {
141	__u32 len;
142	struct irda_device_info dev[1];
143	};
144
145	struct irda_ias_set {
146	char irda_class_name[IAS_EXPORT_CLASSNAME];
147	char irda_attrib_name[IAS_EXPORT_ATTRIBNAME];
148	unsigned int irda_attrib_type;
149	union {
150	unsigned int irda_attrib_int;
151	struct {
152	unsigned short len;
153	__u8 octet_seq[IAS_MAX_OCTET_STRING];
154	} irda_attrib_octet_seq;
155	struct {
156	__u8 len;
157	__u8 charset;
158	__u8 string[IAS_MAX_STRING];
159	} irda_attrib_string;
160	} attribute;
161	__u32 daddr; /* Address of device (for some queries only) */
162	};
163
164	/* Some private IOCTL's (max 16) */
165	#define SIOCSDONGLE (SIOCDEVPRIVATE + 0)
166	#define SIOCGDONGLE (SIOCDEVPRIVATE + 1)
167	#define SIOCSBANDWIDTH (SIOCDEVPRIVATE + 2)
168	#define SIOCSMEDIABUSY (SIOCDEVPRIVATE + 3)
169	#define SIOCGMEDIABUSY (SIOCDEVPRIVATE + 4)
170	#define SIOCGRECEIVING (SIOCDEVPRIVATE + 5)
171	#define SIOCSMODE (SIOCDEVPRIVATE + 6)
172	#define SIOCGMODE (SIOCDEVPRIVATE + 7)
173	#define SIOCSDTRRTS (SIOCDEVPRIVATE + 8)
174	#define SIOCGQOS (SIOCDEVPRIVATE + 9)
175
176	/* No reason to include <linux/if.h> just because of this one ;-) */
177	#define IRNAMSIZ 16
178
179	/* IrDA quality of service information (must not exceed 16 bytes) */
180	struct if_irda_qos {
181	unsigned long baudrate;
182	unsigned short data_size;
183	unsigned short window_size;
184	unsigned short min_turn_time;
185	unsigned short max_turn_time;
186	unsigned char add_bofs;
187	unsigned char link_disc;
188	};
189
190	/* For setting RTS and DTR lines of a dongle */
191	struct if_irda_line {
192	__u8 dtr;
193	__u8 rts;
194	};
195
196	/* IrDA interface configuration (data part must not exceed 16 bytes) */
197	struct if_irda_req {
198	union {
199	char ifrn_name[IRNAMSIZ]; /* if name, e.g. "irda0" */
200	} ifr_ifrn;
201
202	/* Data part */
203	union {
204	struct if_irda_line ifru_line;
205	struct if_irda_qos ifru_qos;
206	unsigned short ifru_flags;
207	unsigned int ifru_receiving;
208	unsigned int ifru_mode;
209	unsigned int ifru_dongle;
210	} ifr_ifru;
211	};
212
213	#define ifr_baudrate ifr_ifru.ifru_qos.baudrate
214	#define ifr_receiving ifr_ifru.ifru_receiving
215	#define ifr_dongle ifr_ifru.ifru_dongle
216	#define ifr_mode ifr_ifru.ifru_mode
217	#define ifr_dtr ifr_ifru.ifru_line.dtr
218	#define ifr_rts ifr_ifru.ifru_line.rts
219
220
221	/* IrDA netlink definitions */
222	#define IRDA_NL_NAME "irda"
223	#define IRDA_NL_VERSION 1
224
225	enum irda_nl_commands {
226	IRDA_NL_CMD_UNSPEC,
227	IRDA_NL_CMD_SET_MODE,
228	IRDA_NL_CMD_GET_MODE,
229
230	__IRDA_NL_CMD_AFTER_LAST
231	};
232	#define IRDA_NL_CMD_MAX (__IRDA_NL_CMD_AFTER_LAST - 1)
233
234	enum nl80211_attrs {
235	IRDA_NL_ATTR_UNSPEC,
236	IRDA_NL_ATTR_IFNAME,
237	IRDA_NL_ATTR_MODE,
238
239	__IRDA_NL_ATTR_AFTER_LAST
240	};
241	#define IRDA_NL_ATTR_MAX (__IRDA_NL_ATTR_AFTER_LAST - 1)
242
243	/* IrDA modes */
244	#define IRDA_MODE_PRIMARY 0x1
245	#define IRDA_MODE_SECONDARY 0x2
246	#define IRDA_MODE_MONITOR 0x4
247
248	#endif /* KERNEL_IRDA_H */
249
250
251
252

include/uapi/linux/ixjuser.h+0−721

@@ -1,721 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
2	#ifndef __LINUX_IXJUSER_H
3	#define __LINUX_IXJUSER_H
4
5	/******************************************************************************
6	*
7	* ixjuser.h
8	*
9	* Device Driver for Quicknet Technologies, Inc.'s Telephony cards
10	* including the Internet PhoneJACK, Internet PhoneJACK Lite,
11	* Internet PhoneJACK PCI, Internet LineJACK, Internet PhoneCARD and
12	* SmartCABLE
13	*
14	* (c) Copyright 1999-2001 Quicknet Technologies, Inc.
15	*
16	* This program is free software; you can redistribute it and/or
17	* modify it under the terms of the GNU General Public License
18	* as published by the Free Software Foundation; either version
19	* 2 of the License, or (at your option) any later version.
20	*
21	* Author: Ed Okerson, <eokerson@quicknet.net>
22	*
23	* Contributors: Greg Herlein, <gherlein@quicknet.net>
24	* David W. Erhart, <derhart@quicknet.net>
25	* John Sellers, <jsellers@quicknet.net>
26	* Mike Preston, <mpreston@quicknet.net>
27	*
28	* More information about the hardware related to this driver can be found
29	* at our website: http://www.quicknet.net
30	*
31	* Fixes:
32	*
33	* IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR
34	* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
35	* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF QUICKNET
36	* TECHNOLOGIES, INC.HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37	*
38	* QUICKNET TECHNOLOGIES, INC. SPECIFICALLY DISCLAIMS ANY WARRANTIES,
39	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
40	* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
41	* ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION
42	* TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
43	*
44	*****************************************************************************/
45
46	#include <linux/telephony.h>
47
48
49	/******************************************************************************
50	*
51	* IOCTL's used for the Quicknet Telephony Cards
52	*
53	* If you use the IXJCTL_TESTRAM command, the card must be power cycled to
54	* reset the SRAM values before further use.
55	*
56	******************************************************************************/
57
58	#define IXJCTL_DSP_RESET _IO ('q', 0xC0)
59
60	#define IXJCTL_RING PHONE_RING
61	#define IXJCTL_HOOKSTATE PHONE_HOOKSTATE
62	#define IXJCTL_MAXRINGS PHONE_MAXRINGS
63	#define IXJCTL_RING_CADENCE PHONE_RING_CADENCE
64	#define IXJCTL_RING_START PHONE_RING_START
65	#define IXJCTL_RING_STOP PHONE_RING_STOP
66
67	#define IXJCTL_CARDTYPE _IOR ('q', 0xC1, int)
68	#define IXJCTL_SERIAL _IOR ('q', 0xC2, int)
69	#define IXJCTL_DSP_TYPE _IOR ('q', 0xC3, int)
70	#define IXJCTL_DSP_VERSION _IOR ('q', 0xC4, int)
71	#define IXJCTL_VERSION _IOR ('q', 0xDA, char *)
72	#define IXJCTL_DSP_IDLE _IO ('q', 0xC5)
73	#define IXJCTL_TESTRAM _IO ('q', 0xC6)
74
75	/******************************************************************************
76	*
77	* This group of IOCTLs deal with the record settings of the DSP
78	*
79	* The IXJCTL_REC_DEPTH command sets the internal buffer depth of the DSP.
80	* Setting a lower depth reduces latency, but increases the demand of the
81	* application to service the driver without frame loss. The DSP has 480
82	* bytes of physical buffer memory for the record channel so the true
83	* maximum limit is determined by how many frames will fit in the buffer.
84	*
85	* 1 uncompressed (480 byte) 16-bit linear frame.
86	* 2 uncompressed (240 byte) 8-bit A-law/mu-law frames.
87	* 15 TrueSpeech 8.5 frames.
88	* 20 TrueSpeech 6.3,5.3,4.8 or 4.1 frames.
89	*
90	* The default in the driver is currently set to 2 frames.
91	*
92	* The IXJCTL_REC_VOLUME and IXJCTL_PLAY_VOLUME commands both use a Q8
93	* number as a parameter, 0x100 scales the signal by 1.0, 0x200 scales the
94	* signal by 2.0, 0x80 scales the signal by 0.5. No protection is given
95	* against over-scaling, if the multiplication factor times the input
96	* signal exceeds 16 bits, overflow distortion will occur. The default
97	* setting is 0x100 (1.0).
98	*
99	* The IXJCTL_REC_LEVEL returns the average signal level (not r.m.s.) on
100	* the most recently recorded frame as a 16 bit value.
101	******************************************************************************/
102
103	#define IXJCTL_REC_CODEC PHONE_REC_CODEC
104	#define IXJCTL_REC_START PHONE_REC_START
105	#define IXJCTL_REC_STOP PHONE_REC_STOP
106	#define IXJCTL_REC_DEPTH PHONE_REC_DEPTH
107	#define IXJCTL_FRAME PHONE_FRAME
108	#define IXJCTL_REC_VOLUME PHONE_REC_VOLUME
109	#define IXJCTL_REC_LEVEL PHONE_REC_LEVEL
110
111	typedef enum {
112	f300_640 = 4, f300_500, f1100, f350, f400, f480, f440, f620, f20_50,
113	f133_200, f300, f300_420, f330, f300_425, f330_440, f340, f350_400,
114	f350_440, f350_450, f360, f380_420, f392, f400_425, f400_440, f400_450,
115	f420, f425, f425_450, f425_475, f435, f440_450, f440_480, f445, f450,
116	f452, f475, f480_620, f494, f500, f520, f523, f525, f540_660, f587,
117	f590, f600, f660, f700, f740, f750, f750_1450, f770, f800, f816, f850,
118	f857_1645, f900, f900_1300, f935_1215, f941_1477, f942, f950, f950_1400,
119	f975, f1000, f1020, f1050, f1100_1750, f1140, f1200, f1209, f1330, f1336,
120	lf1366, f1380, f1400, f1477, f1600, f1633_1638, f1800, f1860
121	} IXJ_FILTER_FREQ;
122
123	typedef struct {
124	unsigned int filter;
125	IXJ_FILTER_FREQ freq;
126	char enable;
127	} IXJ_FILTER;
128
129	typedef struct {
130	char enable;
131	char en_filter;
132	unsigned int filter;
133	unsigned int on1;
134	unsigned int off1;
135	unsigned int on2;
136	unsigned int off2;
137	unsigned int on3;
138	unsigned int off3;
139	} IXJ_FILTER_CADENCE;
140
141	#define IXJCTL_SET_FILTER _IOW ('q', 0xC7, IXJ_FILTER *)
142	#define IXJCTL_SET_FILTER_RAW _IOW ('q', 0xDD, IXJ_FILTER_RAW *)
143	#define IXJCTL_GET_FILTER_HIST _IOW ('q', 0xC8, int)
144	#define IXJCTL_FILTER_CADENCE _IOW ('q', 0xD6, IXJ_FILTER_CADENCE *)
145	#define IXJCTL_PLAY_CID _IO ('q', 0xD7)
146	/******************************************************************************
147	*
148	* This IOCTL allows you to reassign values in the tone index table. The
149	* tone table has 32 entries (0 - 31), but the driver only allows entries
150	* 13 - 27 to be modified, entry 0 is reserved for silence and 1 - 12 are
151	* the standard DTMF digits and 28 - 31 are the DTMF tones for A, B, C & D.
152	* The positions used internally for Call Progress Tones are as follows:
153	* Dial Tone - 25
154	* Ring Back - 26
155	* Busy Signal - 27
156	*
157	* The freq values are calculated as:
158	* freq = cos(2 * PI * frequency / 8000)
159	*
160	* The most commonly needed values are already calculated and listed in the
161	* enum IXJ_TONE_FREQ. Each tone index can have two frequencies with
162	* different gains, if you are only using a single frequency set the unused
163	* one to 0.
164	*
165	* The gain values range from 0 to 15 indicating +6dB to -24dB in 2dB
166	* increments.
167	*
168	******************************************************************************/
169
170	typedef enum {
171	hz20 = 0x7ffa,
172	hz50 = 0x7fe5,
173	hz133 = 0x7f4c,
174	hz200 = 0x7e6b,
175	hz261 = 0x7d50, /* .63 C1 */
176	hz277 = 0x7cfa, /* .18 CS1 */
177	hz293 = 0x7c9f, /* .66 D1 */
178	hz300 = 0x7c75,
179	hz311 = 0x7c32, /* .13 DS1 */
180	hz329 = 0x7bbf, /* .63 E1 */
181	hz330 = 0x7bb8,
182	hz340 = 0x7b75,
183	hz349 = 0x7b37, /* .23 F1 */
184	hz350 = 0x7b30,
185	hz360 = 0x7ae9,
186	hz369 = 0x7aa8, /* .99 FS1 */
187	hz380 = 0x7a56,
188	hz392 = 0x79fa, /* .00 G1 */
189	hz400 = 0x79bb,
190	hz415 = 0x7941, /* .30 GS1 */
191	hz420 = 0x7918,
192	hz425 = 0x78ee,
193	hz435 = 0x7899,
194	hz440 = 0x786d, /* .00 A1 */
195	hz445 = 0x7842,
196	hz450 = 0x7815,
197	hz452 = 0x7803,
198	hz466 = 0x7784, /* .16 AS1 */
199	hz475 = 0x7731,
200	hz480 = 0x7701,
201	hz493 = 0x7685, /* .88 B1 */
202	hz494 = 0x767b,
203	hz500 = 0x7640,
204	hz520 = 0x7578,
205	hz523 = 0x7559, /* .25 C2 */
206	hz525 = 0x7544,
207	hz540 = 0x74a7,
208	hz554 = 0x7411, /* .37 CS2 */
209	hz587 = 0x72a1, /* .33 D2 */
210	hz590 = 0x727f,
211	hz600 = 0x720b,
212	hz620 = 0x711e,
213	hz622 = 0x7106, /* .25 DS2 */
214	hz659 = 0x6f3b, /* .26 E2 */
215	hz660 = 0x6f2e,
216	hz698 = 0x6d3d, /* .46 F2 */
217	hz700 = 0x6d22,
218	hz739 = 0x6b09, /* .99 FS2 */
219	hz740 = 0x6afa,
220	hz750 = 0x6a6c,
221	hz770 = 0x694b,
222	hz783 = 0x688b, /* .99 G2 */
223	hz800 = 0x678d,
224	hz816 = 0x6698,
225	hz830 = 0x65bf, /* .61 GS2 */
226	hz850 = 0x6484,
227	hz857 = 0x6414,
228	hz880 = 0x629f, /* .00 A2 */
229	hz900 = 0x6154,
230	hz932 = 0x5f35, /* .33 AS2 */
231	hz935 = 0x5f01,
232	hz941 = 0x5e9a,
233	hz942 = 0x5e88,
234	hz950 = 0x5dfd,
235	hz975 = 0x5c44,
236	hz1000 = 0x5a81,
237	hz1020 = 0x5912,
238	hz1050 = 0x56e2,
239	hz1100 = 0x5320,
240	hz1140 = 0x5007,
241	hz1200 = 0x4b3b,
242	hz1209 = 0x4a80,
243	hz1215 = 0x4a02,
244	hz1250 = 0x471c,
245	hz1300 = 0x42e0,
246	hz1330 = 0x4049,
247	hz1336 = 0x3fc4,
248	hz1366 = 0x3d22,
249	hz1380 = 0x3be4,
250	hz1400 = 0x3a1b,
251	hz1450 = 0x3596,
252	hz1477 = 0x331c,
253	hz1500 = 0x30fb,
254	hz1600 = 0x278d,
255	hz1633 = 0x2462,
256	hz1638 = 0x23e7,
257	hz1645 = 0x233a,
258	hz1750 = 0x18f8,
259	hz1800 = 0x1405,
260	hz1860 = 0xe0b,
261	hz2100 = 0xf5f6,
262	hz2130 = 0xf2f5,
263	hz2450 = 0xd3b3,
264	hz2750 = 0xb8e4
265	} IXJ_FREQ;
266
267	typedef enum {
268	C1 = hz261,
269	CS1 = hz277,
270	D1 = hz293,
271	DS1 = hz311,
272	E1 = hz329,
273	F1 = hz349,
274	FS1 = hz369,
275	G1 = hz392,
276	GS1 = hz415,
277	A1 = hz440,
278	AS1 = hz466,
279	B1 = hz493,
280	C2 = hz523,
281	CS2 = hz554,
282	D2 = hz587,
283	DS2 = hz622,
284	E2 = hz659,
285	F2 = hz698,
286	FS2 = hz739,
287	G2 = hz783,
288	GS2 = hz830,
289	A2 = hz880,
290	AS2 = hz932,
291	} IXJ_NOTE;
292
293	typedef struct {
294	int tone_index;
295	int freq0;
296	int gain0;
297	int freq1;
298	int gain1;
299	} IXJ_TONE;
300
301	#define IXJCTL_INIT_TONE _IOW ('q', 0xC9, IXJ_TONE *)
302
303	/******************************************************************************
304	*
305	* The IXJCTL_TONE_CADENCE ioctl defines tone sequences used for various
306	* Call Progress Tones (CPT). This is accomplished by setting up an array of
307	* IXJ_CADENCE_ELEMENT structures that sequentially define the states of
308	* the tone sequence. The tone_on_time and tone_off time are in
309	* 250 microsecond intervals. A pointer to this array is passed to the
310	* driver as the ce element of an IXJ_CADENCE structure. The elements_used
311	* must be set to the number of IXJ_CADENCE_ELEMENTS in the array. The
312	* termination variable defines what to do at the end of a cadence, the
313	* options are to play the cadence once and stop, to repeat the last
314	* element of the cadence indefinitely, or to repeat the entire cadence
315	* indefinitely. The ce variable is a pointer to the array of IXJ_TONE
316	* structures. If the freq0 variable is non-zero, the tone table contents
317	* for the tone_index are updated to the frequencies and gains defined. It
318	* should be noted that DTMF tones cannot be reassigned, so if DTMF tone
319	* table indexes are used in a cadence the frequency and gain variables will
320	* be ignored.
321	*
322	* If the array elements contain frequency parameters the driver will
323	* initialize the needed tone table elements and begin playing the tone,
324	* there is no preset limit on the number of elements in the cadence. If
325	* there is more than one frequency used in the cadence, sequential elements
326	* of different frequencies MUST use different tone table indexes. Only one
327	* cadence can be played at a time. It is possible to build complex
328	* cadences with multiple frequencies using 2 tone table indexes by
329	* alternating between them.
330	*
331	******************************************************************************/
332
333	typedef struct {
334	int index;
335	int tone_on_time;
336	int tone_off_time;
337	int freq0;
338	int gain0;
339	int freq1;
340	int gain1;
341	} IXJ_CADENCE_ELEMENT;
342
343	typedef enum {
344	PLAY_ONCE,
345	REPEAT_LAST_ELEMENT,
346	REPEAT_ALL
347	} IXJ_CADENCE_TERM;
348
349	typedef struct {
350	int elements_used;
351	IXJ_CADENCE_TERM termination;
352	IXJ_CADENCE_ELEMENT __user *ce;
353	} IXJ_CADENCE;
354
355	#define IXJCTL_TONE_CADENCE _IOW ('q', 0xCA, IXJ_CADENCE *)
356	/******************************************************************************
357	*
358	* This group of IOCTLs deal with the playback settings of the DSP
359	*
360	******************************************************************************/
361
362	#define IXJCTL_PLAY_CODEC PHONE_PLAY_CODEC
363	#define IXJCTL_PLAY_START PHONE_PLAY_START
364	#define IXJCTL_PLAY_STOP PHONE_PLAY_STOP
365	#define IXJCTL_PLAY_DEPTH PHONE_PLAY_DEPTH
366	#define IXJCTL_PLAY_VOLUME PHONE_PLAY_VOLUME
367	#define IXJCTL_PLAY_LEVEL PHONE_PLAY_LEVEL
368
369	/******************************************************************************
370	*
371	* This group of IOCTLs deal with the Acoustic Echo Cancellation settings
372	* of the DSP
373	*
374	* Issuing the IXJCTL_AEC_START command with a value of AEC_OFF has the
375	* same effect as IXJCTL_AEC_STOP. This is to simplify slider bar
376	* controls. IXJCTL_AEC_GET_LEVEL returns the current setting of the AEC.
377	******************************************************************************/
378	#define IXJCTL_AEC_START _IOW ('q', 0xCB, int)
379	#define IXJCTL_AEC_STOP _IO ('q', 0xCC)
380	#define IXJCTL_AEC_GET_LEVEL _IO ('q', 0xCD)
381
382	#define AEC_OFF 0
383	#define AEC_LOW 1
384	#define AEC_MED 2
385	#define AEC_HIGH 3
386	#define AEC_AUTO 4
387	#define AEC_AGC 5
388	/******************************************************************************
389	*
390	* Call Progress Tones, DTMF, etc.
391	* IXJCTL_DTMF_OOB determines if DTMF signaling is sent as Out-Of-Band
392	* only. If you pass a 1, DTMF is suppressed from the audio stream.
393	* Tone on and off times are in 250 microsecond intervals so
394	* ioctl(ixj1, IXJCTL_SET_TONE_ON_TIME, 360);
395	* will set the tone on time of board ixj1 to 360 * 250us = 90ms
396	* the default values of tone on and off times is 840 or 210ms
397	******************************************************************************/
398
399	#define IXJCTL_DTMF_READY PHONE_DTMF_READY
400	#define IXJCTL_GET_DTMF PHONE_GET_DTMF
401	#define IXJCTL_GET_DTMF_ASCII PHONE_GET_DTMF_ASCII
402	#define IXJCTL_DTMF_OOB PHONE_DTMF_OOB
403	#define IXJCTL_EXCEPTION PHONE_EXCEPTION
404	#define IXJCTL_PLAY_TONE PHONE_PLAY_TONE
405	#define IXJCTL_SET_TONE_ON_TIME PHONE_SET_TONE_ON_TIME
406	#define IXJCTL_SET_TONE_OFF_TIME PHONE_SET_TONE_OFF_TIME
407	#define IXJCTL_GET_TONE_ON_TIME PHONE_GET_TONE_ON_TIME
408	#define IXJCTL_GET_TONE_OFF_TIME PHONE_GET_TONE_OFF_TIME
409	#define IXJCTL_GET_TONE_STATE PHONE_GET_TONE_STATE
410	#define IXJCTL_BUSY PHONE_BUSY
411	#define IXJCTL_RINGBACK PHONE_RINGBACK
412	#define IXJCTL_DIALTONE PHONE_DIALTONE
413	#define IXJCTL_CPT_STOP PHONE_CPT_STOP
414
415	/******************************************************************************
416	* LineJACK specific IOCTLs
417	*
418	* The lsb 4 bits of the LED argument represent the state of each of the 4
419	* LED's on the LineJACK
420	******************************************************************************/
421
422	#define IXJCTL_SET_LED _IOW ('q', 0xCE, int)
423	#define IXJCTL_MIXER _IOW ('q', 0xCF, int)
424
425	/******************************************************************************
426	*
427	* The master volume controls use attenuation with 32 levels from 0 to -62dB
428	* with steps of 2dB each, the defines should be OR'ed together then sent
429	* as the parameter to the mixer command to change the mixer settings.
430	*
431	******************************************************************************/
432	#define MIXER_MASTER_L 0x0000
433	#define MIXER_MASTER_R 0x0100
434	#define ATT00DB 0x00
435	#define ATT02DB 0x01
436	#define ATT04DB 0x02
437	#define ATT06DB 0x03
438	#define ATT08DB 0x04
439	#define ATT10DB 0x05
440	#define ATT12DB 0x06
441	#define ATT14DB 0x07
442	#define ATT16DB 0x08
443	#define ATT18DB 0x09
444	#define ATT20DB 0x0A
445	#define ATT22DB 0x0B
446	#define ATT24DB 0x0C
447	#define ATT26DB 0x0D
448	#define ATT28DB 0x0E
449	#define ATT30DB 0x0F
450	#define ATT32DB 0x10
451	#define ATT34DB 0x11
452	#define ATT36DB 0x12
453	#define ATT38DB 0x13
454	#define ATT40DB 0x14
455	#define ATT42DB 0x15
456	#define ATT44DB 0x16
457	#define ATT46DB 0x17
458	#define ATT48DB 0x18
459	#define ATT50DB 0x19
460	#define ATT52DB 0x1A
461	#define ATT54DB 0x1B
462	#define ATT56DB 0x1C
463	#define ATT58DB 0x1D
464	#define ATT60DB 0x1E
465	#define ATT62DB 0x1F
466	#define MASTER_MUTE 0x80
467
468	/******************************************************************************
469	*
470	* The input volume controls use gain with 32 levels from +12dB to -50dB
471	* with steps of 2dB each, the defines should be OR'ed together then sent
472	* as the parameter to the mixer command to change the mixer settings.
473	*
474	******************************************************************************/
475	#define MIXER_PORT_CD_L 0x0600
476	#define MIXER_PORT_CD_R 0x0700
477	#define MIXER_PORT_LINE_IN_L 0x0800
478	#define MIXER_PORT_LINE_IN_R 0x0900
479	#define MIXER_PORT_POTS_REC 0x0C00
480	#define MIXER_PORT_MIC 0x0E00
481
482	#define GAIN12DB 0x00
483	#define GAIN10DB 0x01
484	#define GAIN08DB 0x02
485	#define GAIN06DB 0x03
486	#define GAIN04DB 0x04
487	#define GAIN02DB 0x05
488	#define GAIN00DB 0x06
489	#define GAIN_02DB 0x07
490	#define GAIN_04DB 0x08
491	#define GAIN_06DB 0x09
492	#define GAIN_08DB 0x0A
493	#define GAIN_10DB 0x0B
494	#define GAIN_12DB 0x0C
495	#define GAIN_14DB 0x0D
496	#define GAIN_16DB 0x0E
497	#define GAIN_18DB 0x0F
498	#define GAIN_20DB 0x10
499	#define GAIN_22DB 0x11
500	#define GAIN_24DB 0x12
501	#define GAIN_26DB 0x13
502	#define GAIN_28DB 0x14
503	#define GAIN_30DB 0x15
504	#define GAIN_32DB 0x16
505	#define GAIN_34DB 0x17
506	#define GAIN_36DB 0x18
507	#define GAIN_38DB 0x19
508	#define GAIN_40DB 0x1A
509	#define GAIN_42DB 0x1B
510	#define GAIN_44DB 0x1C
511	#define GAIN_46DB 0x1D
512	#define GAIN_48DB 0x1E
513	#define GAIN_50DB 0x1F
514	#define INPUT_MUTE 0x80
515
516	/******************************************************************************
517	*
518	* The POTS volume control use attenuation with 8 levels from 0dB to -28dB
519	* with steps of 4dB each, the defines should be OR'ed together then sent
520	* as the parameter to the mixer command to change the mixer settings.
521	*
522	******************************************************************************/
523	#define MIXER_PORT_POTS_PLAY 0x0F00
524
525	#define POTS_ATT_00DB 0x00
526	#define POTS_ATT_04DB 0x01
527	#define POTS_ATT_08DB 0x02
528	#define POTS_ATT_12DB 0x03
529	#define POTS_ATT_16DB 0x04
530	#define POTS_ATT_20DB 0x05
531	#define POTS_ATT_24DB 0x06
532	#define POTS_ATT_28DB 0x07
533	#define POTS_MUTE 0x80
534
535	/******************************************************************************
536	*
537	* The DAA controls the interface to the PSTN port. The driver loads the
538	* US coefficients by default, so if you live in a different country you
539	* need to load the set for your countries phone system.
540	*
541	******************************************************************************/
542	#define IXJCTL_DAA_COEFF_SET _IOW ('q', 0xD0, int)
543
544	#define DAA_US 1 /PITA 8kHz /
545	#define DAA_UK 2 /ISAR34 8kHz /
546	#define DAA_FRANCE 3 /* */
547	#define DAA_GERMANY 4
548	#define DAA_AUSTRALIA 5
549	#define DAA_JAPAN 6
550
551	/******************************************************************************
552	*
553	* Use IXJCTL_PORT to set or query the port the card is set to. If the
554	* argument is set to PORT_QUERY, the return value of the ioctl will
555	* indicate which port is currently in use, otherwise it will change the
556	* port.
557	*
558	******************************************************************************/
559	#define IXJCTL_PORT _IOW ('q', 0xD1, int)
560
561	#define PORT_QUERY 0
562	#define PORT_POTS 1
563	#define PORT_PSTN 2
564	#define PORT_SPEAKER 3
565	#define PORT_HANDSET 4
566
567	#define IXJCTL_PSTN_SET_STATE PHONE_PSTN_SET_STATE
568	#define IXJCTL_PSTN_GET_STATE PHONE_PSTN_GET_STATE
569
570	#define PSTN_ON_HOOK 0
571	#define PSTN_RINGING 1
572	#define PSTN_OFF_HOOK 2
573	#define PSTN_PULSE_DIAL 3
574
575	/******************************************************************************
576	*
577	* The DAA Analog GAIN sets 2 parameters at one time, the receive gain (AGRR),
578	* and the transmit gain (AGX). OR together the components and pass them
579	* as the parameter to IXJCTL_DAA_AGAIN. The default setting is both at 0dB.
580	*
581	******************************************************************************/
582	#define IXJCTL_DAA_AGAIN _IOW ('q', 0xD2, int)
583
584	#define AGRR00DB 0x00 /* Analog gain in receive direction 0dB */
585	#define AGRR3_5DB 0x10 /* Analog gain in receive direction 3.5dB */
586	#define AGRR06DB 0x30 /* Analog gain in receive direction 6dB */
587
588	#define AGX00DB 0x00 /* Analog gain in transmit direction 0dB */
589	#define AGX_6DB 0x04 /* Analog gain in transmit direction -6dB */
590	#define AGX3_5DB 0x08 /* Analog gain in transmit direction 3.5dB */
591	#define AGX_2_5B 0x0C /* Analog gain in transmit direction -2.5dB */
592
593	#define IXJCTL_PSTN_LINETEST _IO ('q', 0xD3)
594
595	#define IXJCTL_CID _IOR ('q', 0xD4, PHONE_CID *)
596	#define IXJCTL_VMWI _IOR ('q', 0xD8, int)
597	#define IXJCTL_CIDCW _IOW ('q', 0xD9, PHONE_CID *)
598	/******************************************************************************
599	*
600	* The wink duration is tunable with this ioctl. The default wink duration
601	* is 320ms. You do not need to use this ioctl if you do not require a
602	* different wink duration.
603	*
604	******************************************************************************/
605	#define IXJCTL_WINK_DURATION PHONE_WINK_DURATION
606
607	/******************************************************************************
608	*
609	* This ioctl will connect the POTS port to the PSTN port on the LineJACK
610	* In order for this to work properly the port selection should be set to
611	* the PSTN port with IXJCTL_PORT prior to calling this ioctl. This will
612	* enable conference calls between PSTN callers and network callers.
613	* Passing a 1 to this ioctl enables the POTS<->PSTN connection while
614	* passing a 0 turns it back off.
615	*
616	******************************************************************************/
617	#define IXJCTL_POTS_PSTN _IOW ('q', 0xD5, int)
618
619	/******************************************************************************
620	*
621	* IOCTLs added by request.
622	*
623	* IXJCTL_HZ sets the value your Linux kernel uses for HZ as defined in
624	* /usr/include/asm/param.h, this determines the fundamental
625	* frequency of the clock ticks on your Linux system. The kernel
626	* must be rebuilt if you change this value, also all modules you
627	* use (except this one) must be recompiled. The default value
628	* is 100, and you only need to use this IOCTL if you use some
629	* other value.
630	*
631	*
632	* IXJCTL_RATE sets the number of times per second that the driver polls
633	* the DSP. This value cannot be larger than HZ. By
634	* increasing both of these values, you may be able to reduce
635	* latency because the max hang time that can exist between the
636	* driver and the DSP will be reduced.
637	*
638	******************************************************************************/
639
640	#define IXJCTL_HZ _IOW ('q', 0xE0, int)
641	#define IXJCTL_RATE _IOW ('q', 0xE1, int)
642	#define IXJCTL_FRAMES_READ _IOR ('q', 0xE2, unsigned long)
643	#define IXJCTL_FRAMES_WRITTEN _IOR ('q', 0xE3, unsigned long)
644	#define IXJCTL_READ_WAIT _IOR ('q', 0xE4, unsigned long)
645	#define IXJCTL_WRITE_WAIT _IOR ('q', 0xE5, unsigned long)
646	#define IXJCTL_DRYBUFFER_READ _IOR ('q', 0xE6, unsigned long)
647	#define IXJCTL_DRYBUFFER_CLEAR _IO ('q', 0xE7)
648	#define IXJCTL_DTMF_PRESCALE _IOW ('q', 0xE8, int)
649
650	/******************************************************************************
651	*
652	* This ioctl allows the user application to control what events the driver
653	* will send signals for, and what signals it will send for which event.
654	* By default, if signaling is enabled, all events will send SIGIO when
655	* they occur. To disable signals for an event set the signal to 0.
656	*
657	******************************************************************************/
658	typedef enum {
659	SIG_DTMF_READY,
660	SIG_HOOKSTATE,
661	SIG_FLASH,
662	SIG_PSTN_RING,
663	SIG_CALLER_ID,
664	SIG_PSTN_WINK,
665	SIG_F0, SIG_F1, SIG_F2, SIG_F3,
666	SIG_FC0, SIG_FC1, SIG_FC2, SIG_FC3,
667	SIG_READ_READY = 33,
668	SIG_WRITE_READY = 34
669	} IXJ_SIGEVENT;
670
671	typedef struct {
672	unsigned int event;
673	int signal;
674	} IXJ_SIGDEF;
675
676	#define IXJCTL_SIGCTL _IOW ('q', 0xE9, IXJ_SIGDEF *)
677
678	/******************************************************************************
679	*
680	* These ioctls allow the user application to change the gain in the
681	* Smart Cable of the Internet Phone Card. Sending -1 as a value will cause
682	* return value to be the current setting. Valid values to set are 0x00 - 0x1F
683	*
684	* 11111 = +12 dB
685	* 10111 = 0 dB
686	* 00000 = -34.5 dB
687	*
688	* IXJCTL_SC_RXG sets the Receive gain
689	* IXJCTL_SC_TXG sets the Transmit gain
690	*
691	******************************************************************************/
692	#define IXJCTL_SC_RXG _IOW ('q', 0xEA, int)
693	#define IXJCTL_SC_TXG _IOW ('q', 0xEB, int)
694
695	/******************************************************************************
696	*
697	* The intercom IOCTL's short the output from one card to the input of the
698	* other and vice versa (actually done in the DSP read function). It is only
699	* necessary to execute the IOCTL on one card, but it is necessary to have
700	* both devices open to be able to detect hook switch changes. The record
701	* codec and rate of each card must match the playback codec and rate of
702	* the other card for this to work properly.
703	*
704	******************************************************************************/
705
706	#define IXJCTL_INTERCOM_START _IOW ('q', 0xFD, int)
707	#define IXJCTL_INTERCOM_STOP _IOW ('q', 0xFE, int)
708
709	/******************************************************************************
710	*
711	* new structure for accessing raw filter information
712	*
713	******************************************************************************/
714
715	typedef struct {
716	unsigned int filter;
717	char enable;
718	unsigned int coeff[19];
719	} IXJ_FILTER_RAW;
720
721	#endif

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

 		char padding[256];
 	};
+	/* 2048 is the size of the char array used to bound/pad the size
+	 * of the union that holds sync regs.
+	 */
+	#define SYNC_REGS_SIZE_BYTES 2048
 	/*
 	 * shared registers between kvm and userspace.
 	 * kvm_valid_regs specifies the register classes set by the host
 	__u64 kvm_dirty_regs;
 	union {
 		struct kvm_sync_regs regs;
-		char padding[2048];
+		char padding[SYNC_REGS_SIZE_BYTES];
 	} s;
 };
 	__u8  pad[36];
 };
+#define KVM_X86_DISABLE_EXITS_MWAIT          (1 << 0)
+#define KVM_X86_DISABLE_EXITS_HTL            (1 << 1)
+#define KVM_X86_DISABLE_EXITS_PAUSE          (1 << 2)
+#define KVM_X86_DISABLE_VALID_EXITS          (KVM_X86_DISABLE_EXITS_MWAIT | \
+                                              KVM_X86_DISABLE_EXITS_HTL | \
+                                              KVM_X86_DISABLE_EXITS_PAUSE)
 /* for KVM_ENABLE_CAP */
 struct kvm_enable_cap {
 	/* in */
 #define KVM_CAP_S390_GS 140
 #define KVM_CAP_S390_AIS 141
 #define KVM_CAP_SPAPR_TCE_VFIO 142
-#define KVM_CAP_X86_GUEST_MWAIT 143
+#define KVM_CAP_X86_DISABLE_EXITS 143
 #define KVM_CAP_ARM_USER_IRQ 144
 #define KVM_CAP_S390_CMMA_MIGRATION 145
 #define KVM_CAP_PPC_FWNMI 146
 #define KVM_CAP_PPC_GET_CPU_CHAR 151
 #define KVM_CAP_S390_BPB 152
 #define KVM_CAP_GET_MSR_FEATURES 153
+#define KVM_CAP_HYPERV_EVENTFD 154
 #ifdef KVM_CAP_IRQ_ROUTING
 #define KVM_MEMORY_ENCRYPT_REG_REGION    _IOR(KVMIO, 0xbb, struct kvm_enc_region)
 #define KVM_MEMORY_ENCRYPT_UNREG_REGION  _IOR(KVMIO, 0xbc, struct kvm_enc_region)
+/* Available with KVM_CAP_HYPERV_EVENTFD */
+#define KVM_HYPERV_EVENTFD        _IOW(KVMIO,  0xbd, struct kvm_hyperv_eventfd)
 /* Secure Encrypted Virtualization command */
 enum sev_cmd_id {
 	/* Guest initialization commands */
 #define KVM_ARM_DEV_EL1_PTIMER		(1 << 1)
 #define KVM_ARM_DEV_PMU			(1 << 2)
+struct kvm_hyperv_eventfd {
+	__u32 conn_id;
+	__s32 fd;
+	__u32 flags;
+	__u32 padding[3];
+};
+#define KVM_HYPERV_CONN_ID_MASK		0x00ffffff
+#define KVM_HYPERV_EVENTFD_DEASSIGN	(1 << 0)
 #endif /* __LINUX_KVM_H */

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

  * @RC_PROTO_SHARP: Sharp protocol
  * @RC_PROTO_XMP: XMP protocol
  * @RC_PROTO_CEC: CEC protocol
+ * @RC_PROTO_IMON: iMon Pad protocol
  */
 enum rc_proto {
 	RC_PROTO_UNKNOWN	= 0,
 	RC_PROTO_SHARP		= 20,
 	RC_PROTO_XMP		= 21,
 	RC_PROTO_CEC		= 22,
+	RC_PROTO_IMON		= 23,
 };
 #endif

include/uapi/linux/media.h+165−179

@@ -15,10 +15,6 @@ · 14 unmodified lines
15	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17	* GNU General Public License for more details.	17	* GNU General Public License for more details.
18	*
19	* You should have received a copy of the GNU General Public License
20	* along with this program; if not, write to the Free Software
21	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22	*/	18	*/
23		19
24	#ifndef __LINUX_MEDIA_H	20	#ifndef __LINUX_MEDIA_H
@@ -42,108 +38,66 @@ struct media_device_info { · 17 unmodified lines
42	__u32 reserved[31];	38	__u32 reserved[31];
43	};	39	};
44		40
45	#define MEDIA_ENT_ID_FLAG_NEXT (1 << 31)
46
47	/*
48	* Initial value to be used when a new entity is created
49	* Drivers should change it to something useful
50	*/
51	#define MEDIA_ENT_F_UNKNOWN 0x00000000
52
53	/*	41	/*
54	* Base number ranges for entity functions	42	* Base number ranges for entity functions
55	*	43	*
56	* NOTE: those ranges and entity function number are phased just to	44	* NOTE: Userspace should not rely on these ranges to identify a group
57	* make it easier to maintain this file. Userspace should not rely on	45	* of function types, as newer functions can be added with any name within
58	* the ranges to identify a group of function types, as newer	46	* the full u32 range.
59	* functions can be added with any name within the full u32 range.	47	*
60	*/	48	* Some older functions use the MEDIA_ENT_F_OLD_*_BASE range. Do not
61	#define MEDIA_ENT_F_BASE 0x00000000	49	* change this, this is for backwards compatibility. When adding new
62	#define MEDIA_ENT_F_OLD_BASE 0x00010000	50	* functions always use MEDIA_ENT_F_BASE.
63	#define MEDIA_ENT_F_OLD_SUBDEV_BASE 0x00020000
64
65	/*
66	* DVB entities
67	*/	51	*/
68	#define MEDIA_ENT_F_DTV_DEMOD (MEDIA_ENT_F_BASE + 0x00001)	52	#define MEDIA_ENT_F_BASE 0x00000000
69	#define MEDIA_ENT_F_TS_DEMUX (MEDIA_ENT_F_BASE + 0x00002)	53	#define MEDIA_ENT_F_OLD_BASE 0x00010000
70	#define MEDIA_ENT_F_DTV_CA (MEDIA_ENT_F_BASE + 0x00003)	54	#define MEDIA_ENT_F_OLD_SUBDEV_BASE 0x00020000
71	#define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 0x00004)
72		55
73	/*	56	/*
74	* I/O entities	57	* Initial value to be used when a new entity is created
		58	* Drivers should change it to something useful.
75	*/	59	*/
76	#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 0x01001)	60	#define MEDIA_ENT_F_UNKNOWN MEDIA_ENT_F_BASE
77	#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 0x01002)
78	#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 0x01003)
79		61
80	/*	62	/*
81	* Analog TV IF-PLL decoders	63	* Subdevs are initialized with MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN in order
82	*	64	* to preserve backward compatibility. Drivers must change to the proper
83	* It is a responsibility of the master/bridge drivers to create links	65	* subdev type before registering the entity.
84	* for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
85	*/	66	*/
86	#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 0x02001)	67	#define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE
87	#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 0x02002)
88		68
89	/*	69	/*
90	* Audio Entity Functions	70	* DVB entity functions
91	*/	71	*/
92	#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 0x03001)	72	#define MEDIA_ENT_F_DTV_DEMOD (MEDIA_ENT_F_BASE + 0x00001)
93	#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 0x03002)	73	#define MEDIA_ENT_F_TS_DEMUX (MEDIA_ENT_F_BASE + 0x00002)
94	#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 0x03003)	74	#define MEDIA_ENT_F_DTV_CA (MEDIA_ENT_F_BASE + 0x00003)
		75	#define MEDIA_ENT_F_DTV_NET_DECAP (MEDIA_ENT_F_BASE + 0x00004)
95		76
96	/*	77	/*
97	* Processing entities	78	* I/O entity functions
98	*/	79	*/
99	#define MEDIA_ENT_F_PROC_VIDEO_COMPOSER (MEDIA_ENT_F_BASE + 0x4001)	80	#define MEDIA_ENT_F_IO_V4L (MEDIA_ENT_F_OLD_BASE + 1)
100	#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER (MEDIA_ENT_F_BASE + 0x4002)	81	#define MEDIA_ENT_F_IO_DTV (MEDIA_ENT_F_BASE + 0x01001)
101	#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV (MEDIA_ENT_F_BASE + 0x4003)	82	#define MEDIA_ENT_F_IO_VBI (MEDIA_ENT_F_BASE + 0x01002)
102	#define MEDIA_ENT_F_PROC_VIDEO_LUT (MEDIA_ENT_F_BASE + 0x4004)	83	#define MEDIA_ENT_F_IO_SWRADIO (MEDIA_ENT_F_BASE + 0x01003)
103	#define MEDIA_ENT_F_PROC_VIDEO_SCALER (MEDIA_ENT_F_BASE + 0x4005)
104	#define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006)
105		84
106	/*	85	/*
107	* Switch and bridge entitites	86	* Sensor functions
108	*/	87	*/
109	#define MEDIA_ENT_F_VID_MUX (MEDIA_ENT_F_BASE + 0x5001)	88	#define MEDIA_ENT_F_CAM_SENSOR (MEDIA_ENT_F_OLD_SUBDEV_BASE + 1)
110	#define MEDIA_ENT_F_VID_IF_BRIDGE (MEDIA_ENT_F_BASE + 0x5002)	89	#define MEDIA_ENT_F_FLASH (MEDIA_ENT_F_OLD_SUBDEV_BASE + 2)
		90	#define MEDIA_ENT_F_LENS (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3)
111		91
112	/*	92	/*
113	* Connectors	93	* Video decoder functions
114	*/	94	*/
115	/* It is a responsibility of the entity drivers to add connectors and links */	95	#define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)
116	#ifdef __KERNEL__	96	#define MEDIA_ENT_F_DTV_DECODER (MEDIA_ENT_F_BASE + 0x6001)
117	/*
118	* For now, it should not be used in userspace, as some
119	* definitions may change
120	*/
121
122	#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001)
123	#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002)
124	#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003)
125
126	#endif
127		97
128	/*	98	/*
129	* Don't touch on those. The ranges MEDIA_ENT_F_OLD_BASE and	99	* Digital TV, analog TV, radio and/or software defined radio tuner functions.
130	* MEDIA_ENT_F_OLD_SUBDEV_BASE are kept to keep backward compatibility
131	* with the legacy v1 API.The number range is out of range by purpose:
132	* several previously reserved numbers got excluded from this range.
133	*	100	*
134	* Subdevs are initialized with MEDIA_ENT_T_V4L2_SUBDEV_UNKNOWN,
135	* in order to preserve backward compatibility.
136	* Drivers must change to the proper subdev type before
137	* registering the entity.
138	*/
139
140	#define MEDIA_ENT_F_IO_V4L (MEDIA_ENT_F_OLD_BASE + 1)
141
142	#define MEDIA_ENT_F_CAM_SENSOR (MEDIA_ENT_F_OLD_SUBDEV_BASE + 1)
143	#define MEDIA_ENT_F_FLASH (MEDIA_ENT_F_OLD_SUBDEV_BASE + 2)
144	#define MEDIA_ENT_F_LENS (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3)
145	#define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4)
146	/*
147	* It is a responsibility of the master/bridge drivers to add connectors	101	* It is a responsibility of the master/bridge drivers to add connectors
148	* and links for MEDIA_ENT_F_TUNER. Please notice that some old tuners	102	* and links for MEDIA_ENT_F_TUNER. Please notice that some old tuners
149	* may require the usage of separate I2C chips to decode analog TV signals,	103	* may require the usage of separate I2C chips to decode analog TV signals,
@@ -151,49 +105,46 @@ struct media_device_info { · 1 unmodified line
151	* On such cases, the IF-PLL staging is mapped via one or two entities:	105	* On such cases, the IF-PLL staging is mapped via one or two entities:
152	* MEDIA_ENT_F_IF_VID_DECODER and/or MEDIA_ENT_F_IF_AUD_DECODER.	106	* MEDIA_ENT_F_IF_VID_DECODER and/or MEDIA_ENT_F_IF_AUD_DECODER.
153	*/	107	*/
154	#define MEDIA_ENT_F_TUNER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 5)	108	#define MEDIA_ENT_F_TUNER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 5)
155		109
156	#define MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN MEDIA_ENT_F_OLD_SUBDEV_BASE	110	/*
		111	* Analog TV IF-PLL decoder functions
		112	*
		113	* It is a responsibility of the master/bridge drivers to create links
		114	* for MEDIA_ENT_F_IF_VID_DECODER and MEDIA_ENT_F_IF_AUD_DECODER.
		115	*/
		116	#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 0x02001)
		117	#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 0x02002)
157		118
158	#if !defined(__KERNEL__) \|\| defined(__NEED_MEDIA_LEGACY_API)	119	/*
		120	* Audio entity functions
		121	*/
		122	#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 0x03001)
		123	#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 0x03002)
		124	#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 0x03003)
159		125
160	/*	126	/*
161	* Legacy symbols used to avoid userspace compilation breakages	127	* Processing entity functions
162	*
163	* Those symbols map the entity function into types and should be
164	* used only on legacy programs for legacy hardware. Don't rely
165	* on those for MEDIA_IOC_G_TOPOLOGY.
166	*/	128	*/
167	#define MEDIA_ENT_TYPE_SHIFT 16	129	#define MEDIA_ENT_F_PROC_VIDEO_COMPOSER (MEDIA_ENT_F_BASE + 0x4001)
168	#define MEDIA_ENT_TYPE_MASK 0x00ff0000	130	#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER (MEDIA_ENT_F_BASE + 0x4002)
169	#define MEDIA_ENT_SUBTYPE_MASK 0x0000ffff	131	#define MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV (MEDIA_ENT_F_BASE + 0x4003)
170		132	#define MEDIA_ENT_F_PROC_VIDEO_LUT (MEDIA_ENT_F_BASE + 0x4004)
171	/* End of the old subdev reserved numberspace */	133	#define MEDIA_ENT_F_PROC_VIDEO_SCALER (MEDIA_ENT_F_BASE + 0x4005)
172	#define MEDIA_ENT_T_DEVNODE_UNKNOWN (MEDIA_ENT_T_DEVNODE \| \	134	#define MEDIA_ENT_F_PROC_VIDEO_STATISTICS (MEDIA_ENT_F_BASE + 0x4006)
173	MEDIA_ENT_SUBTYPE_MASK)
174
175	#define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE
176	#define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L
177	#define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_T_DEVNODE + 2)
178	#define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_T_DEVNODE + 3)
179	#define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_T_DEVNODE + 4)
180
181	#define MEDIA_ENT_T_UNKNOWN MEDIA_ENT_F_UNKNOWN
182	#define MEDIA_ENT_T_V4L2_VIDEO MEDIA_ENT_F_IO_V4L
183	#define MEDIA_ENT_T_V4L2_SUBDEV MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN
184	#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR MEDIA_ENT_F_CAM_SENSOR
185	#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH MEDIA_ENT_F_FLASH
186	#define MEDIA_ENT_T_V4L2_SUBDEV_LENS MEDIA_ENT_F_LENS
187	#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER MEDIA_ENT_F_ATV_DECODER
188	#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER MEDIA_ENT_F_TUNER
189		135
190	/* Obsolete symbol for media_version, no longer used in the kernel */	136	/*
191	#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)	137	* Switch and bridge entity functions
192	#endif	138	*/
		139	#define MEDIA_ENT_F_VID_MUX (MEDIA_ENT_F_BASE + 0x5001)
		140	#define MEDIA_ENT_F_VID_IF_BRIDGE (MEDIA_ENT_F_BASE + 0x5002)
193		141
194	/* Entity flags */	142	/* Entity flags */
195	#define MEDIA_ENT_FL_DEFAULT (1 << 0)	143	#define MEDIA_ENT_FL_DEFAULT (1 << 0)
196	#define MEDIA_ENT_FL_CONNECTOR (1 << 1)	144	#define MEDIA_ENT_FL_CONNECTOR (1 << 1)
		145
		146	/* OR with the entity id value to find the next entity */
		147	#define MEDIA_ENT_ID_FLAG_NEXT (1 << 31)
197		148
198	struct media_entity_desc {	149	struct media_entity_desc {
199	__u32 id;	150	__u32 id;
@@ -214,7 +165,7 @@ struct media_entity_desc { · 14 unmodified lines
214	__u32 minor;	165	__u32 minor;
215	} dev;	166	} dev;
216		167
217	#if 1	168	#if !defined(__KERNEL__)
218	/*	169	/*
219	* TODO: this shouldn't have been added without	170	* TODO: this shouldn't have been added without
220	* actual drivers that use this. When the first real driver	171	* actual drivers that use this. When the first real driver
@@ -225,24 +176,17 @@ struct media_entity_desc { · 4 unmodified lines
225	* contain the subdevice information. In addition, struct dev	176	* contain the subdevice information. In addition, struct dev
226	* can only refer to a single device, and not to multiple (e.g.	177	* can only refer to a single device, and not to multiple (e.g.
227	* pcm and mixer devices).	178	* pcm and mixer devices).
228	*
229	* So for now mark this as a to do.
230	*/	179	*/
231	struct {	180	struct {
232	__u32 card;	181	__u32 card;
233	__u32 device;	182	__u32 device;
234	__u32 subdevice;	183	__u32 subdevice;
235	} alsa;	184	} alsa;
236	#endif
237		185
238	#if 1
239	/*	186	/*
240	* DEPRECATED: previous node specifications. Kept just to	187	* DEPRECATED: previous node specifications. Kept just to
241	* avoid breaking compilation, but media_entity_desc.dev	188	* avoid breaking compilation. Use media_entity_desc.dev
242	* should be used instead. In particular, alsa and dvb	189	* instead.
243	* fields below are wrong: for all devnodes, there should
244	* be just major/minor inside the struct, as this is enough
245	* to represent any devnode, no matter what type.
246	*/	190	*/
247	struct {	191	struct {
248	__u32 major;	192	__u32 major;
@@ -261,9 +205,9 @@ struct media_entity_desc { · 12 unmodified lines
261	};	205	};
262	};	206	};
263		207
264	#define MEDIA_PAD_FL_SINK (1 << 0)	208	#define MEDIA_PAD_FL_SINK (1 << 0)
265	#define MEDIA_PAD_FL_SOURCE (1 << 1)	209	#define MEDIA_PAD_FL_SOURCE (1 << 1)
266	#define MEDIA_PAD_FL_MUST_CONNECT (1 << 2)	210	#define MEDIA_PAD_FL_MUST_CONNECT (1 << 2)
267		211
268	struct media_pad_desc {	212	struct media_pad_desc {
269	__u32 entity; /* entity ID */	213	__u32 entity; /* entity ID */
@@ -272,13 +216,13 @@ struct media_pad_desc { · 2 unmodified lines
272	__u32 reserved[2];	216	__u32 reserved[2];
273	};	217	};
274		218
275	#define MEDIA_LNK_FL_ENABLED (1 << 0)	219	#define MEDIA_LNK_FL_ENABLED (1 << 0)
276	#define MEDIA_LNK_FL_IMMUTABLE (1 << 1)	220	#define MEDIA_LNK_FL_IMMUTABLE (1 << 1)
277	#define MEDIA_LNK_FL_DYNAMIC (1 << 2)	221	#define MEDIA_LNK_FL_DYNAMIC (1 << 2)
278		222
279	#define MEDIA_LNK_FL_LINK_TYPE (0xf << 28)	223	#define MEDIA_LNK_FL_LINK_TYPE (0xf << 28)
280	# define MEDIA_LNK_FL_DATA_LINK (0 << 28)	224	# define MEDIA_LNK_FL_DATA_LINK (0 << 28)
281	# define MEDIA_LNK_FL_INTERFACE_LINK (1 << 28)	225	# define MEDIA_LNK_FL_INTERFACE_LINK (1 << 28)
282		226
283	struct media_link_desc {	227	struct media_link_desc {
284	struct media_pad_desc source;	228	struct media_pad_desc source;
@@ -298,57 +242,47 @@ struct media_links_enum { · 13 unmodified lines
298		242
299	/* Interface type ranges */	243	/* Interface type ranges */
300		244
301	#define MEDIA_INTF_T_DVB_BASE 0x00000100	245	#define MEDIA_INTF_T_DVB_BASE 0x00000100
302	#define MEDIA_INTF_T_V4L_BASE 0x00000200	246	#define MEDIA_INTF_T_V4L_BASE 0x00000200
303	#define MEDIA_INTF_T_ALSA_BASE 0x00000300
304		247
305	/* Interface types */	248	/* Interface types */
306		249
307	#define MEDIA_INTF_T_DVB_FE (MEDIA_INTF_T_DVB_BASE)	250	#define MEDIA_INTF_T_DVB_FE (MEDIA_INTF_T_DVB_BASE)
308	#define MEDIA_INTF_T_DVB_DEMUX (MEDIA_INTF_T_DVB_BASE + 1)	251	#define MEDIA_INTF_T_DVB_DEMUX (MEDIA_INTF_T_DVB_BASE + 1)
309	#define MEDIA_INTF_T_DVB_DVR (MEDIA_INTF_T_DVB_BASE + 2)	252	#define MEDIA_INTF_T_DVB_DVR (MEDIA_INTF_T_DVB_BASE + 2)
310	#define MEDIA_INTF_T_DVB_CA (MEDIA_INTF_T_DVB_BASE + 3)	253	#define MEDIA_INTF_T_DVB_CA (MEDIA_INTF_T_DVB_BASE + 3)
311	#define MEDIA_INTF_T_DVB_NET (MEDIA_INTF_T_DVB_BASE + 4)	254	#define MEDIA_INTF_T_DVB_NET (MEDIA_INTF_T_DVB_BASE + 4)
312		255
313	#define MEDIA_INTF_T_V4L_VIDEO (MEDIA_INTF_T_V4L_BASE)	256	#define MEDIA_INTF_T_V4L_VIDEO (MEDIA_INTF_T_V4L_BASE)
314	#define MEDIA_INTF_T_V4L_VBI (MEDIA_INTF_T_V4L_BASE + 1)	257	#define MEDIA_INTF_T_V4L_VBI (MEDIA_INTF_T_V4L_BASE + 1)
315	#define MEDIA_INTF_T_V4L_RADIO (MEDIA_INTF_T_V4L_BASE + 2)	258	#define MEDIA_INTF_T_V4L_RADIO (MEDIA_INTF_T_V4L_BASE + 2)
316	#define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3)	259	#define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3)
317	#define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4)	260	#define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4)
318	#define MEDIA_INTF_T_V4L_TOUCH (MEDIA_INTF_T_V4L_BASE + 5)	261	#define MEDIA_INTF_T_V4L_TOUCH (MEDIA_INTF_T_V4L_BASE + 5)
319		262
320	#define MEDIA_INTF_T_ALSA_PCM_CAPTURE (MEDIA_INTF_T_ALSA_BASE)	263	#if defined(__KERNEL__)
321	#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK (MEDIA_INTF_T_ALSA_BASE + 1)
322	#define MEDIA_INTF_T_ALSA_CONTROL (MEDIA_INTF_T_ALSA_BASE + 2)
323	#define MEDIA_INTF_T_ALSA_COMPRESS (MEDIA_INTF_T_ALSA_BASE + 3)
324	#define MEDIA_INTF_T_ALSA_RAWMIDI (MEDIA_INTF_T_ALSA_BASE + 4)
325	#define MEDIA_INTF_T_ALSA_HWDEP (MEDIA_INTF_T_ALSA_BASE + 5)
326	#define MEDIA_INTF_T_ALSA_SEQUENCER (MEDIA_INTF_T_ALSA_BASE + 6)
327	#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7)
328		264
329	/*	265	/*
330	* MC next gen API definitions	266	* Connector functions
331	*	267	*
332	* NOTE: The declarations below are close to the MC RFC for the Media	268	* For now these should not be used in userspace, as some definitions may
333	* Controller, the next generation. Yet, there are a few adjustments	269	* change.
334	* to do, as we want to be able to have a functional API before
335	* the MC properties change. Those will be properly marked below.
336	* Please also notice that I removed "num_pads", "num_links",
337	* from the proposal, as a proper userspace application will likely
338	* use lists for pads/links, just as we intend to do in Kernelspace.
339	* The API definition should be freed from fields that are bound to
340	* some specific data structure.
341	*	270	*
342	* FIXME: Currently, I opted to name the new types as "media_v2", as this	271	* It is the responsibility of the entity drivers to add connectors and links.
343	* won't cause any conflict with the Kernelspace namespace, nor with
344	* the previous kAPI media_*_desc namespace. This can be changed
345	* later, before the adding this API upstream.
346	*/	272	*/
		273	#define MEDIA_ENT_F_CONN_RF (MEDIA_ENT_F_BASE + 0x30001)
		274	#define MEDIA_ENT_F_CONN_SVIDEO (MEDIA_ENT_F_BASE + 0x30002)
		275	#define MEDIA_ENT_F_CONN_COMPOSITE (MEDIA_ENT_F_BASE + 0x30003)
347		276
		277	#endif
		278
		279	/*
		280	* MC next gen API definitions
		281	*/
348		282
349	struct media_v2_entity {	283	struct media_v2_entity {
350	__u32 id;	284	__u32 id;
351	char name[64]; /* FIXME: move to a property? (RFC says so) */	285	char name[64];
352	__u32 function; /* Main function of the entity */	286	__u32 function; /* Main function of the entity */
353	__u32 reserved[6];	287	__u32 reserved[6];
354	} __attribute__ ((packed));	288	} __attribute__ ((packed));
@@ -408,10 +342,62 @@ struct media_v2_topology { · 53 unmodified lines
408		342
409	/* ioctls */	343	/* ioctls */
410		344
411	#define MEDIA_IOC_DEVICE_INFO _IOWR('\|', 0x00, struct media_device_info)	345	#define MEDIA_IOC_DEVICE_INFO _IOWR('\|', 0x00, struct media_device_info)
412	#define MEDIA_IOC_ENUM_ENTITIES _IOWR('\|', 0x01, struct media_entity_desc)	346	#define MEDIA_IOC_ENUM_ENTITIES _IOWR('\|', 0x01, struct media_entity_desc)
413	#define MEDIA_IOC_ENUM_LINKS _IOWR('\|', 0x02, struct media_links_enum)	347	#define MEDIA_IOC_ENUM_LINKS _IOWR('\|', 0x02, struct media_links_enum)
414	#define MEDIA_IOC_SETUP_LINK _IOWR('\|', 0x03, struct media_link_desc)	348	#define MEDIA_IOC_SETUP_LINK _IOWR('\|', 0x03, struct media_link_desc)
415	#define MEDIA_IOC_G_TOPOLOGY _IOWR('\|', 0x04, struct media_v2_topology)	349	#define MEDIA_IOC_G_TOPOLOGY _IOWR('\|', 0x04, struct media_v2_topology)
		350
		351	#if !defined(__KERNEL__) \|\| defined(__NEED_MEDIA_LEGACY_API)
		352
		353	/*
		354	* Legacy symbols used to avoid userspace compilation breakages.
		355	* Do not use any of this in new applications!
		356	*
		357	* Those symbols map the entity function into types and should be
		358	* used only on legacy programs for legacy hardware. Don't rely
		359	* on those for MEDIA_IOC_G_TOPOLOGY.
		360	*/
		361	#define MEDIA_ENT_TYPE_SHIFT 16
		362	#define MEDIA_ENT_TYPE_MASK 0x00ff0000
		363	#define MEDIA_ENT_SUBTYPE_MASK 0x0000ffff
		364
		365	#define MEDIA_ENT_T_DEVNODE_UNKNOWN (MEDIA_ENT_F_OLD_BASE \| \
		366	MEDIA_ENT_SUBTYPE_MASK)
		367
		368	#define MEDIA_ENT_T_DEVNODE MEDIA_ENT_F_OLD_BASE
		369	#define MEDIA_ENT_T_DEVNODE_V4L MEDIA_ENT_F_IO_V4L
		370	#define MEDIA_ENT_T_DEVNODE_FB (MEDIA_ENT_F_OLD_BASE + 2)
		371	#define MEDIA_ENT_T_DEVNODE_ALSA (MEDIA_ENT_F_OLD_BASE + 3)
		372	#define MEDIA_ENT_T_DEVNODE_DVB (MEDIA_ENT_F_OLD_BASE + 4)
		373
		374	#define MEDIA_ENT_T_UNKNOWN MEDIA_ENT_F_UNKNOWN
		375	#define MEDIA_ENT_T_V4L2_VIDEO MEDIA_ENT_F_IO_V4L
		376	#define MEDIA_ENT_T_V4L2_SUBDEV MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN
		377	#define MEDIA_ENT_T_V4L2_SUBDEV_SENSOR MEDIA_ENT_F_CAM_SENSOR
		378	#define MEDIA_ENT_T_V4L2_SUBDEV_FLASH MEDIA_ENT_F_FLASH
		379	#define MEDIA_ENT_T_V4L2_SUBDEV_LENS MEDIA_ENT_F_LENS
		380	#define MEDIA_ENT_T_V4L2_SUBDEV_DECODER MEDIA_ENT_F_ATV_DECODER
		381	#define MEDIA_ENT_T_V4L2_SUBDEV_TUNER MEDIA_ENT_F_TUNER
		382
		383	/*
		384	* There is still no ALSA support in the media controller. These
		385	* defines should not have been added and we leave them here only
		386	* in case some application tries to use these defines.
		387	*/
		388	#define MEDIA_INTF_T_ALSA_BASE 0x00000300
		389	#define MEDIA_INTF_T_ALSA_PCM_CAPTURE (MEDIA_INTF_T_ALSA_BASE)
		390	#define MEDIA_INTF_T_ALSA_PCM_PLAYBACK (MEDIA_INTF_T_ALSA_BASE + 1)
		391	#define MEDIA_INTF_T_ALSA_CONTROL (MEDIA_INTF_T_ALSA_BASE + 2)
		392	#define MEDIA_INTF_T_ALSA_COMPRESS (MEDIA_INTF_T_ALSA_BASE + 3)
		393	#define MEDIA_INTF_T_ALSA_RAWMIDI (MEDIA_INTF_T_ALSA_BASE + 4)
		394	#define MEDIA_INTF_T_ALSA_HWDEP (MEDIA_INTF_T_ALSA_BASE + 5)
		395	#define MEDIA_INTF_T_ALSA_SEQUENCER (MEDIA_INTF_T_ALSA_BASE + 6)
		396	#define MEDIA_INTF_T_ALSA_TIMER (MEDIA_INTF_T_ALSA_BASE + 7)
		397
		398	/* Obsolete symbol for media_version, no longer used in the kernel */
		399	#define MEDIA_API_VERSION KERNEL_VERSION(0, 1, 0)
		400
		401	#endif
416		402
417	#endif /* __LINUX_MEDIA_H */	403	#endif /* __LINUX_MEDIA_H */

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

  * The MS-DOS filesystem constants/structures
  */
+#ifndef SECTOR_SIZE
 #define SECTOR_SIZE	512		/* sector size (bytes) */
+#endif
 #define SECTOR_BITS	9		/* log2(SECTOR_SIZE) */
 #define MSDOS_DPB	(MSDOS_DPS)	/* dir entries per block */
 #define MSDOS_DPB_BITS	4		/* log2(MSDOS_DPB) */

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

@@ -7,6 +7,7 @@ · 6 unmodified lines
7	/* ipcs ctl commands */	7	/* ipcs ctl commands */
8	#define MSG_STAT 11	8	#define MSG_STAT 11
9	#define MSG_INFO 12	9	#define MSG_INFO 12
		10	#define MSG_STAT_ANY 13
10		11
11	/* msgrcv options */	12	/* msgrcv options */
12	#define MSG_NOERROR 010000 /* no error if message is too big */	13	#define MSG_NOERROR 010000 /* no error if message is too big */

include/uapi/linux/ncsi.h+115−0

@@ -0,0 +1,115 @@
	1	/*
	2	* Copyright Samuel Mendoza-Jonas, IBM Corporation 2018.
	3	*
	4	* This program is free software; you can redistribute it and/or modify
	5	* it under the terms of the GNU General Public License as published by
	6	* the Free Software Foundation; either version 2 of the License, or
	7	* (at your option) any later version.
	8	*/
	9
	10	#ifndef __UAPI_NCSI_NETLINK_H__
	11	#define __UAPI_NCSI_NETLINK_H__
	12
	13	/**
	14	* enum ncsi_nl_commands - supported NCSI commands
	15	*
	16	* @NCSI_CMD_UNSPEC: unspecified command to catch errors
	17	* @NCSI_CMD_PKG_INFO: list package and channel attributes. Requires
	18	* NCSI_ATTR_IFINDEX. If NCSI_ATTR_PACKAGE_ID is specified returns the
	19	* specific package and its channels - otherwise a dump request returns
	20	* all packages and their associated channels.
	21	* @NCSI_CMD_SET_INTERFACE: set preferred package and channel combination.
	22	* Requires NCSI_ATTR_IFINDEX and the preferred NCSI_ATTR_PACKAGE_ID and
	23	* optionally the preferred NCSI_ATTR_CHANNEL_ID.
	24	* @NCSI_CMD_CLEAR_INTERFACE: clear any preferred package/channel combination.
	25	* Requires NCSI_ATTR_IFINDEX.
	26	* @NCSI_CMD_MAX: highest command number
	27	*/
	28	enum ncsi_nl_commands {
	29	NCSI_CMD_UNSPEC,
	30	NCSI_CMD_PKG_INFO,
	31	NCSI_CMD_SET_INTERFACE,
	32	NCSI_CMD_CLEAR_INTERFACE,
	33
	34	__NCSI_CMD_AFTER_LAST,
	35	NCSI_CMD_MAX = __NCSI_CMD_AFTER_LAST - 1
	36	};
	37
	38	/**
	39	* enum ncsi_nl_attrs - General NCSI netlink attributes
	40	*
	41	* @NCSI_ATTR_UNSPEC: unspecified attributes to catch errors
	42	* @NCSI_ATTR_IFINDEX: ifindex of network device using NCSI
	43	* @NCSI_ATTR_PACKAGE_LIST: nested array of NCSI_PKG_ATTR attributes
	44	* @NCSI_ATTR_PACKAGE_ID: package ID
	45	* @NCSI_ATTR_CHANNEL_ID: channel ID
	46	* @NCSI_ATTR_MAX: highest attribute number
	47	*/
	48	enum ncsi_nl_attrs {
	49	NCSI_ATTR_UNSPEC,
	50	NCSI_ATTR_IFINDEX,
	51	NCSI_ATTR_PACKAGE_LIST,
	52	NCSI_ATTR_PACKAGE_ID,
	53	NCSI_ATTR_CHANNEL_ID,
	54
	55	__NCSI_ATTR_AFTER_LAST,
	56	NCSI_ATTR_MAX = __NCSI_ATTR_AFTER_LAST - 1
	57	};
	58
	59	/**
	60	* enum ncsi_nl_pkg_attrs - NCSI netlink package-specific attributes
	61	*
	62	* @NCSI_PKG_ATTR_UNSPEC: unspecified attributes to catch errors
	63	* @NCSI_PKG_ATTR: nested array of package attributes
	64	* @NCSI_PKG_ATTR_ID: package ID
	65	* @NCSI_PKG_ATTR_FORCED: flag signifying a package has been set as preferred
	66	* @NCSI_PKG_ATTR_CHANNEL_LIST: nested array of NCSI_CHANNEL_ATTR attributes
	67	* @NCSI_PKG_ATTR_MAX: highest attribute number
	68	*/
	69	enum ncsi_nl_pkg_attrs {
	70	NCSI_PKG_ATTR_UNSPEC,
	71	NCSI_PKG_ATTR,
	72	NCSI_PKG_ATTR_ID,
	73	NCSI_PKG_ATTR_FORCED,
	74	NCSI_PKG_ATTR_CHANNEL_LIST,
	75
	76	__NCSI_PKG_ATTR_AFTER_LAST,
	77	NCSI_PKG_ATTR_MAX = __NCSI_PKG_ATTR_AFTER_LAST - 1
	78	};
	79
	80	/**
	81	* enum ncsi_nl_channel_attrs - NCSI netlink channel-specific attributes
	82	*
	83	* @NCSI_CHANNEL_ATTR_UNSPEC: unspecified attributes to catch errors
	84	* @NCSI_CHANNEL_ATTR: nested array of channel attributes
	85	* @NCSI_CHANNEL_ATTR_ID: channel ID
	86	* @NCSI_CHANNEL_ATTR_VERSION_MAJOR: channel major version number
	87	* @NCSI_CHANNEL_ATTR_VERSION_MINOR: channel minor version number
	88	* @NCSI_CHANNEL_ATTR_VERSION_STR: channel version string
	89	* @NCSI_CHANNEL_ATTR_LINK_STATE: channel link state flags
	90	* @NCSI_CHANNEL_ATTR_ACTIVE: channels with this flag are in
	91	* NCSI_CHANNEL_ACTIVE state
	92	* @NCSI_CHANNEL_ATTR_FORCED: flag signifying a channel has been set as
	93	* preferred
	94	* @NCSI_CHANNEL_ATTR_VLAN_LIST: nested array of NCSI_CHANNEL_ATTR_VLAN_IDs
	95	* @NCSI_CHANNEL_ATTR_VLAN_ID: VLAN ID being filtered on this channel
	96	* @NCSI_CHANNEL_ATTR_MAX: highest attribute number
	97	*/
	98	enum ncsi_nl_channel_attrs {
	99	NCSI_CHANNEL_ATTR_UNSPEC,
	100	NCSI_CHANNEL_ATTR,
	101	NCSI_CHANNEL_ATTR_ID,
	102	NCSI_CHANNEL_ATTR_VERSION_MAJOR,
	103	NCSI_CHANNEL_ATTR_VERSION_MINOR,
	104	NCSI_CHANNEL_ATTR_VERSION_STR,
	105	NCSI_CHANNEL_ATTR_LINK_STATE,
	106	NCSI_CHANNEL_ATTR_ACTIVE,
	107	NCSI_CHANNEL_ATTR_FORCED,
	108	NCSI_CHANNEL_ATTR_VLAN_LIST,
	109	NCSI_CHANNEL_ATTR_VLAN_ID,
	110
	111	__NCSI_CHANNEL_ATTR_AFTER_LAST,
	112	NCSI_CHANNEL_ATTR_MAX = __NCSI_CHANNEL_ATTR_AFTER_LAST - 1
	113	};
	114
	115	#endif /* __UAPI_NCSI_NETLINK_H__ */

include/uapi/linux/netfilter/nf_conntrack_common.h+1−0

@@ -129,6 +129,7 @@ enum ip_conntrack_events { · 128 unmodified lines
129	IPCT_NATSEQADJ = IPCT_SEQADJ,	129	IPCT_NATSEQADJ = IPCT_SEQADJ,
130	IPCT_SECMARK, /* new security mark has been set */	130	IPCT_SECMARK, /* new security mark has been set */
131	IPCT_LABEL, /* new connlabel has been set */	131	IPCT_LABEL, /* new connlabel has been set */
		132	IPCT_SYNPROXY, /* synproxy has been set */
132	#ifdef __KERNEL__	133	#ifdef __KERNEL__
133	__IPCT_MAX	134	__IPCT_MAX
134	#endif	135	#endif

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

  * @NFT_CT_EXPIRATION: relative conntrack expiration time in ms
  * @NFT_CT_HELPER: connection tracking helper assigned to conntrack
  * @NFT_CT_L3PROTOCOL: conntrack layer 3 protocol
- * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address)
+ * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address, deprecated)
- * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address)
+ * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address, deprecated)
  * @NFT_CT_PROTOCOL: conntrack layer 4 protocol
  * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source
  * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination
  * @NFT_CT_AVGPKT: conntrack average bytes per packet
  * @NFT_CT_ZONE: conntrack zone
  * @NFT_CT_EVENTMASK: ctnetlink events to be generated for this conntrack
+ * @NFT_CT_SRC_IP: conntrack layer 3 protocol source (IPv4 address)
+ * @NFT_CT_DST_IP: conntrack layer 3 protocol destination (IPv4 address)
+ * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address)
+ * @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address)
  */
 enum nft_ct_keys {
 	NFT_CT_STATE,
 	NFT_CT_AVGPKT,
 	NFT_CT_ZONE,
 	NFT_CT_EVENTMASK,
+	NFT_CT_SRC_IP,
+	NFT_CT_DST_IP,
+	NFT_CT_SRC_IP6,
+	NFT_CT_DST_IP6,
 };
 /**

include/uapi/linux/netfilter/nfnetlink_conntrack.h+10−0

 	CTA_MARK_MASK,
 	CTA_LABELS,
 	CTA_LABELS_MASK,
+	CTA_SYNPROXY,
 	__CTA_MAX
 };
 #define CTA_MAX (__CTA_MAX - 1)
 };
 #define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1)
+enum ctattr_synproxy {
+	CTA_SYNPROXY_UNSPEC,
+	CTA_SYNPROXY_ISN,
+	CTA_SYNPROXY_ITS,
+	CTA_SYNPROXY_TSOFF,
+	__CTA_SYNPROXY_MAX,
+};
+#define CTA_SYNPROXY_MAX (__CTA_SYNPROXY_MAX - 1)
 enum ctattr_expect {
 	CTA_EXPECT_UNSPEC,
 	CTA_EXPECT_MASTER,

include/uapi/linux/netfilter/xt_connmark.h+10−0

 	XT_CONNMARK_RESTORE
 };
+enum {
+	D_SHIFT_LEFT = 0,
+	D_SHIFT_RIGHT,
+};
 struct xt_connmark_tginfo1 {
 	__u32 ctmark, ctmask, nfmask;
 	__u8 mode;
 };
+struct xt_connmark_tginfo2 {
+	__u32 ctmark, ctmask, nfmask;
+	__u8 shift_dir, shift_bits, mode;
+};
 struct xt_connmark_mtinfo1 {
 	__u32 mark, mask;
 	__u8 invert;

include/uapi/linux/netfilter_bridge/ebt_ip.h+12−3

 #define EBT_IP_PROTO 0x08
 #define EBT_IP_SPORT 0x10
 #define EBT_IP_DPORT 0x20
+#define EBT_IP_ICMP 0x40
+#define EBT_IP_IGMP 0x80
 #define EBT_IP_MASK (EBT_IP_SOURCE | EBT_IP_DEST | EBT_IP_TOS | EBT_IP_PROTO |\
- EBT_IP_SPORT | EBT_IP_DPORT )
+		     EBT_IP_SPORT | EBT_IP_DPORT | EBT_IP_ICMP | EBT_IP_IGMP)
 #define EBT_IP_MATCH "ip"
 /* the same values are used for the invflags */
 	__u8  protocol;
 	__u8  bitmask;
 	__u8  invflags;
-	__u16 sport[2];
+	union {
-	__u16 dport[2];
+		__u16 sport[2];
+		__u8 icmp_type[2];
+		__u8 igmp_type[2];
+	};
+	union {
+		__u16 dport[2];
+		__u8 icmp_code[2];
+	};
 };
 #endif

include/uapi/linux/netfilter_bridge/ebtables.h+13−3

 #define EBT_TABLE_MAXNAMELEN 32
 #define EBT_CHAIN_MAXNAMELEN EBT_TABLE_MAXNAMELEN
 #define EBT_FUNCTION_MAXNAMELEN EBT_TABLE_MAXNAMELEN
+#define EBT_EXTENSION_MAXNAMELEN 31
 /* verdicts >0 are "branches" */
 #define EBT_ACCEPT   -1
 struct ebt_entry_match {
 	union {
-		char name[EBT_FUNCTION_MAXNAMELEN];
+		struct {
+			char name[EBT_EXTENSION_MAXNAMELEN];
+			uint8_t revision;
+		};
 		struct xt_match *match;
 	} u;
 	/* size of data */
 struct ebt_entry_watcher {
 	union {
-		char name[EBT_FUNCTION_MAXNAMELEN];
+		struct {
+			char name[EBT_EXTENSION_MAXNAMELEN];
+			uint8_t revision;
+		};
 		struct xt_target *watcher;
 	} u;
 	/* size of data */
 struct ebt_entry_target {
 	union {
-		char name[EBT_FUNCTION_MAXNAMELEN];
+		struct {
+			char name[EBT_EXTENSION_MAXNAMELEN];
+			uint8_t revision;
+		};
 		struct xt_target *target;
 	} u;
 	/* size of data */

include/uapi/linux/nl80211.h+134−2

@@ -542,7 +542,8 @@ · 541 unmodified lines
542	* IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,	542	* IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_USE_MFP,
543	* %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,	543	* %NL80211_ATTR_MAC, %NL80211_ATTR_WIPHY_FREQ, %NL80211_ATTR_CONTROL_PORT,
544	* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,	544	* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
545	* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT, %NL80211_ATTR_MAC_HINT, and	545	* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT,
		546	* %NL80211_ATTR_CONTROL_PORT_OVER_NL80211, %NL80211_ATTR_MAC_HINT, and
546	* %NL80211_ATTR_WIPHY_FREQ_HINT.	547	* %NL80211_ATTR_WIPHY_FREQ_HINT.
547	* If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are	548	* If included, %NL80211_ATTR_MAC and %NL80211_ATTR_WIPHY_FREQ are
548	* restrictions on BSS selection, i.e., they effectively prevent roaming	549	* restrictions on BSS selection, i.e., they effectively prevent roaming
@@ -990,8 +991,45 @@ · 441 unmodified lines
990	* &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed	991	* &NL80211_CMD_CONNECT or &NL80211_CMD_ROAM. If the 4 way handshake failed
991	* &NL80211_CMD_DISCONNECT should be indicated instead.	992	* &NL80211_CMD_DISCONNECT should be indicated instead.
992	*	993	*
		994	* @NL80211_CMD_CONTROL_PORT_FRAME: Control Port (e.g. PAE) frame TX request
		995	* and RX notification. This command is used both as a request to transmit
		996	* a control port frame and as a notification that a control port frame
		997	* has been received. %NL80211_ATTR_FRAME is used to specify the
		998	* frame contents. The frame is the raw EAPoL data, without ethernet or
		999	* 802.11 headers.
		1000	* When used as an event indication %NL80211_ATTR_CONTROL_PORT_ETHERTYPE,
		1001	* %NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT and %NL80211_ATTR_MAC are added
		1002	* indicating the protocol type of the received frame; whether the frame
		1003	* was received unencrypted and the MAC address of the peer respectively.
		1004	*
993	* @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.	1005	* @NL80211_CMD_RELOAD_REGDB: Request that the regdb firmware file is reloaded.
994	*	1006	*
		1007	* @NL80211_CMD_EXTERNAL_AUTH: This interface is exclusively defined for host
		1008	* drivers that do not define separate commands for authentication and
		1009	* association, but rely on user space for the authentication to happen.
		1010	* This interface acts both as the event request (driver to user space)
		1011	* to trigger the authentication and command response (userspace to
		1012	* driver) to indicate the authentication status.
		1013	*
		1014	* User space uses the %NL80211_CMD_CONNECT command to the host driver to
		1015	* trigger a connection. The host driver selects a BSS and further uses
		1016	* this interface to offload only the authentication part to the user
		1017	* space. Authentication frames are passed between the driver and user
		1018	* space through the %NL80211_CMD_FRAME interface. Host driver proceeds
		1019	* further with the association after getting successful authentication
		1020	* status. User space indicates the authentication status through
		1021	* %NL80211_ATTR_STATUS_CODE attribute in %NL80211_CMD_EXTERNAL_AUTH
		1022	* command interface.
		1023	*
		1024	* Host driver reports this status on an authentication failure to the
		1025	* user space through the connect result as the user space would have
		1026	* initiated the connection through the connect request.
		1027	*
		1028	* @NL80211_CMD_STA_OPMODE_CHANGED: An event that notify station's
		1029	* ht opmode or vht opmode changes using any of &NL80211_ATTR_SMPS_MODE,
		1030	* &NL80211_ATTR_CHANNEL_WIDTH,&NL80211_ATTR_NSS attributes with its
		1031	* address(specified in &NL80211_ATTR_MAC).
		1032	*
995	* @NL80211_CMD_MAX: highest used command number	1033	* @NL80211_CMD_MAX: highest used command number
996	* @__NL80211_CMD_AFTER_LAST: internal use	1034	* @__NL80211_CMD_AFTER_LAST: internal use
997	*/	1035	*/
@@ -1198,6 +1236,12 @@ enum nl80211_commands { · 200 unmodified lines
1198		1236
1199	NL80211_CMD_RELOAD_REGDB,	1237	NL80211_CMD_RELOAD_REGDB,
1200		1238
		1239	NL80211_CMD_EXTERNAL_AUTH,
		1240
		1241	NL80211_CMD_STA_OPMODE_CHANGED,
		1242
		1243	NL80211_CMD_CONTROL_PORT_FRAME,
		1244
1201	/* add new commands above here */	1245	/* add new commands above here */
1202		1246
1203	/* used to define NL80211_CMD_MAX below */	1247	/* used to define NL80211_CMD_MAX below */
@@ -1445,6 +1489,15 @@ enum nl80211_commands { · 241 unmodified lines
1445	* @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with	1489	* @NL80211_ATTR_CONTROL_PORT_NO_ENCRYPT: When included along with
1446	* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom	1490	* %NL80211_ATTR_CONTROL_PORT_ETHERTYPE, indicates that the custom
1447	* ethertype frames used for key negotiation must not be encrypted.	1491	* ethertype frames used for key negotiation must not be encrypted.
		1492	* @NL80211_ATTR_CONTROL_PORT_OVER_NL80211: A flag indicating whether control
		1493	* port frames (e.g. of type given in %NL80211_ATTR_CONTROL_PORT_ETHERTYPE)
		1494	* will be sent directly to the network interface or sent via the NL80211
		1495	* socket. If this attribute is missing, then legacy behavior of sending
		1496	* control port frames directly to the network interface is used. If the
		1497	* flag is included, then control port frames are sent over NL80211 instead
		1498	* using %CMD_CONTROL_PORT_FRAME. If control port routing over NL80211 is
		1499	* to be used then userspace must also use the %NL80211_ATTR_SOCKET_OWNER
		1500	* flag.
1448	*	1501	*
1449	* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.	1502	* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver.
1450	* We recommend using nested, driver-specific attributes within this.	1503	* We recommend using nested, driver-specific attributes within this.
@@ -1932,6 +1985,12 @@ enum nl80211_commands { · 481 unmodified lines
1932	* multicast group.	1985	* multicast group.
1933	* If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the	1986	* If set during %NL80211_CMD_ASSOCIATE or %NL80211_CMD_CONNECT the
1934	* station will deauthenticate when the socket is closed.	1987	* station will deauthenticate when the socket is closed.
		1988	* If set during %NL80211_CMD_JOIN_IBSS the IBSS will be automatically
		1989	* torn down when the socket is closed.
		1990	* If set during %NL80211_CMD_JOIN_MESH the mesh setup will be
		1991	* automatically torn down when the socket is closed.
		1992	* If set during %NL80211_CMD_START_AP the AP will be automatically
		1993	* disabled when the socket is closed.
1935	*	1994	*
1936	* @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is	1995	* @NL80211_ATTR_TDLS_INITIATOR: flag attribute indicating the current end is
1937	* the TDLS link initiator.	1996	* the TDLS link initiator.
@@ -2153,6 +2212,19 @@ enum nl80211_commands { · 215 unmodified lines
2153	* @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.	2212	* @NL80211_ATTR_PMKR0_NAME: PMK-R0 Name for offloaded FT.
2154	* @NL80211_ATTR_PORT_AUTHORIZED: (reserved)	2213	* @NL80211_ATTR_PORT_AUTHORIZED: (reserved)
2155	*	2214	*
		2215	* @NL80211_ATTR_EXTERNAL_AUTH_ACTION: Identify the requested external
		2216	* authentication operation (u32 attribute with an
		2217	* &enum nl80211_external_auth_action value). This is used with the
		2218	* &NL80211_CMD_EXTERNAL_AUTH request event.
		2219	* @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user
		2220	* space supports external authentication. This attribute shall be used
		2221	* only with %NL80211_CMD_CONNECT request. The driver may offload
		2222	* authentication processing to user space if this capability is indicated
		2223	* in NL80211_CMD_CONNECT requests from the user space.
		2224	*
		2225	* @NL80211_ATTR_NSS: Station's New/updated RX_NSS value notified using this
		2226	* u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED.
		2227	*
2156	* @NUM_NL80211_ATTR: total number of nl80211_attrs available	2228	* @NUM_NL80211_ATTR: total number of nl80211_attrs available
2157	* @NL80211_ATTR_MAX: highest attribute number currently defined	2229	* @NL80211_ATTR_MAX: highest attribute number currently defined
2158	* @__NL80211_ATTR_AFTER_LAST: internal use	2230	* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2579,6 +2651,14 @@ enum nl80211_attrs { · 420 unmodified lines
2579	NL80211_ATTR_PMKR0_NAME,	2651	NL80211_ATTR_PMKR0_NAME,
2580	NL80211_ATTR_PORT_AUTHORIZED,	2652	NL80211_ATTR_PORT_AUTHORIZED,
2581		2653
		2654	NL80211_ATTR_EXTERNAL_AUTH_ACTION,
		2655	NL80211_ATTR_EXTERNAL_AUTH_SUPPORT,
		2656
		2657	NL80211_ATTR_NSS,
		2658	NL80211_ATTR_ACK_SIGNAL,
		2659
		2660	NL80211_ATTR_CONTROL_PORT_OVER_NL80211,
		2661
2582	/* add attributes here, update the policy in nl80211.c */	2662	/* add attributes here, update the policy in nl80211.c */
2583		2663
2584	__NL80211_ATTR_AFTER_LAST,	2664	__NL80211_ATTR_AFTER_LAST,
@@ -2899,6 +2979,7 @@ enum nl80211_sta_bss_param { · 314 unmodified lines
2899	* @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames	2979	* @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
2900	* received from the station (u64, usec)	2980	* received from the station (u64, usec)
2901	* @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment	2981	* @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
		2982	* @NL80211_STA_INFO_ACK_SIGNAL: signal strength of the last ACK frame(u8, dBm)
2902	* @__NL80211_STA_INFO_AFTER_LAST: internal	2983	* @__NL80211_STA_INFO_AFTER_LAST: internal
2903	* @NL80211_STA_INFO_MAX: highest possible station info attribute	2984	* @NL80211_STA_INFO_MAX: highest possible station info attribute
2904	*/	2985	*/
@@ -2937,6 +3018,7 @@ enum nl80211_sta_info { · 32 unmodified lines
2937	NL80211_STA_INFO_TID_STATS,	3018	NL80211_STA_INFO_TID_STATS,
2938	NL80211_STA_INFO_RX_DURATION,	3019	NL80211_STA_INFO_RX_DURATION,
2939	NL80211_STA_INFO_PAD,	3020	NL80211_STA_INFO_PAD,
		3021	NL80211_STA_INFO_ACK_SIGNAL,
2940		3022
2941	/* keep last */	3023	/* keep last */
2942	__NL80211_STA_INFO_AFTER_LAST,	3024	__NL80211_STA_INFO_AFTER_LAST,
@@ -4945,6 +5027,17 @@ enum nl80211_feature_flags { · 2002 unmodified lines
4945	* probe request tx deferral and suppression	5027	* probe request tx deferral and suppression
4946	* @NL80211_EXT_FEATURE_MFP_OPTIONAL: Driver supports the %NL80211_MFP_OPTIONAL	5028	* @NL80211_EXT_FEATURE_MFP_OPTIONAL: Driver supports the %NL80211_MFP_OPTIONAL
4947	* value in %NL80211_ATTR_USE_MFP.	5029	* value in %NL80211_ATTR_USE_MFP.
		5030	* @NL80211_EXT_FEATURE_LOW_SPAN_SCAN: Driver supports low span scan.
		5031	* @NL80211_EXT_FEATURE_LOW_POWER_SCAN: Driver supports low power scan.
		5032	* @NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN: Driver supports high accuracy scan.
		5033	* @NL80211_EXT_FEATURE_DFS_OFFLOAD: HW/driver will offload DFS actions.
		5034	* Device or driver will do all DFS-related actions by itself,
		5035	* informing user-space about CAC progress, radar detection event,
		5036	* channel change triggered by radar detection event.
		5037	* No need to start CAC from user-space, no need to react to
		5038	* "radar detected" event.
		5039	* @NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211: Driver supports sending and
		5040	* receiving control port frames over nl80211 instead of the netdevice.
4948	*	5041	*
4949	* @NUM_NL80211_EXT_FEATURES: number of extended features.	5042	* @NUM_NL80211_EXT_FEATURES: number of extended features.
4950	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.	5043	* @MAX_NL80211_EXT_FEATURES: highest extended feature index.
@@ -4972,6 +5065,11 @@ enum nl80211_ext_feature_index { · 21 unmodified lines
4972	NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE,	5065	NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE,
4973	NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION,	5066	NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION,
4974	NL80211_EXT_FEATURE_MFP_OPTIONAL,	5067	NL80211_EXT_FEATURE_MFP_OPTIONAL,
		5068	NL80211_EXT_FEATURE_LOW_SPAN_SCAN,
		5069	NL80211_EXT_FEATURE_LOW_POWER_SCAN,
		5070	NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN,
		5071	NL80211_EXT_FEATURE_DFS_OFFLOAD,
		5072	NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211,
4975		5073
4976	/* add new features before the definition below */	5074	/* add new features before the definition below */
4977	NUM_NL80211_EXT_FEATURES,	5075	NUM_NL80211_EXT_FEATURES,
@@ -5032,6 +5130,10 @@ enum nl80211_timeout_reason { · 54 unmodified lines
5032	* of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN	5130	* of NL80211_CMD_TRIGGER_SCAN and NL80211_CMD_START_SCHED_SCAN
5033	* requests.	5131	* requests.
5034	*	5132	*
		5133	* NL80211_SCAN_FLAG_LOW_SPAN, NL80211_SCAN_FLAG_LOW_POWER, and
		5134	* NL80211_SCAN_FLAG_HIGH_ACCURACY flags are exclusive of each other, i.e., only
		5135	* one of them can be used in the request.
		5136	*
5035	* @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority	5137	* @NL80211_SCAN_FLAG_LOW_PRIORITY: scan request has low priority
5036	* @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning	5138	* @NL80211_SCAN_FLAG_FLUSH: flush cache before scanning
5037	* @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured	5139	* @NL80211_SCAN_FLAG_AP: force a scan even if the interface is configured
@@ -5059,7 +5161,20 @@ enum nl80211_timeout_reason { · 21 unmodified lines
5059	* and suppression (if it has received a broadcast Probe Response frame,	5161	* and suppression (if it has received a broadcast Probe Response frame,
5060	* Beacon frame or FILS Discovery frame from an AP that the STA considers	5162	* Beacon frame or FILS Discovery frame from an AP that the STA considers
5061	* a suitable candidate for (re-)association - suitable in terms of	5163	* a suitable candidate for (re-)association - suitable in terms of
5062	* SSID and/or RSSI	5164	* SSID and/or RSSI.
		5165	* @NL80211_SCAN_FLAG_LOW_SPAN: Span corresponds to the total time taken to
		5166	* accomplish the scan. Thus, this flag intends the driver to perform the
		5167	* scan request with lesser span/duration. It is specific to the driver
		5168	* implementations on how this is accomplished. Scan accuracy may get
		5169	* impacted with this flag.
		5170	* @NL80211_SCAN_FLAG_LOW_POWER: This flag intends the scan attempts to consume
		5171	* optimal possible power. Drivers can resort to their specific means to
		5172	* optimize the power. Scan accuracy may get impacted with this flag.
		5173	* @NL80211_SCAN_FLAG_HIGH_ACCURACY: Accuracy here intends to the extent of scan
		5174	* results obtained. Thus HIGH_ACCURACY scan flag aims to get maximum
		5175	* possible scan results. This flag hints the driver to use the best
		5176	* possible scan configuration to improve the accuracy in scanning.
		5177	* Latency and power use may get impacted with this flag.
5063	*/	5178	*/
5064	enum nl80211_scan_flags {	5179	enum nl80211_scan_flags {
5065	NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0,	5180	NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0,
@@ -5070,6 +5185,9 @@ enum nl80211_scan_flags { · 4 unmodified lines
5070	NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP = 1<<5,	5185	NL80211_SCAN_FLAG_ACCEPT_BCAST_PROBE_RESP = 1<<5,
5071	NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE = 1<<6,	5186	NL80211_SCAN_FLAG_OCE_PROBE_REQ_HIGH_TX_RATE = 1<<6,
5072	NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 1<<7,	5187	NL80211_SCAN_FLAG_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION = 1<<7,
		5188	NL80211_SCAN_FLAG_LOW_SPAN = 1<<8,
		5189	NL80211_SCAN_FLAG_LOW_POWER = 1<<9,
		5190	NL80211_SCAN_FLAG_HIGH_ACCURACY = 1<<10,
5073	};	5191	};
5074		5192
5075	/**	5193	/**
@@ -5127,6 +5245,8 @@ enum nl80211_smps_mode { · 51 unmodified lines
5127	* non-operating channel is expired and no longer valid. New CAC must	5245	* non-operating channel is expired and no longer valid. New CAC must
5128	* be done on this channel before starting the operation. This is not	5246	* be done on this channel before starting the operation. This is not
5129	* applicable for ETSI dfs domain where pre-CAC is valid for ever.	5247	* applicable for ETSI dfs domain where pre-CAC is valid for ever.
		5248	* @NL80211_RADAR_CAC_STARTED: Channel Availability Check has been started,
		5249	* should be generated by HW if NL80211_EXT_FEATURE_DFS_OFFLOAD is enabled.
5130	*/	5250	*/
5131	enum nl80211_radar_event {	5251	enum nl80211_radar_event {
5132	NL80211_RADAR_DETECTED,	5252	NL80211_RADAR_DETECTED,
@@ -5134,6 +5254,7 @@ enum nl80211_radar_event { · 1 unmodified line
5134	NL80211_RADAR_CAC_ABORTED,	5254	NL80211_RADAR_CAC_ABORTED,
5135	NL80211_RADAR_NOP_FINISHED,	5255	NL80211_RADAR_NOP_FINISHED,
5136	NL80211_RADAR_PRE_CAC_EXPIRED,	5256	NL80211_RADAR_PRE_CAC_EXPIRED,
		5257	NL80211_RADAR_CAC_STARTED,
5137	};	5258	};
5138		5259
5139	/**	5260	/**
@@ -5469,4 +5590,15 @@ enum nl80211_nan_match_attributes { · 329 unmodified lines
5469	NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1	5590	NL80211_NAN_MATCH_ATTR_MAX = NUM_NL80211_NAN_MATCH_ATTR - 1
5470	};	5591	};
5471		5592
		5593	/**
		5594	* nl80211_external_auth_action - Action to perform with external
		5595	* authentication request. Used by NL80211_ATTR_EXTERNAL_AUTH_ACTION.
		5596	* @NL80211_EXTERNAL_AUTH_START: Start the authentication.
		5597	* @NL80211_EXTERNAL_AUTH_ABORT: Abort the ongoing authentication.
		5598	*/
		5599	enum nl80211_external_auth_action {
		5600	NL80211_EXTERNAL_AUTH_START,
		5601	NL80211_EXTERNAL_AUTH_ABORT,
		5602	};
		5603
5472	#endif /* __LINUX_NL80211_H */	5604	#endif /* __LINUX_NL80211_H */

include/uapi/linux/pci_regs.h+5−2

 #define  PCI_EXP_LNKCAP_SLS_2_5GB 0x00000001 /* LNKCAP2 SLS Vector bit 0 */
 #define  PCI_EXP_LNKCAP_SLS_5_0GB 0x00000002 /* LNKCAP2 SLS Vector bit 1 */
 #define  PCI_EXP_LNKCAP_SLS_8_0GB 0x00000003 /* LNKCAP2 SLS Vector bit 2 */
+#define  PCI_EXP_LNKCAP_SLS_16_0GB 0x00000004 /* LNKCAP2 SLS Vector bit 3 */
 #define  PCI_EXP_LNKCAP_MLW	0x000003f0 /* Maximum Link Width */
 #define  PCI_EXP_LNKCAP_ASPMS	0x00000c00 /* ASPM Support */
 #define  PCI_EXP_LNKCAP_L0SEL	0x00007000 /* L0s Exit Latency */
 #define  PCI_EXP_LNKSTA_CLS_2_5GB 0x0001 /* Current Link Speed 2.5GT/s */
 #define  PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */
 #define  PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */
+#define  PCI_EXP_LNKSTA_CLS_16_0GB 0x0004 /* Current Link Speed 16.0GT/s */
 #define  PCI_EXP_LNKSTA_NLW	0x03f0	/* Negotiated Link Width */
 #define  PCI_EXP_LNKSTA_NLW_X1	0x0010	/* Current Link Width x1 */
 #define  PCI_EXP_LNKSTA_NLW_X2	0x0020	/* Current Link Width x2 */
 #define PCI_CAP_EXP_RC_ENDPOINT_SIZEOF_V2	44	/* v2 endpoints without link end here */
 #define PCI_EXP_LNKCAP2		44	/* Link Capabilities 2 */
 #define  PCI_EXP_LNKCAP2_SLS_2_5GB	0x00000002 /* Supported Speed 2.5GT/s */
-#define  PCI_EXP_LNKCAP2_SLS_5_0GB	0x00000004 /* Supported Speed 5.0GT/s */
+#define  PCI_EXP_LNKCAP2_SLS_5_0GB	0x00000004 /* Supported Speed 5GT/s */
-#define  PCI_EXP_LNKCAP2_SLS_8_0GB	0x00000008 /* Supported Speed 8.0GT/s */
+#define  PCI_EXP_LNKCAP2_SLS_8_0GB	0x00000008 /* Supported Speed 8GT/s */
+#define  PCI_EXP_LNKCAP2_SLS_16_0GB	0x00000010 /* Supported Speed 16GT/s */
 #define  PCI_EXP_LNKCAP2_CROSSLINK	0x00000100 /* Crosslink supported */
 #define PCI_EXP_LNKCTL2		48	/* Link Control 2 */
 #define PCI_EXP_LNKSTA2		50	/* Link Status 2 */

include/uapi/linux/perf_event.h+31−14

 	__u32			bp_type;
 	union {
 		__u64		bp_addr;
+		__u64		kprobe_func; /* for perf_kprobe */
+		__u64		uprobe_path; /* for perf_uprobe */
 		__u64		config1; /* extension of config */
 	};
 	union {
 		__u64		bp_len;
+		__u64		kprobe_addr; /* when kprobe_func == NULL */
+		__u64		probe_offset; /* for perf_[k,u]probe */
 		__u64		config2; /* extension of config1 */
 	};
 	__u64	branch_sample_type; /* enum perf_branch_sample_type */
 /*
  * Ioctls that can be done on a perf event fd:
  */
-#define PERF_EVENT_IOC_ENABLE		_IO ('$', 0)
+#define PERF_EVENT_IOC_ENABLE			_IO ('$', 0)
-#define PERF_EVENT_IOC_DISABLE		_IO ('$', 1)
+#define PERF_EVENT_IOC_DISABLE			_IO ('$', 1)
-#define PERF_EVENT_IOC_REFRESH		_IO ('$', 2)
+#define PERF_EVENT_IOC_REFRESH			_IO ('$', 2)
-#define PERF_EVENT_IOC_RESET		_IO ('$', 3)
+#define PERF_EVENT_IOC_RESET			_IO ('$', 3)
-#define PERF_EVENT_IOC_PERIOD		_IOW('$', 4, __u64)
+#define PERF_EVENT_IOC_PERIOD			_IOW('$', 4, __u64)
-#define PERF_EVENT_IOC_SET_OUTPUT	_IO ('$', 5)
+#define PERF_EVENT_IOC_SET_OUTPUT		_IO ('$', 5)
-#define PERF_EVENT_IOC_SET_FILTER	_IOW('$', 6, char *)
+#define PERF_EVENT_IOC_SET_FILTER		_IOW('$', 6, char *)
-#define PERF_EVENT_IOC_ID		_IOR('$', 7, __u64 *)
+#define PERF_EVENT_IOC_ID			_IOR('$', 7, __u64 *)
-#define PERF_EVENT_IOC_SET_BPF		_IOW('$', 8, __u32)
+#define PERF_EVENT_IOC_SET_BPF			_IOW('$', 8, __u32)
-#define PERF_EVENT_IOC_PAUSE_OUTPUT	_IOW('$', 9, __u32)
+#define PERF_EVENT_IOC_PAUSE_OUTPUT		_IOW('$', 9, __u32)
-#define PERF_EVENT_IOC_QUERY_BPF	_IOWR('$', 10, struct perf_event_query_bpf *)
+#define PERF_EVENT_IOC_QUERY_BPF		_IOWR('$', 10, struct perf_event_query_bpf *)
+#define PERF_EVENT_IOC_MODIFY_ATTRIBUTES	_IOW('$', 11, struct perf_event_attr *)
 enum perf_event_ioc_flags {
 	PERF_IOC_FLAG_GROUP		= 1U << 0,
 #define PERF_RECORD_MISC_COMM_EXEC		(1 << 13)
 #define PERF_RECORD_MISC_SWITCH_OUT		(1 << 13)
 /*
- * Indicates that the content of PERF_SAMPLE_IP points to
+ * These PERF_RECORD_MISC_* flags below are safely reused
- * the actual instruction that triggered the event. See also
+ * for the following events:
- * perf_event_attr::precise_ip.
+ *
+ *   PERF_RECORD_MISC_EXACT_IP           - PERF_RECORD_SAMPLE of precise events
+ *   PERF_RECORD_MISC_SWITCH_OUT_PREEMPT - PERF_RECORD_SWITCH* events
+ *
+ *
+ * PERF_RECORD_MISC_EXACT_IP:
+ *   Indicates that the content of PERF_SAMPLE_IP points to
+ *   the actual instruction that triggered the event. See also
+ *   perf_event_attr::precise_ip.
+ *
+ * PERF_RECORD_MISC_SWITCH_OUT_PREEMPT:
+ *   Indicates that thread was preempted in TASK_RUNNING state.
  */
 #define PERF_RECORD_MISC_EXACT_IP		(1 << 14)
+#define PERF_RECORD_MISC_SWITCH_OUT_PREEMPT	(1 << 14)
 /*
  * Reserve the last bit to indicate some extended misc field
  */

include/uapi/linux/pkt_cls.h+3−1

 enum {
 	TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),
+	TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),
 };
 /* Match-all classifier */
 #define	TCF_EM_VLAN		6
 #define	TCF_EM_CANID		7
 #define	TCF_EM_IPSET		8
-#define	TCF_EM_MAX		8
+#define	TCF_EM_IPT		9
+#define	TCF_EM_MAX		9
 enum {
 	TCF_EM_PROG_TC

include/uapi/linux/qemu_fw_cfg.h+97−0

@@ -0,0 +1,97 @@
	1	/* SPDX-License-Identifier: BSD-3-Clause */
	2	#ifndef _LINUX_FW_CFG_H
	3	#define _LINUX_FW_CFG_H
	4
	5	#include <linux/types.h>
	6
	7	#define FW_CFG_ACPI_DEVICE_ID "QEMU0002"
	8
	9	/* selector key values for "well-known" fw_cfg entries */
	10	#define FW_CFG_SIGNATURE 0x00
	11	#define FW_CFG_ID 0x01
	12	#define FW_CFG_UUID 0x02
	13	#define FW_CFG_RAM_SIZE 0x03
	14	#define FW_CFG_NOGRAPHIC 0x04
	15	#define FW_CFG_NB_CPUS 0x05
	16	#define FW_CFG_MACHINE_ID 0x06
	17	#define FW_CFG_KERNEL_ADDR 0x07
	18	#define FW_CFG_KERNEL_SIZE 0x08
	19	#define FW_CFG_KERNEL_CMDLINE 0x09
	20	#define FW_CFG_INITRD_ADDR 0x0a
	21	#define FW_CFG_INITRD_SIZE 0x0b
	22	#define FW_CFG_BOOT_DEVICE 0x0c
	23	#define FW_CFG_NUMA 0x0d
	24	#define FW_CFG_BOOT_MENU 0x0e
	25	#define FW_CFG_MAX_CPUS 0x0f
	26	#define FW_CFG_KERNEL_ENTRY 0x10
	27	#define FW_CFG_KERNEL_DATA 0x11
	28	#define FW_CFG_INITRD_DATA 0x12
	29	#define FW_CFG_CMDLINE_ADDR 0x13
	30	#define FW_CFG_CMDLINE_SIZE 0x14
	31	#define FW_CFG_CMDLINE_DATA 0x15
	32	#define FW_CFG_SETUP_ADDR 0x16
	33	#define FW_CFG_SETUP_SIZE 0x17
	34	#define FW_CFG_SETUP_DATA 0x18
	35	#define FW_CFG_FILE_DIR 0x19
	36
	37	#define FW_CFG_FILE_FIRST 0x20
	38	#define FW_CFG_FILE_SLOTS_MIN 0x10
	39
	40	#define FW_CFG_WRITE_CHANNEL 0x4000
	41	#define FW_CFG_ARCH_LOCAL 0x8000
	42	#define FW_CFG_ENTRY_MASK (~(FW_CFG_WRITE_CHANNEL \| FW_CFG_ARCH_LOCAL))
	43
	44	#define FW_CFG_INVALID 0xffff
	45
	46	/* width in bytes of fw_cfg control register */
	47	#define FW_CFG_CTL_SIZE 0x02
	48
	49	/* fw_cfg "file name" is up to 56 characters (including terminating nul) */
	50	#define FW_CFG_MAX_FILE_PATH 56
	51
	52	/* size in bytes of fw_cfg signature */
	53	#define FW_CFG_SIG_SIZE 4
	54
	55	/* FW_CFG_ID bits */
	56	#define FW_CFG_VERSION 0x01
	57	#define FW_CFG_VERSION_DMA 0x02
	58
	59	/* fw_cfg file directory entry type */
	60	struct fw_cfg_file {
	61	__be32 size;
	62	__be16 select;
	63	__u16 reserved;
	64	char name[FW_CFG_MAX_FILE_PATH];
	65	};
	66
	67	/* FW_CFG_DMA_CONTROL bits */
	68	#define FW_CFG_DMA_CTL_ERROR 0x01
	69	#define FW_CFG_DMA_CTL_READ 0x02
	70	#define FW_CFG_DMA_CTL_SKIP 0x04
	71	#define FW_CFG_DMA_CTL_SELECT 0x08
	72	#define FW_CFG_DMA_CTL_WRITE 0x10
	73
	74	#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */
	75
	76	/* Control as first field allows for different structures selected by this
	77	* field, which might be useful in the future
	78	*/
	79	struct fw_cfg_dma_access {
	80	__be32 control;
	81	__be32 length;
	82	__be64 address;
	83	};
	84
	85	#define FW_CFG_VMCOREINFO_FILENAME "etc/vmcoreinfo"
	86
	87	#define FW_CFG_VMCOREINFO_FORMAT_NONE 0x0
	88	#define FW_CFG_VMCOREINFO_FORMAT_ELF 0x1
	89
	90	struct fw_cfg_vmcoreinfo {
	91	__le16 host_format;
	92	__le16 guest_format;
	93	__le32 size;
	94	__le64 paddr;
	95	};
	96
	97	#endif

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

@@ -35,6 +35,9 @@ · 34 unmodified lines
35	/* Clear the entropy pool and associated counters. (Superuser only.) */	35	/* Clear the entropy pool and associated counters. (Superuser only.) */
36	#define RNDCLEARPOOL _IO( 'R', 0x06 )	36	#define RNDCLEARPOOL _IO( 'R', 0x06 )
37		37
		38	/* Reseed CRNG. (Superuser only.) */
		39	#define RNDRESEEDCRNG _IO( 'R', 0x07 )
		40
38	struct rand_pool_info {	41	struct rand_pool_info {
39	int entropy_count;	42	int entropy_count;
40	int buf_size;	43	int buf_size;

include/uapi/linux/rds.h+8−0

 #define RDS_CMSG_MASKED_ATOMIC_FADD	8
 #define RDS_CMSG_MASKED_ATOMIC_CSWP	9
 #define RDS_CMSG_RXPATH_LATENCY		11
+#define	RDS_CMSG_ZCOPY_COOKIE		12
+#define	RDS_CMSG_ZCOPY_COMPLETION	13
 #define RDS_INFO_FIRST			10000
 #define RDS_INFO_COUNTERS		10000
 #define RDS_RDMA_DROPPED	3
 #define RDS_RDMA_OTHER_ERROR	4
+#define	RDS_MAX_ZCOOKIES	8
+struct rds_zcopy_cookies {
+	__u32 num;
+	__u32 cookies[RDS_MAX_ZCOOKIES];
+};
 /*
  * Common set of flags for all RDMA related structs
  */

include/uapi/linux/sctp.h+43−1

@@ -99,6 +99,7 @@ typedef __s32 sctp_assoc_t; · 98 unmodified lines
99	#define SCTP_RECVRCVINFO 32	99	#define SCTP_RECVRCVINFO 32
100	#define SCTP_RECVNXTINFO 33	100	#define SCTP_RECVNXTINFO 33
101	#define SCTP_DEFAULT_SNDINFO 34	101	#define SCTP_DEFAULT_SNDINFO 34
		102	#define SCTP_AUTH_DEACTIVATE_KEY 35
102		103
103	/* Internal Socket Options. Some of the sctp library functions are	104	/* Internal Socket Options. Some of the sctp library functions are
104	* implemented using these socket options.	105	* implemented using these socket options.
@@ -126,6 +127,7 @@ typedef __s32 sctp_assoc_t; · 21 unmodified lines
126	#define SCTP_STREAM_SCHEDULER 123	127	#define SCTP_STREAM_SCHEDULER 123
127	#define SCTP_STREAM_SCHEDULER_VALUE 124	128	#define SCTP_STREAM_SCHEDULER_VALUE 124
128	#define SCTP_INTERLEAVING_SUPPORTED 125	129	#define SCTP_INTERLEAVING_SUPPORTED 125
		130	#define SCTP_SENDMSG_CONNECT 126
129		131
130	/* PR-SCTP policies */	132	/* PR-SCTP policies */
131	#define SCTP_PR_SCTP_NONE 0x0000	133	#define SCTP_PR_SCTP_NONE 0x0000
@@ -260,6 +262,31 @@ struct sctp_nxtinfo { · 128 unmodified lines
260	sctp_assoc_t nxt_assoc_id;	262	sctp_assoc_t nxt_assoc_id;
261	};	263	};
262		264
		265	/* 5.3.7 SCTP PR-SCTP Information Structure (SCTP_PRINFO)
		266	*
		267	* This cmsghdr structure specifies SCTP options for sendmsg().
		268	*
		269	* cmsg_level cmsg_type cmsg_data[]
		270	* ------------ ------------ -------------------
		271	* IPPROTO_SCTP SCTP_PRINFO struct sctp_prinfo
		272	*/
		273	struct sctp_prinfo {
		274	__u16 pr_policy;
		275	__u32 pr_value;
		276	};
		277
		278	/* 5.3.8 SCTP AUTH Information Structure (SCTP_AUTHINFO)
		279	*
		280	* This cmsghdr structure specifies SCTP options for sendmsg().
		281	*
		282	* cmsg_level cmsg_type cmsg_data[]
		283	* ------------ ------------ -------------------
		284	* IPPROTO_SCTP SCTP_AUTHINFO struct sctp_authinfo
		285	*/
		286	struct sctp_authinfo {
		287	__u16 auth_keynumber;
		288	};
		289
263	/*	290	/*
264	* sinfo_flags: 16 bits (unsigned integer)	291	* sinfo_flags: 16 bits (unsigned integer)
265	*	292	*
@@ -271,6 +298,8 @@ enum sctp_sinfo_flags { · 5 unmodified lines
271	SCTP_ADDR_OVER = (1 << 1), /* Override the primary destination. */	298	SCTP_ADDR_OVER = (1 << 1), /* Override the primary destination. */
272	SCTP_ABORT = (1 << 2), /* Send an ABORT message to the peer. */	299	SCTP_ABORT = (1 << 2), /* Send an ABORT message to the peer. */
273	SCTP_SACK_IMMEDIATELY = (1 << 3), /* SACK should be sent without delay. */	300	SCTP_SACK_IMMEDIATELY = (1 << 3), /* SACK should be sent without delay. */
		301	/* 2 bits here have been used by SCTP_PR_SCTP_MASK */
		302	SCTP_SENDALL = (1 << 6),
274	SCTP_NOTIFICATION = MSG_NOTIFICATION, /* Next message is not user msg but notification. */	303	SCTP_NOTIFICATION = MSG_NOTIFICATION, /* Next message is not user msg but notification. */
275	SCTP_EOF = MSG_FIN, /* Initiate graceful shutdown process. */	304	SCTP_EOF = MSG_FIN, /* Initiate graceful shutdown process. */
276	};	305	};
@@ -293,6 +322,14 @@ typedef enum sctp_cmsg_type { · 16 unmodified lines
293	#define SCTP_RCVINFO SCTP_RCVINFO	322	#define SCTP_RCVINFO SCTP_RCVINFO
294	SCTP_NXTINFO, /* 5.3.6 SCTP Next Receive Information Structure */	323	SCTP_NXTINFO, /* 5.3.6 SCTP Next Receive Information Structure */
295	#define SCTP_NXTINFO SCTP_NXTINFO	324	#define SCTP_NXTINFO SCTP_NXTINFO
		325	SCTP_PRINFO, /* 5.3.7 SCTP PR-SCTP Information Structure */
		326	#define SCTP_PRINFO SCTP_PRINFO
		327	SCTP_AUTHINFO, /* 5.3.8 SCTP AUTH Information Structure */
		328	#define SCTP_AUTHINFO SCTP_AUTHINFO
		329	SCTP_DSTADDRV4, /* 5.3.9 SCTP Destination IPv4 Address Structure */
		330	#define SCTP_DSTADDRV4 SCTP_DSTADDRV4
		331	SCTP_DSTADDRV6, /* 5.3.10 SCTP Destination IPv6 Address Structure */
		332	#define SCTP_DSTADDRV6 SCTP_DSTADDRV6
296	} sctp_cmsg_t;	333	} sctp_cmsg_t;
297		334
298	/*	335	/*
@@ -482,7 +519,12 @@ struct sctp_authkey_event { · 183 unmodified lines
482	sctp_assoc_t auth_assoc_id;	519	sctp_assoc_t auth_assoc_id;
483	};	520	};
484		521
485	enum { SCTP_AUTH_NEWKEY = 0, };	522	enum {
		523	SCTP_AUTH_NEW_KEY,
		524	#define SCTP_AUTH_NEWKEY SCTP_AUTH_NEW_KEY /* compatible with before */
		525	SCTP_AUTH_FREE_KEY,
		526	SCTP_AUTH_NO_AUTH,
		527	};
486		528
487	/*	529	/*
488	* 6.1.9. SCTP_SENDER_DRY_EVENT	530	* 6.1.9. SCTP_SENDER_DRY_EVENT

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

@@ -19,6 +19,7 @@ · 18 unmodified lines
19	/* ipcs ctl cmds */	19	/* ipcs ctl cmds */
20	#define SEM_STAT 18	20	#define SEM_STAT 18
21	#define SEM_INFO 19	21	#define SEM_INFO 19
		22	#define SEM_STAT_ANY 20
22		23
23	/* Obsolete, used only for backwards compatibility and libc5 compiles */	24	/* Obsolete, used only for backwards compatibility and libc5 compiles */
24	struct semid_ds {	25	struct semid_ds {

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

@@ -76,6 +76,9 @@ · 75 unmodified lines
76	#define PORT_SUNZILOG 38	76	#define PORT_SUNZILOG 38
77	#define PORT_SUNSAB 39	77	#define PORT_SUNSAB 39
78		78
		79	/* Nuvoton UART */
		80	#define PORT_NPCM 40
		81
79	/* Intel EG20 */	82	/* Intel EG20 */
80	#define PORT_PCH_8LINE 44	83	#define PORT_PCH_8LINE 44
81	#define PORT_PCH_2LINE 45	84	#define PORT_PCH_2LINE 45

include/uapi/linux/shm.h+3−2

@@ -83,8 +83,9 @@ struct shmid_ds { · 82 unmodified lines
83	#define SHM_UNLOCK 12	83	#define SHM_UNLOCK 12
84		84
85	/* ipcs ctl commands */	85	/* ipcs ctl commands */
86	#define SHM_STAT 13	86	#define SHM_STAT 13
87	#define SHM_INFO 14	87	#define SHM_INFO 14
		88	#define SHM_STAT_ANY 15
88		89
89	/* Obsolete, used only for backwards compatibility */	90	/* Obsolete, used only for backwards compatibility */
90	struct shminfo {	91	struct shminfo {

include/uapi/linux/stm.h+4−9

  * System Trace Module (STM) userspace interfaces
  * Copyright (c) 2014, Intel Corporation.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
  * STM class implements generic infrastructure for  System Trace Module devices
  * as defined in MIPI STPv2 specification.
  */
 #include <linux/types.h>
+/* Maximum allowed master and channel values */
+#define STP_MASTER_MAX	0xffff
+#define STP_CHANNEL_MAX	0xffff
 /**
  * struct stp_policy_id - identification for the STP policy
  * @size:	size of the structure including real id[] length

include/uapi/linux/sysctl.h+0−18

@@ -780,24 +780,6 @@ enum { · 779 unmodified lines
780	NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,	780	NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
781	};	781	};
782		782
783	/* proc/sys/net/irda */
784	enum {
785	NET_IRDA_DISCOVERY=1,
786	NET_IRDA_DEVNAME=2,
787	NET_IRDA_DEBUG=3,
788	NET_IRDA_FAST_POLL=4,
789	NET_IRDA_DISCOVERY_SLOTS=5,
790	NET_IRDA_DISCOVERY_TIMEOUT=6,
791	NET_IRDA_SLOT_TIMEOUT=7,
792	NET_IRDA_MAX_BAUD_RATE=8,
793	NET_IRDA_MIN_TX_TURN_TIME=9,
794	NET_IRDA_MAX_TX_DATA_SIZE=10,
795	NET_IRDA_MAX_TX_WINDOW=11,
796	NET_IRDA_MAX_NOREPLY_TIME=12,
797	NET_IRDA_WARN_NOREPLY_TIME=13,
798	NET_IRDA_LAP_KEEPALIVE_TIME=14,
799	};
800
801		783
802	/* CTL_FS names: */	784	/* CTL_FS names: */
803	enum	785	enum

include/uapi/linux/tc_ematch/tc_em_ipt.h+20−0

@@ -0,0 +1,20 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	#ifndef __LINUX_TC_EM_IPT_H
	3	#define __LINUX_TC_EM_IPT_H
	4
	5	#include <linux/types.h>
	6	#include <linux/pkt_cls.h>
	7
	8	enum {
	9	TCA_EM_IPT_UNSPEC,
	10	TCA_EM_IPT_HOOK,
	11	TCA_EM_IPT_MATCH_NAME,
	12	TCA_EM_IPT_MATCH_REVISION,
	13	TCA_EM_IPT_NFPROTO,
	14	TCA_EM_IPT_MATCH_DATA,
	15	__TCA_EM_IPT_MAX
	16	};
	17
	18	#define TCA_EM_IPT_MAX (__TCA_EM_IPT_MAX - 1)
	19
	20	#endif

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

@@ -241,6 +241,9 @@ enum { · 240 unmodified lines
241	TCP_NLA_MIN_RTT, /* minimum RTT */	241	TCP_NLA_MIN_RTT, /* minimum RTT */
242	TCP_NLA_RECUR_RETRANS, /* Recurring retransmits for the current pkt */	242	TCP_NLA_RECUR_RETRANS, /* Recurring retransmits for the current pkt */
243	TCP_NLA_DELIVERY_RATE_APP_LMT, /* delivery rate application limited ? */	243	TCP_NLA_DELIVERY_RATE_APP_LMT, /* delivery rate application limited ? */
		244	TCP_NLA_SNDQ_SIZE, /* Data (bytes) pending in send queue */
		245	TCP_NLA_CA_STATE, /* ca_state of socket */
		246	TCP_NLA_SND_SSTHRESH, /* Slow start size threshold */
244		247
245	};	248	};
246		249

include/uapi/linux/telephony.h+0−263

@@ -1,263 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
2	/******************************************************************************
3	*
4	* telephony.h
5	*
6	* Basic Linux Telephony Interface
7	*
8	* (c) Copyright 1999-2001 Quicknet Technologies, Inc.
9	*
10	* This program is free software; you can redistribute it and/or
11	* modify it under the terms of the GNU General Public License
12	* as published by the Free Software Foundation; either version
13	* 2 of the License, or (at your option) any later version.
14	*
15	* Authors: Ed Okerson, <eokerson@quicknet.net>
16	* Greg Herlein, <gherlein@quicknet.net>
17	*
18	* Contributors: Alan Cox, <alan@lxorguk.ukuu.org.uk>
19	* David W. Erhart, <derhart@quicknet.net>
20	*
21	* IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR
22	* DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
23	* OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF QUICKNET
24	* TECHNOLOGIES, INC. HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25	*
26	* QUICKNET TECHNOLOGIES, INC. SPECIFICALLY DISCLAIMS ANY WARRANTIES,
27	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
28	* AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
29	* ON AN "AS IS" BASIS, AND QUICKNET TECHNOLOGIES, INC. HAS NO OBLIGATION
30	* TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
31	*
32	*****************************************************************************/
33
34	#ifndef TELEPHONY_H
35	#define TELEPHONY_H
36
37	#define TELEPHONY_VERSION 3013
38
39	#define PHONE_VENDOR_IXJ 1
40	#define PHONE_VENDOR_QUICKNET PHONE_VENDOR_IXJ
41	#define PHONE_VENDOR_VOICETRONIX 2
42	#define PHONE_VENDOR_ACULAB 3
43	#define PHONE_VENDOR_DIGI 4
44	#define PHONE_VENDOR_FRANKLIN 5
45
46	/******************************************************************************
47	* Vendor Summary Information Area
48	*
49	* Quicknet Technologies, Inc. - makes low density analog telephony cards
50	* with audio compression, POTS and PSTN interfaces (www.quicknet.net)
51	*
52	* (other vendors following this API shuld add a short description of
53	* the telephony products they support under Linux)
54	*
55	*****************************************************************************/
56	#define QTI_PHONEJACK 100
57	#define QTI_LINEJACK 300
58	#define QTI_PHONEJACK_LITE 400
59	#define QTI_PHONEJACK_PCI 500
60	#define QTI_PHONECARD 600
61
62	/******************************************************************************
63	*
64	* The capabilities ioctls can inform you of the capabilities of each phone
65	* device installed in your system. The PHONECTL_CAPABILITIES ioctl
66	* returns an integer value indicating the number of capabilities the
67	* device has. The PHONECTL_CAPABILITIES_LIST will fill an array of
68	* capability structs with all of its capabilities. The
69	* PHONECTL_CAPABILITIES_CHECK takes a single capability struct and returns
70	* a TRUE if the device has that capability, otherwise it returns false.
71	*
72	******************************************************************************/
73	typedef enum {
74	vendor = 0,
75	device,
76	port,
77	codec,
78	dsp
79	} phone_cap;
80
81	struct phone_capability {
82	char desc[80];
83	phone_cap captype;
84	int cap;
85	int handle;
86	};
87
88	typedef enum {
89	pots = 0,
90	pstn,
91	handset,
92	speaker
93	} phone_ports;
94
95	#define PHONE_CAPABILITIES _IO ('q', 0x80)
96	#define PHONE_CAPABILITIES_LIST _IOR ('q', 0x81, struct phone_capability *)
97	#define PHONE_CAPABILITIES_CHECK _IOW ('q', 0x82, struct phone_capability *)
98
99	typedef struct {
100	char month[3];
101	char day[3];
102	char hour[3];
103	char min[3];
104	int numlen;
105	char number[11];
106	int namelen;
107	char name[80];
108	} PHONE_CID;
109
110	#define PHONE_RING _IO ('q', 0x83)
111	#define PHONE_HOOKSTATE _IO ('q', 0x84)
112	#define PHONE_MAXRINGS _IOW ('q', 0x85, char)
113	#define PHONE_RING_CADENCE _IOW ('q', 0x86, short)
114	#define OLD_PHONE_RING_START _IO ('q', 0x87)
115	#define PHONE_RING_START _IOW ('q', 0x87, PHONE_CID *)
116	#define PHONE_RING_STOP _IO ('q', 0x88)
117
118	#define USA_RING_CADENCE 0xC0C0
119
120	#define PHONE_REC_CODEC _IOW ('q', 0x89, int)
121	#define PHONE_REC_START _IO ('q', 0x8A)
122	#define PHONE_REC_STOP _IO ('q', 0x8B)
123	#define PHONE_REC_DEPTH _IOW ('q', 0x8C, int)
124	#define PHONE_FRAME _IOW ('q', 0x8D, int)
125	#define PHONE_REC_VOLUME _IOW ('q', 0x8E, int)
126	#define PHONE_REC_VOLUME_LINEAR _IOW ('q', 0xDB, int)
127	#define PHONE_REC_LEVEL _IO ('q', 0x8F)
128
129	#define PHONE_PLAY_CODEC _IOW ('q', 0x90, int)
130	#define PHONE_PLAY_START _IO ('q', 0x91)
131	#define PHONE_PLAY_STOP _IO ('q', 0x92)
132	#define PHONE_PLAY_DEPTH _IOW ('q', 0x93, int)
133	#define PHONE_PLAY_VOLUME _IOW ('q', 0x94, int)
134	#define PHONE_PLAY_VOLUME_LINEAR _IOW ('q', 0xDC, int)
135	#define PHONE_PLAY_LEVEL _IO ('q', 0x95)
136	#define PHONE_DTMF_READY _IOR ('q', 0x96, int)
137	#define PHONE_GET_DTMF _IOR ('q', 0x97, int)
138	#define PHONE_GET_DTMF_ASCII _IOR ('q', 0x98, int)
139	#define PHONE_DTMF_OOB _IOW ('q', 0x99, int)
140	#define PHONE_EXCEPTION _IOR ('q', 0x9A, int)
141	#define PHONE_PLAY_TONE _IOW ('q', 0x9B, char)
142	#define PHONE_SET_TONE_ON_TIME _IOW ('q', 0x9C, int)
143	#define PHONE_SET_TONE_OFF_TIME _IOW ('q', 0x9D, int)
144	#define PHONE_GET_TONE_ON_TIME _IO ('q', 0x9E)
145	#define PHONE_GET_TONE_OFF_TIME _IO ('q', 0x9F)
146	#define PHONE_GET_TONE_STATE _IO ('q', 0xA0)
147	#define PHONE_BUSY _IO ('q', 0xA1)
148	#define PHONE_RINGBACK _IO ('q', 0xA2)
149	#define PHONE_DIALTONE _IO ('q', 0xA3)
150	#define PHONE_CPT_STOP _IO ('q', 0xA4)
151
152	#define PHONE_PSTN_SET_STATE _IOW ('q', 0xA4, int)
153	#define PHONE_PSTN_GET_STATE _IO ('q', 0xA5)
154
155	#define PSTN_ON_HOOK 0
156	#define PSTN_RINGING 1
157	#define PSTN_OFF_HOOK 2
158	#define PSTN_PULSE_DIAL 3
159
160	/******************************************************************************
161	*
162	* The wink duration is tunable with this ioctl. The default wink duration
163	* is 320ms. You do not need to use this ioctl if you do not require a
164	* different wink duration.
165	*
166	******************************************************************************/
167	#define PHONE_WINK_DURATION _IOW ('q', 0xA6, int)
168	#define PHONE_WINK _IOW ('q', 0xAA, int)
169
170	/******************************************************************************
171	*
172	* Codec Definitions
173	*
174	******************************************************************************/
175	typedef enum {
176	G723_63 = 1,
177	G723_53 = 2,
178	TS85 = 3,
179	TS48 = 4,
180	TS41 = 5,
181	G728 = 6,
182	G729 = 7,
183	ULAW = 8,
184	ALAW = 9,
185	LINEAR16 = 10,
186	LINEAR8 = 11,
187	WSS = 12,
188	G729B = 13
189	} phone_codec;
190
191	struct phone_codec_data
192	{
193	phone_codec type;
194	unsigned short buf_min, buf_opt, buf_max;
195	};
196
197	#define PHONE_QUERY_CODEC _IOWR ('q', 0xA7, struct phone_codec_data *)
198	#define PHONE_PSTN_LINETEST _IO ('q', 0xA8)
199
200	/******************************************************************************
201	*
202	* This controls the VAD/CNG functionality of G.723.1. The driver will
203	* always pass full size frames, any unused bytes will be padded with zeros,
204	* and frames passed to the driver should also be padded with zeros. The
205	* frame type is encoded in the least significant two bits of the first
206	* WORD of the frame as follows:
207	*
208	* bits 1-0 Frame Type Data Rate Significant Words
209	* 00 0 G.723.1 6.3 12
210	* 01 1 G.723.1 5.3 10
211	* 10 2 VAD/CNG 2
212	* 11 3 Repeat last CNG 2 bits
213	*
214	******************************************************************************/
215	#define PHONE_VAD _IOW ('q', 0xA9, int)
216
217
218	/******************************************************************************
219	*
220	* The exception structure allows us to multiplex multiple events onto the
221	* select() exception set. If any of these flags are set select() will
222	* return with a positive indication on the exception set. The dtmf_ready
223	* bit indicates if there is data waiting in the DTMF buffer. The
224	* hookstate bit is set if there is a change in hookstate status, it does not
225	* indicate the current state of the hookswitch. The pstn_ring bit
226	* indicates that the DAA on a LineJACK card has detected ring voltage on
227	* the PSTN port. The caller_id bit indicates that caller_id data has been
228	* received and is available. The pstn_wink bit indicates that the DAA on
229	* the LineJACK has received a wink from the telco switch. The f0, f1, f2
230	* and f3 bits indicate that the filter has been triggered by detecting the
231	* frequency programmed into that filter.
232	*
233	* The remaining bits should be set to zero. They will become defined over time
234	* for other interface cards and their needs.
235	*
236	******************************************************************************/
237	struct phone_except
238	{
239	unsigned int dtmf_ready:1;
240	unsigned int hookstate:1;
241	unsigned int pstn_ring:1;
242	unsigned int caller_id:1;
243	unsigned int pstn_wink:1;
244	unsigned int f0:1;
245	unsigned int f1:1;
246	unsigned int f2:1;
247	unsigned int f3:1;
248	unsigned int flash:1;
249	unsigned int fc0:1;
250	unsigned int fc1:1;
251	unsigned int fc2:1;
252	unsigned int fc3:1;
253	unsigned int reserved:18;
254	};
255
256	union telephony_exception {
257	struct phone_except bits;
258	unsigned int bytes;
259	};
260
261
262	#endif /* TELEPHONY_H */
263

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

@@ -42,6 +42,18 @@ struct itimerval { · 41 unmodified lines
42	struct timeval it_value; /* current value */	42	struct timeval it_value; /* current value */
43	};	43	};
44		44
		45	/*
		46	* legacy timeval structure, only embedded in structures that
		47	* traditionally used 'timeval' to pass time intervals (not absolute
		48	* times). Do not add new users. If user space fails to compile
		49	* here, this is probably because it is not y2038 safe and needs to
		50	* be changed to use another interface.
		51	*/
		52	struct __kernel_old_timeval {
		53	__kernel_long_t tv_sec;
		54	__kernel_long_t tv_usec;
		55	};
		56
45	/*	57	/*
46	* The IDs of the various system clocks (for POSIX.1b interval timers):	58	* The IDs of the various system clocks (for POSIX.1b interval timers):
47	*/	59	*/

include/uapi/linux/tipc.h+88−73

  * TIPC addressing primitives
  */
-struct tipc_portid {
+struct tipc_socket_addr {
 	__u32 ref;
 	__u32 node;
 };
-struct tipc_name {
+struct tipc_service_addr {
 	__u32 type;
 	__u32 instance;
 };
-struct tipc_name_seq {
+struct tipc_service_range {
 	__u32 type;
 	__u32 lower;
 	__u32 upper;
 };
-/* TIPC Address Size, Offset, Mask specification for Z.C.N
- */
-#define TIPC_NODE_BITS          12
-#define TIPC_CLUSTER_BITS       12
-#define TIPC_ZONE_BITS          8
-#define TIPC_NODE_OFFSET        0
-#define TIPC_CLUSTER_OFFSET     TIPC_NODE_BITS
-#define TIPC_ZONE_OFFSET        (TIPC_CLUSTER_OFFSET + TIPC_CLUSTER_BITS)
-#define TIPC_NODE_SIZE          ((1UL << TIPC_NODE_BITS) - 1)
-#define TIPC_CLUSTER_SIZE       ((1UL << TIPC_CLUSTER_BITS) - 1)
-#define TIPC_ZONE_SIZE          ((1UL << TIPC_ZONE_BITS) - 1)
-#define TIPC_NODE_MASK		(TIPC_NODE_SIZE << TIPC_NODE_OFFSET)
-#define TIPC_CLUSTER_MASK	(TIPC_CLUSTER_SIZE << TIPC_CLUSTER_OFFSET)
-#define TIPC_ZONE_MASK		(TIPC_ZONE_SIZE << TIPC_ZONE_OFFSET)
-#define TIPC_ZONE_CLUSTER_MASK (TIPC_ZONE_MASK | TIPC_CLUSTER_MASK)
-static inline __u32 tipc_addr(unsigned int zone,
-			      unsigned int cluster,
-			      unsigned int node)
-{
-	return (zone << TIPC_ZONE_OFFSET) |
-		(cluster << TIPC_CLUSTER_OFFSET) |
-		node;
-}
-static inline unsigned int tipc_zone(__u32 addr)
-{
-	return addr >> TIPC_ZONE_OFFSET;
-}
-static inline unsigned int tipc_cluster(__u32 addr)
-{
-	return (addr & TIPC_CLUSTER_MASK) >> TIPC_CLUSTER_OFFSET;
-}
-static inline unsigned int tipc_node(__u32 addr)
-{
-	return addr & TIPC_NODE_MASK;
-}
 /*
- * Application-accessible port name types
+ * Application-accessible service types
  */
-#define TIPC_CFG_SRV		0	/* configuration service name type */
+#define TIPC_NODE_STATE		0	/* node state service type */
-#define TIPC_TOP_SRV		1	/* topology service name type */
+#define TIPC_TOP_SRV		1	/* topology server service type */
-#define TIPC_LINK_STATE		2	/* link state name type */
+#define TIPC_LINK_STATE		2	/* link state service type */
-#define TIPC_RESERVED_TYPES	64	/* lowest user-publishable name type */
+#define TIPC_RESERVED_TYPES	64	/* lowest user-allowed service type */
 /*
- * Publication scopes when binding port names and port name sequences
+ * Publication scopes when binding service / service range
  */
-#define TIPC_ZONE_SCOPE         1
+enum tipc_scope {
-#define TIPC_CLUSTER_SCOPE      2
+	TIPC_CLUSTER_SCOPE = 2, /* 0 can also be used */
-#define TIPC_NODE_SCOPE         3
+	TIPC_NODE_SCOPE    = 3
+};
 /*
  * Limiting values for messages
  * TIPC topology subscription service definitions
  */
-#define TIPC_SUB_PORTS		0x01	/* filter for port availability */
+#define TIPC_SUB_PORTS          0x01    /* filter: evt at each match */
-#define TIPC_SUB_SERVICE	0x02	/* filter for service availability */
+#define TIPC_SUB_SERVICE        0x02    /* filter: evt at first up/last down */
-#define TIPC_SUB_CANCEL		0x04	/* cancel a subscription */
+#define TIPC_SUB_CANCEL         0x04    /* filter: cancel a subscription */
 #define TIPC_WAIT_FOREVER	(~0)	/* timeout for permanent subscription */
 struct tipc_subscr {
-	struct tipc_name_seq seq;	/* name sequence of interest */
+	struct tipc_service_range seq;	/* range of interest */
 	__u32 timeout;			/* subscription duration (in ms) */
 	__u32 filter;			/* bitmask of filter options */
 	char usr_handle[8];		/* available for subscriber use */
 };
 #define TIPC_PUBLISHED		1	/* publication event */
-#define TIPC_WITHDRAWN		2	/* withdraw event */
+#define TIPC_WITHDRAWN		2	/* withdrawal event */
 #define TIPC_SUBSCR_TIMEOUT	3	/* subscription timeout event */
 struct tipc_event {
 	__u32 event;			/* event type */
-	__u32 found_lower;		/* matching name seq instances */
+	__u32 found_lower;		/* matching range */
-	__u32 found_upper;		/*    "      "    "     "      */
+	__u32 found_upper;		/*    "      "    */
-	struct tipc_portid port;	/* associated port */
+	struct tipc_socket_addr port;	/* associated socket */
 	struct tipc_subscr s;		/* associated subscription */
 };
 #define SOL_TIPC	271
 #endif
-#define TIPC_ADDR_NAMESEQ	1
+#define TIPC_ADDR_MCAST         1
-#define TIPC_ADDR_MCAST		1
+#define TIPC_SERVICE_RANGE      1
-#define TIPC_ADDR_NAME		2
+#define TIPC_SERVICE_ADDR       2
-#define TIPC_ADDR_ID		3
+#define TIPC_SOCKET_ADDR        3
 struct sockaddr_tipc {
 	unsigned short family;
 	unsigned char  addrtype;
 	signed   char  scope;
 	union {
-		struct tipc_portid id;
+		struct tipc_socket_addr id;
-		struct tipc_name_seq nameseq;
+		struct tipc_service_range nameseq;
 		struct {
-			struct tipc_name name;
+			struct tipc_service_addr name;
 			__u32 domain;
 		} name;
 	} addr;
 struct tipc_group_req {
 	__u32 type;      /* group id */
 	__u32 instance;  /* member id */
-	__u32 scope;     /* zone/cluster/node */
+	__u32 scope;     /* cluster/node */
 	__u32 flags;
 };
 #define TIPC_MAX_MEDIA_NAME	16
 #define TIPC_MAX_IF_NAME	16
 #define TIPC_MAX_BEARER_NAME	32
-#define TIPC_MAX_LINK_NAME	60
+#define TIPC_MAX_LINK_NAME	68
 #define SIOCGETLINKNAME		SIOCPROTOPRIVATE
 	__u32 bearer_id;
 	char linkname[TIPC_MAX_LINK_NAME];
 };
+/* The macros and functions below are deprecated:
+ */
+#define TIPC_CFG_SRV		0
+#define TIPC_ZONE_SCOPE         1
+#define TIPC_ADDR_NAMESEQ	1
+#define TIPC_ADDR_NAME		2
+#define TIPC_ADDR_ID		3
+#define TIPC_NODE_BITS          12
+#define TIPC_CLUSTER_BITS       12
+#define TIPC_ZONE_BITS          8
+#define TIPC_NODE_OFFSET        0
+#define TIPC_CLUSTER_OFFSET     TIPC_NODE_BITS
+#define TIPC_ZONE_OFFSET        (TIPC_CLUSTER_OFFSET + TIPC_CLUSTER_BITS)
+#define TIPC_NODE_SIZE          ((1UL << TIPC_NODE_BITS) - 1)
+#define TIPC_CLUSTER_SIZE       ((1UL << TIPC_CLUSTER_BITS) - 1)
+#define TIPC_ZONE_SIZE          ((1UL << TIPC_ZONE_BITS) - 1)
+#define TIPC_NODE_MASK		(TIPC_NODE_SIZE << TIPC_NODE_OFFSET)
+#define TIPC_CLUSTER_MASK	(TIPC_CLUSTER_SIZE << TIPC_CLUSTER_OFFSET)
+#define TIPC_ZONE_MASK		(TIPC_ZONE_SIZE << TIPC_ZONE_OFFSET)
+#define TIPC_ZONE_CLUSTER_MASK (TIPC_ZONE_MASK | TIPC_CLUSTER_MASK)
+#define tipc_portid tipc_socket_addr
+#define tipc_name tipc_service_addr
+#define tipc_name_seq tipc_service_range
+static inline __u32 tipc_addr(unsigned int zone,
+			      unsigned int cluster,
+			      unsigned int node)
+{
+	return (zone << TIPC_ZONE_OFFSET) |
+		(cluster << TIPC_CLUSTER_OFFSET) |
+		node;
+}
+static inline unsigned int tipc_zone(__u32 addr)
+{
+	return addr >> TIPC_ZONE_OFFSET;
+}
+static inline unsigned int tipc_cluster(__u32 addr)
+{
+	return (addr & TIPC_CLUSTER_MASK) >> TIPC_CLUSTER_OFFSET;
+}
+static inline unsigned int tipc_node(__u32 addr)
+{
+	return addr & TIPC_NODE_MASK;
+}
 #endif

include/uapi/linux/tipc_netlink.h+21−0

@@ -114,6 +114,13 @@ enum { · 113 unmodified lines
114	TIPC_NLA_SOCK_REF, /* u32 */	114	TIPC_NLA_SOCK_REF, /* u32 */
115	TIPC_NLA_SOCK_CON, /* nest */	115	TIPC_NLA_SOCK_CON, /* nest */
116	TIPC_NLA_SOCK_HAS_PUBL, /* flag */	116	TIPC_NLA_SOCK_HAS_PUBL, /* flag */
		117	TIPC_NLA_SOCK_STAT, /* nest */
		118	TIPC_NLA_SOCK_TYPE, /* u32 */
		119	TIPC_NLA_SOCK_INO, /* u32 */
		120	TIPC_NLA_SOCK_UID, /* u32 */
		121	TIPC_NLA_SOCK_TIPC_STATE, /* u32 */
		122	TIPC_NLA_SOCK_COOKIE, /* u64 */
		123	TIPC_NLA_SOCK_PAD, /* flag */
117		124
118	__TIPC_NLA_SOCK_MAX,	125	__TIPC_NLA_SOCK_MAX,
119	TIPC_NLA_SOCK_MAX = __TIPC_NLA_SOCK_MAX - 1	126	TIPC_NLA_SOCK_MAX = __TIPC_NLA_SOCK_MAX - 1
@@ -162,6 +169,8 @@ enum { · 42 unmodified lines
162	TIPC_NLA_NET_UNSPEC,	169	TIPC_NLA_NET_UNSPEC,
163	TIPC_NLA_NET_ID, /* u32 */	170	TIPC_NLA_NET_ID, /* u32 */
164	TIPC_NLA_NET_ADDR, /* u32 */	171	TIPC_NLA_NET_ADDR, /* u32 */
		172	TIPC_NLA_NET_NODEID, /* u64 */
		173	TIPC_NLA_NET_NODEID_W1, /* u64 */
165		174
166	__TIPC_NLA_NET_MAX,	175	__TIPC_NLA_NET_MAX,
167	TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1	176	TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1
@@ -238,6 +247,18 @@ enum { · 70 unmodified lines
238	TIPC_NLA_CON_MAX = __TIPC_NLA_CON_MAX - 1	247	TIPC_NLA_CON_MAX = __TIPC_NLA_CON_MAX - 1
239	};	248	};
240		249
		250	/* Nest, socket statistics info */
		251	enum {
		252	TIPC_NLA_SOCK_STAT_RCVQ, /* u32 */
		253	TIPC_NLA_SOCK_STAT_SENDQ, /* u32 */
		254	TIPC_NLA_SOCK_STAT_LINK_CONG, /* flag */
		255	TIPC_NLA_SOCK_STAT_CONN_CONG, /* flag */
		256	TIPC_NLA_SOCK_STAT_DROP, /* u32 */
		257
		258	__TIPC_NLA_SOCK_STAT_MAX,
		259	TIPC_NLA_SOCK_STAT_MAX = __TIPC_NLA_SOCK_STAT_MAX - 1
		260	};
		261
241	/* Nest, link propreties. Valid for link, media and bearer */	262	/* Nest, link propreties. Valid for link, media and bearer */
242	enum {	263	enum {
243	TIPC_NLA_PROP_UNSPEC,	264	TIPC_NLA_PROP_UNSPEC,

include/uapi/linux/tipc_sockets_diag.h+17−0

@@ -0,0 +1,17 @@
	1	/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
	2	/* AF_TIPC sock_diag interface for querying open sockets */
	3
	4	#ifndef _UAPI__TIPC_SOCKETS_DIAG_H__
	5	#define _UAPI__TIPC_SOCKETS_DIAG_H__
	6
	7	#include <linux/types.h>
	8	#include <linux/sock_diag.h>
	9
	10	/* Request */
	11	struct tipc_sock_diag_req {
	12	__u8 sdiag_family; /* must be AF_TIPC */
	13	__u8 sdiag_protocol; /* must be 0 */
	14	__u16 pad; /* must be 0 */
	15	__u32 tidiag_states; /* query*/
	16	};
	17	#endif /* _UAPI__TIPC_SOCKETS_DIAG_H__ */

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

 /* TLS socket options */
 #define TLS_TX			1	/* Set transmit parameters */
+#define TLS_RX			2	/* Set receive parameters */
 /* Supported versions */
 #define TLS_VERSION_MINOR(ver)	((ver) & 0xFF)
 #define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE		8
 #define TLS_SET_RECORD_TYPE	1
+#define TLS_GET_RECORD_TYPE	2
 struct tls_crypto_info {
 	__u16 version;

include/uapi/linux/usb/audio.h+1−0

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	/* bInterfaceProtocol values to denote the version of the standard used */	27	/* bInterfaceProtocol values to denote the version of the standard used */
28	#define UAC_VERSION_1 0x00	28	#define UAC_VERSION_1 0x00
29	#define UAC_VERSION_2 0x20	29	#define UAC_VERSION_2 0x20
		30	#define UAC_VERSION_3 0x30
30		31
31	/* A.2 Audio Interface Subclass Codes */	32	/* A.2 Audio Interface Subclass Codes */
32	#define USB_SUBCLASS_AUDIOCONTROL 0x01	33	#define USB_SUBCLASS_AUDIOCONTROL 0x01

include/uapi/linux/v4l2-controls.h+92−1

@@ -589,6 +589,98 @@ enum v4l2_vp8_golden_frame_sel { · 588 unmodified lines
589	#define V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP (V4L2_CID_MPEG_BASE+510)	589	#define V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP (V4L2_CID_MPEG_BASE+510)
590	#define V4L2_CID_MPEG_VIDEO_VPX_PROFILE (V4L2_CID_MPEG_BASE+511)	590	#define V4L2_CID_MPEG_VIDEO_VPX_PROFILE (V4L2_CID_MPEG_BASE+511)
591		591
		592	/* CIDs for HEVC encoding. */
		593
		594	#define V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP (V4L2_CID_MPEG_BASE + 600)
		595	#define V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP (V4L2_CID_MPEG_BASE + 601)
		596	#define V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP (V4L2_CID_MPEG_BASE + 602)
		597	#define V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP (V4L2_CID_MPEG_BASE + 603)
		598	#define V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP (V4L2_CID_MPEG_BASE + 604)
		599	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_QP (V4L2_CID_MPEG_BASE + 605)
		600	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE (V4L2_CID_MPEG_BASE + 606)
		601	enum v4l2_mpeg_video_hevc_hier_coding_type {
		602	V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B = 0,
		603	V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P = 1,
		604	};
		605	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER (V4L2_CID_MPEG_BASE + 607)
		606	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L0_QP (V4L2_CID_MPEG_BASE + 608)
		607	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L1_QP (V4L2_CID_MPEG_BASE + 609)
		608	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L2_QP (V4L2_CID_MPEG_BASE + 610)
		609	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_QP (V4L2_CID_MPEG_BASE + 611)
		610	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_QP (V4L2_CID_MPEG_BASE + 612)
		611	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_QP (V4L2_CID_MPEG_BASE + 613)
		612	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_QP (V4L2_CID_MPEG_BASE + 614)
		613	#define V4L2_CID_MPEG_VIDEO_HEVC_PROFILE (V4L2_CID_MPEG_BASE + 615)
		614	enum v4l2_mpeg_video_hevc_profile {
		615	V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN = 0,
		616	V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE = 1,
		617	V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10 = 2,
		618	};
		619	#define V4L2_CID_MPEG_VIDEO_HEVC_LEVEL (V4L2_CID_MPEG_BASE + 616)
		620	enum v4l2_mpeg_video_hevc_level {
		621	V4L2_MPEG_VIDEO_HEVC_LEVEL_1 = 0,
		622	V4L2_MPEG_VIDEO_HEVC_LEVEL_2 = 1,
		623	V4L2_MPEG_VIDEO_HEVC_LEVEL_2_1 = 2,
		624	V4L2_MPEG_VIDEO_HEVC_LEVEL_3 = 3,
		625	V4L2_MPEG_VIDEO_HEVC_LEVEL_3_1 = 4,
		626	V4L2_MPEG_VIDEO_HEVC_LEVEL_4 = 5,
		627	V4L2_MPEG_VIDEO_HEVC_LEVEL_4_1 = 6,
		628	V4L2_MPEG_VIDEO_HEVC_LEVEL_5 = 7,
		629	V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1 = 8,
		630	V4L2_MPEG_VIDEO_HEVC_LEVEL_5_2 = 9,
		631	V4L2_MPEG_VIDEO_HEVC_LEVEL_6 = 10,
		632	V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1 = 11,
		633	V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2 = 12,
		634	};
		635	#define V4L2_CID_MPEG_VIDEO_HEVC_FRAME_RATE_RESOLUTION (V4L2_CID_MPEG_BASE + 617)
		636	#define V4L2_CID_MPEG_VIDEO_HEVC_TIER (V4L2_CID_MPEG_BASE + 618)
		637	enum v4l2_mpeg_video_hevc_tier {
		638	V4L2_MPEG_VIDEO_HEVC_TIER_MAIN = 0,
		639	V4L2_MPEG_VIDEO_HEVC_TIER_HIGH = 1,
		640	};
		641	#define V4L2_CID_MPEG_VIDEO_HEVC_MAX_PARTITION_DEPTH (V4L2_CID_MPEG_BASE + 619)
		642	#define V4L2_CID_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE (V4L2_CID_MPEG_BASE + 620)
		643	enum v4l2_cid_mpeg_video_hevc_loop_filter_mode {
		644	V4L2_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE_DISABLED = 0,
		645	V4L2_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE_ENABLED = 1,
		646	V4L2_MPEG_VIDEO_HEVC_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY = 2,
		647	};
		648	#define V4L2_CID_MPEG_VIDEO_HEVC_LF_BETA_OFFSET_DIV2 (V4L2_CID_MPEG_BASE + 621)
		649	#define V4L2_CID_MPEG_VIDEO_HEVC_LF_TC_OFFSET_DIV2 (V4L2_CID_MPEG_BASE + 622)
		650	#define V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_TYPE (V4L2_CID_MPEG_BASE + 623)
		651	enum v4l2_cid_mpeg_video_hevc_refresh_type {
		652	V4L2_MPEG_VIDEO_HEVC_REFRESH_NONE = 0,
		653	V4L2_MPEG_VIDEO_HEVC_REFRESH_CRA = 1,
		654	V4L2_MPEG_VIDEO_HEVC_REFRESH_IDR = 2,
		655	};
		656	#define V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_PERIOD (V4L2_CID_MPEG_BASE + 624)
		657	#define V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU (V4L2_CID_MPEG_BASE + 625)
		658	#define V4L2_CID_MPEG_VIDEO_HEVC_CONST_INTRA_PRED (V4L2_CID_MPEG_BASE + 626)
		659	#define V4L2_CID_MPEG_VIDEO_HEVC_WAVEFRONT (V4L2_CID_MPEG_BASE + 627)
		660	#define V4L2_CID_MPEG_VIDEO_HEVC_GENERAL_PB (V4L2_CID_MPEG_BASE + 628)
		661	#define V4L2_CID_MPEG_VIDEO_HEVC_TEMPORAL_ID (V4L2_CID_MPEG_BASE + 629)
		662	#define V4L2_CID_MPEG_VIDEO_HEVC_STRONG_SMOOTHING (V4L2_CID_MPEG_BASE + 630)
		663	#define V4L2_CID_MPEG_VIDEO_HEVC_MAX_NUM_MERGE_MV_MINUS1 (V4L2_CID_MPEG_BASE + 631)
		664	#define V4L2_CID_MPEG_VIDEO_HEVC_INTRA_PU_SPLIT (V4L2_CID_MPEG_BASE + 632)
		665	#define V4L2_CID_MPEG_VIDEO_HEVC_TMV_PREDICTION (V4L2_CID_MPEG_BASE + 633)
		666	#define V4L2_CID_MPEG_VIDEO_HEVC_WITHOUT_STARTCODE (V4L2_CID_MPEG_BASE + 634)
		667	#define V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD (V4L2_CID_MPEG_BASE + 635)
		668	enum v4l2_cid_mpeg_video_hevc_size_of_length_field {
		669	V4L2_MPEG_VIDEO_HEVC_SIZE_0 = 0,
		670	V4L2_MPEG_VIDEO_HEVC_SIZE_1 = 1,
		671	V4L2_MPEG_VIDEO_HEVC_SIZE_2 = 2,
		672	V4L2_MPEG_VIDEO_HEVC_SIZE_4 = 3,
		673	};
		674	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L0_BR (V4L2_CID_MPEG_BASE + 636)
		675	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L1_BR (V4L2_CID_MPEG_BASE + 637)
		676	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L2_BR (V4L2_CID_MPEG_BASE + 638)
		677	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L3_BR (V4L2_CID_MPEG_BASE + 639)
		678	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR (V4L2_CID_MPEG_BASE + 640)
		679	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR (V4L2_CID_MPEG_BASE + 641)
		680	#define V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L6_BR (V4L2_CID_MPEG_BASE + 642)
		681	#define V4L2_CID_MPEG_VIDEO_REF_NUMBER_FOR_PFRAMES (V4L2_CID_MPEG_BASE + 643)
		682	#define V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR (V4L2_CID_MPEG_BASE + 644)
		683
592	/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */	684	/* MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
593	#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG \| 0x1000)	685	#define V4L2_CID_MPEG_CX2341X_BASE (V4L2_CTRL_CLASS_MPEG \| 0x1000)
594	#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0)	686	#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_MPEG_CX2341X_BASE+0)
@@ -657,7 +749,6 @@ enum v4l2_mpeg_mfc51_video_force_frame_type { · 62 unmodified lines
657	#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC (V4L2_CID_MPEG_MFC51_BASE+53)	749	#define V4L2_CID_MPEG_MFC51_VIDEO_H264_ADAPTIVE_RC_STATIC (V4L2_CID_MPEG_MFC51_BASE+53)
658	#define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P (V4L2_CID_MPEG_MFC51_BASE+54)	750	#define V4L2_CID_MPEG_MFC51_VIDEO_H264_NUM_REF_PIC_FOR_P (V4L2_CID_MPEG_MFC51_BASE+54)
659		751
660
661	/* Camera class control IDs */	752	/* Camera class control IDs */
662		753
663	#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA \| 0x900)	754	#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA \| 0x900)

include/uapi/linux/v4l2-mediabus.h+2−2

@@ -18,8 +18,8 @@ · 17 unmodified lines
18		18
19	/**	19	/**
20	* struct v4l2_mbus_framefmt - frame format on the media bus	20	* struct v4l2_mbus_framefmt - frame format on the media bus
21	* @width: frame width	21	* @width: image width
22	* @height: frame height	22	* @height: image height
23	* @code: data format code (from enum v4l2_mbus_pixelcode)	23	* @code: data format code (from enum v4l2_mbus_pixelcode)
24	* @field: used interlacing type (from enum v4l2_field)	24	* @field: used interlacing type (from enum v4l2_field)
25	* @colorspace: colorspace of the data (from enum v4l2_colorspace)	25	* @colorspace: colorspace of the data (from enum v4l2_colorspace)

include/uapi/linux/vfio.h+27−0

@@ -575,6 +575,33 @@ struct vfio_device_gfx_plane_info { · 574 unmodified lines
575		575
576	#define VFIO_DEVICE_GET_GFX_DMABUF _IO(VFIO_TYPE, VFIO_BASE + 15)	576	#define VFIO_DEVICE_GET_GFX_DMABUF _IO(VFIO_TYPE, VFIO_BASE + 15)
577		577
		578	/**
		579	* VFIO_DEVICE_IOEVENTFD - _IOW(VFIO_TYPE, VFIO_BASE + 16,
		580	* struct vfio_device_ioeventfd)
		581	*
		582	* Perform a write to the device at the specified device fd offset, with
		583	* the specified data and width when the provided eventfd is triggered.
		584	* vfio bus drivers may not support this for all regions, for all widths,
		585	* or at all. vfio-pci currently only enables support for BAR regions,
		586	* excluding the MSI-X vector table.
		587	*
		588	* Return: 0 on success, -errno on failure.
		589	*/
		590	struct vfio_device_ioeventfd {
		591	__u32 argsz;
		592	__u32 flags;
		593	#define VFIO_DEVICE_IOEVENTFD_8 (1 << 0) /* 1-byte write */
		594	#define VFIO_DEVICE_IOEVENTFD_16 (1 << 1) /* 2-byte write */
		595	#define VFIO_DEVICE_IOEVENTFD_32 (1 << 2) /* 4-byte write */
		596	#define VFIO_DEVICE_IOEVENTFD_64 (1 << 3) /* 8-byte write */
		597	#define VFIO_DEVICE_IOEVENTFD_SIZE_MASK (0xf)
		598	__u64 offset; /* device fd offset of write */
		599	__u64 data; /* data to be written */
		600	__s32 fd; /* -1 for de-assignment */
		601	};
		602
		603	#define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)
		604
578	/* -------- API for Type1 VFIO IOMMU -------- */	605	/* -------- API for Type1 VFIO IOMMU -------- */
579		606
580	/**	607	/**

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

@@ -635,6 +635,7 @@ struct v4l2_pix_format { · 634 unmodified lines
635	#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */	635	#define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */
636	#define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */	636	#define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */
637	#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0') /* VP9 */	637	#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0') /* VP9 */
		638	#define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C') /* HEVC aka H.265 */
638		639
639	/* Vendor-specific formats */	640	/* Vendor-specific formats */
640	#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */	641	#define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */

include/uapi/linux/virtio_balloon.h+18−1

@@ -53,7 +53,24 @@ struct virtio_balloon_config { · 52 unmodified lines
53	#define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */	53	#define VIRTIO_BALLOON_S_MEMTOT 5 /* Total amount of memory */
54	#define VIRTIO_BALLOON_S_AVAIL 6 /* Available memory as in /proc */	54	#define VIRTIO_BALLOON_S_AVAIL 6 /* Available memory as in /proc */
55	#define VIRTIO_BALLOON_S_CACHES 7 /* Disk caches */	55	#define VIRTIO_BALLOON_S_CACHES 7 /* Disk caches */
56	#define VIRTIO_BALLOON_S_NR 8	56	#define VIRTIO_BALLOON_S_HTLB_PGALLOC 8 /* Hugetlb page allocations */
		57	#define VIRTIO_BALLOON_S_HTLB_PGFAIL 9 /* Hugetlb page allocation failures */
		58	#define VIRTIO_BALLOON_S_NR 10
		59
		60	#define VIRTIO_BALLOON_S_NAMES_WITH_PREFIX(VIRTIO_BALLOON_S_NAMES_prefix) { \
		61	VIRTIO_BALLOON_S_NAMES_prefix "swap-in", \
		62	VIRTIO_BALLOON_S_NAMES_prefix "swap-out", \
		63	VIRTIO_BALLOON_S_NAMES_prefix "major-faults", \
		64	VIRTIO_BALLOON_S_NAMES_prefix "minor-faults", \
		65	VIRTIO_BALLOON_S_NAMES_prefix "free-memory", \
		66	VIRTIO_BALLOON_S_NAMES_prefix "total-memory", \
		67	VIRTIO_BALLOON_S_NAMES_prefix "available-memory", \
		68	VIRTIO_BALLOON_S_NAMES_prefix "disk-caches", \
		69	VIRTIO_BALLOON_S_NAMES_prefix "hugetlb-allocations", \
		70	VIRTIO_BALLOON_S_NAMES_prefix "hugetlb-failures" \
		71	}
		72
		73	#define VIRTIO_BALLOON_S_NAMES VIRTIO_BALLOON_S_NAMES_WITH_PREFIX("")
57		74
58	/*	75	/*
59	* Memory statistics structure.	76	* Memory statistics structure.

include/uapi/rdma/bnxt_re-abi.h+13−8

 	__u32 rsvd;
 };
+/*
+ * This struct is placed after the ib_uverbs_alloc_pd_resp struct, which is
+ * not 8 byted aligned. To avoid undesired padding in various cases we have to
+ * set this struct to packed.
+ */
 struct bnxt_re_pd_resp {
 	__u32 pdid;
 	__u32 dpi;
 	__u64 dbr;
-};
+} __attribute__((packed, aligned(4)));
 struct bnxt_re_cq_req {
-	__u64 cq_va;
+	__aligned_u64 cq_va;
-	__u64 cq_handle;
+	__aligned_u64 cq_handle;
 };
 struct bnxt_re_cq_resp {
 };
 struct bnxt_re_qp_req {
-	__u64 qpsva;
+	__aligned_u64 qpsva;
-	__u64 qprva;
+	__aligned_u64 qprva;
-	__u64 qp_handle;
+	__aligned_u64 qp_handle;
 };
 struct bnxt_re_qp_resp {
 };
 struct bnxt_re_srq_req {
-	__u64 srqva;
+	__aligned_u64 srqva;
-	__u64 srq_handle;
+	__aligned_u64 srq_handle;
 };
 struct bnxt_re_srq_resp {

include/uapi/rdma/cxgb3-abi.h+11−6

  * Make sure that all structs defined in this file remain laid out so
  * that they pack the same way on 32-bit and 64-bit architectures (to
  * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- * In particular do not use pointer types -- pass pointers in __u64
+ * In particular do not use pointer types -- pass pointers in __aligned_u64
  * instead.
  */
 struct iwch_create_cq_req {
-	__u64 user_rptr_addr;
+	__aligned_u64 user_rptr_addr;
 };
 struct iwch_create_cq_resp_v0 {
-	__u64 key;
+	__aligned_u64 key;
 	__u32 cqid;
 	__u32 size_log2;
 };
 struct iwch_create_cq_resp {
-	__u64 key;
+	__aligned_u64 key;
 	__u32 cqid;
 	__u32 size_log2;
 	__u32 memsize;
 };
 struct iwch_create_qp_resp {
-	__u64 key;
+	__aligned_u64 key;
-	__u64 db_key;
+	__aligned_u64 db_key;
 	__u32 qpid;
 	__u32 size_log2;
 	__u32 sq_size_log2;
 struct iwch_reg_user_mr_resp {
 	__u32 pbl_addr;
 };
+struct iwch_alloc_pd_resp {
+	__u32 pdid;
+};
 #endif /* CXGB3_ABI_USER_H */

include/uapi/rdma/cxgb4-abi.h+17−12

  * Make sure that all structs defined in this file remain laid out so
  * that they pack the same way on 32-bit and 64-bit architectures (to
  * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- * In particular do not use pointer types -- pass pointers in __u64
+ * In particular do not use pointer types -- pass pointers in __aligned_u64
  * instead.
  */
 struct c4iw_create_cq_resp {
-	__u64 key;
+	__aligned_u64 key;
-	__u64 gts_key;
+	__aligned_u64 gts_key;
-	__u64 memsize;
+	__aligned_u64 memsize;
 	__u32 cqid;
 	__u32 size;
 	__u32 qid_mask;
 };
 struct c4iw_create_qp_resp {
-	__u64 ma_sync_key;
+	__aligned_u64 ma_sync_key;
-	__u64 sq_key;
+	__aligned_u64 sq_key;
-	__u64 rq_key;
+	__aligned_u64 rq_key;
-	__u64 sq_db_gts_key;
+	__aligned_u64 sq_db_gts_key;
-	__u64 rq_db_gts_key;
+	__aligned_u64 rq_db_gts_key;
-	__u64 sq_memsize;
+	__aligned_u64 sq_memsize;
-	__u64 rq_memsize;
+	__aligned_u64 rq_memsize;
 	__u32 sqid;
 	__u32 rqid;
 	__u32 sq_size;
 };
 struct c4iw_alloc_ucontext_resp {
-	__u64 status_page_key;
+	__aligned_u64 status_page_key;
 	__u32 status_page_size;
 	__u32 reserved; /* explicit padding (optional for i386) */
 };
+struct c4iw_alloc_pd_resp {
+	__u32 pdid;
+};
 #endif /* CXGB4_ABI_USER_H */

include/uapi/rdma/hfi/hfi1_ioctl.h+16−16

@@ -79,7 +79,7 @@ struct hfi1_user_info { · 78 unmodified lines
79	};	79	};
80		80
81	struct hfi1_ctxt_info {	81	struct hfi1_ctxt_info {
82	__u64 runtime_flags; /* chip/drv runtime flags (HFI1_CAP_) /	82	__aligned_u64 runtime_flags; /* chip/drv runtime flags (HFI1_CAP_) /
83	__u32 rcvegr_size; /* size of each eager buffer */	83	__u32 rcvegr_size; /* size of each eager buffer */
84	__u16 num_active; /* number of active units */	84	__u16 num_active; /* number of active units */
85	__u16 unit; /* unit (chip) assigned to caller */	85	__u16 unit; /* unit (chip) assigned to caller */
@@ -98,9 +98,9 @@ struct hfi1_ctxt_info { · 12 unmodified lines
98		98
99	struct hfi1_tid_info {	99	struct hfi1_tid_info {
100	/* virtual address of first page in transfer */	100	/* virtual address of first page in transfer */
101	__u64 vaddr;	101	__aligned_u64 vaddr;
102	/* pointer to tid array. this array is big enough */	102	/* pointer to tid array. this array is big enough */
103	__u64 tidlist;	103	__aligned_u64 tidlist;
104	/* number of tids programmed by this request */	104	/* number of tids programmed by this request */
105	__u32 tidcnt;	105	__u32 tidcnt;
106	/* length of transfer buffer programmed by this request */	106	/* length of transfer buffer programmed by this request */
@@ -131,23 +131,23 @@ struct hfi1_base_info { · 24 unmodified lines
131	*/	131	*/
132	__u32 bthqp;	132	__u32 bthqp;
133	/* PIO credit return address, */	133	/* PIO credit return address, */
134	__u64 sc_credits_addr;	134	__aligned_u64 sc_credits_addr;
135	/*	135	/*
136	* Base address of write-only pio buffers for this process.	136	* Base address of write-only pio buffers for this process.
137	* Each buffer has sendpio_credits*64 bytes.	137	* Each buffer has sendpio_credits*64 bytes.
138	*/	138	*/
139	__u64 pio_bufbase_sop;	139	__aligned_u64 pio_bufbase_sop;
140	/*	140	/*
141	* Base address of write-only pio buffers for this process.	141	* Base address of write-only pio buffers for this process.
142	* Each buffer has sendpio_credits*64 bytes.	142	* Each buffer has sendpio_credits*64 bytes.
143	*/	143	*/
144	__u64 pio_bufbase;	144	__aligned_u64 pio_bufbase;
145	/* address where receive buffer queue is mapped into */	145	/* address where receive buffer queue is mapped into */
146	__u64 rcvhdr_bufbase;	146	__aligned_u64 rcvhdr_bufbase;
147	/* base address of Eager receive buffers. */	147	/* base address of Eager receive buffers. */
148	__u64 rcvegr_bufbase;	148	__aligned_u64 rcvegr_bufbase;
149	/* base address of SDMA completion ring */	149	/* base address of SDMA completion ring */
150	__u64 sdma_comp_bufbase;	150	__aligned_u64 sdma_comp_bufbase;
151	/*	151	/*
152	* User register base for init code, not to be used directly by	152	* User register base for init code, not to be used directly by
153	* protocol or applications. Always maps real chip register space.	153	* protocol or applications. Always maps real chip register space.
@@ -155,20 +155,20 @@ struct hfi1_base_info { · 1 unmodified line
155	* ur_rcvhdrhead, ur_rcvhdrtail, ur_rcvegrhead, ur_rcvegrtail,	155	* ur_rcvhdrhead, ur_rcvhdrtail, ur_rcvegrhead, ur_rcvegrtail,
156	* ur_rcvtidflow	156	* ur_rcvtidflow
157	*/	157	*/
158	__u64 user_regbase;	158	__aligned_u64 user_regbase;
159	/* notification events */	159	/* notification events */
160	__u64 events_bufbase;	160	__aligned_u64 events_bufbase;
161	/* status page */	161	/* status page */
162	__u64 status_bufbase;	162	__aligned_u64 status_bufbase;
163	/* rcvhdrtail update */	163	/* rcvhdrtail update */
164	__u64 rcvhdrtail_base;	164	__aligned_u64 rcvhdrtail_base;
165	/*	165	/*
166	* shared memory pages for subctxts if ctxt is shared; these cover	166	* shared memory pages for subctxts if ctxt is shared; these cover
167	* all the processes in the group sharing a single context.	167	* all the processes in the group sharing a single context.
168	* all have enough space for the num_subcontexts value on this job.	168	* all have enough space for the num_subcontexts value on this job.
169	*/	169	*/
170	__u64 subctxt_uregbase;	170	__aligned_u64 subctxt_uregbase;
171	__u64 subctxt_rcvegrbuf;	171	__aligned_u64 subctxt_rcvegrbuf;
172	__u64 subctxt_rcvhdrbuf;	172	__aligned_u64 subctxt_rcvhdrbuf;
173	};	173	};
174	#endif /* _LINIUX__HFI1_IOCTL_H */	174	#endif /* _LINIUX__HFI1_IOCTL_H */

include/uapi/rdma/hfi/hfi1_user.h+5−5

@@ -177,8 +177,8 @@ struct hfi1_sdma_comp_entry { · 176 unmodified lines
177	* Device status and notifications from driver to user-space.	177	* Device status and notifications from driver to user-space.
178	*/	178	*/
179	struct hfi1_status {	179	struct hfi1_status {
180	__u64 dev; /* device/hw status bits */	180	__aligned_u64 dev; /* device/hw status bits */
181	__u64 port; /* port state and status bits */	181	__aligned_u64 port; /* port state and status bits */
182	char freezemsg[0];	182	char freezemsg[0];
183	};	183	};
184		184
@@ -219,7 +219,7 @@ struct sdma_req_info { · 34 unmodified lines
219	* in charge of managing its own ring.	219	* in charge of managing its own ring.
220	*/	220	*/
221	__u16 comp_idx;	221	__u16 comp_idx;
222	} __packed;	222	} __attribute__((__packed__));
223		223
224	/*	224	/*
225	* SW KDETH header.	225	* SW KDETH header.
@@ -230,7 +230,7 @@ struct hfi1_kdeth_header { · 4 unmodified lines
230	__le16 jkey;	230	__le16 jkey;
231	__le16 hcrc;	231	__le16 hcrc;
232	__le32 swdata[7];	232	__le32 swdata[7];
233	} __packed;	233	} __attribute__((__packed__));
234		234
235	/*	235	/*
236	* Structure describing the headers that User space uses. The	236	* Structure describing the headers that User space uses. The
@@ -241,7 +241,7 @@ struct hfi1_pkt_header { · 4 unmodified lines
241	__be16 lrh[4];	241	__be16 lrh[4];
242	__be32 bth[3];	242	__be32 bth[3];
243	struct hfi1_kdeth_header kdeth;	243	struct hfi1_kdeth_header kdeth;
244	} __packed;	244	} __attribute__((__packed__));
245		245
246		246
247	/*	247	/*

include/uapi/rdma/hns-abi.h+19−3

 #include <linux/types.h>
 struct hns_roce_ib_create_cq {
-	__u64   buf_addr;
+	__aligned_u64 buf_addr;
+	__aligned_u64 db_addr;
+};
+struct hns_roce_ib_create_cq_resp {
+	__aligned_u64 cqn; /* Only 32 bits used, 64 for compat */
+	__aligned_u64 cap_flags;
 };
 struct hns_roce_ib_create_qp {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64   db_addr;
+	__aligned_u64 db_addr;
 	__u8    log_sq_bb_count;
 	__u8    log_sq_stride;
 	__u8    sq_no_prefetch;
 	__u8    reserved[5];
 };
+struct hns_roce_ib_create_qp_resp {
+	__aligned_u64 cap_flags;
+};
 struct hns_roce_ib_alloc_ucontext_resp {
 	__u32	qp_tab_size;
+	__u32	reserved;
 };
+struct hns_roce_ib_alloc_pd_resp {
+	__u32 pdn;
+};
 #endif /* HNS_ABI_USER_H */

include/uapi/rdma/i40iw-abi.h+107−0

@@ -0,0 +1,107 @@
	1	/*
	2	* Copyright (c) 2006 - 2016 Intel Corporation. All rights reserved.
	3	* Copyright (c) 2005 Topspin Communications. All rights reserved.
	4	* Copyright (c) 2005 Cisco Systems. All rights reserved.
	5	* Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
	6	*
	7	* This software is available to you under a choice of one of two
	8	* licenses. You may choose to be licensed under the terms of the GNU
	9	* General Public License (GPL) Version 2, available from the file
	10	* COPYING in the main directory of this source tree, or the
	11	* OpenIB.org BSD license below:
	12	*
	13	* Redistribution and use in source and binary forms, with or
	14	* without modification, are permitted provided that the following
	15	* conditions are met:
	16	*
	17	* - Redistributions of source code must retain the above
	18	* copyright notice, this list of conditions and the following
	19	* disclaimer.
	20	*
	21	* - Redistributions in binary form must reproduce the above
	22	* copyright notice, this list of conditions and the following
	23	* disclaimer in the documentation and/or other materials
	24	* provided with the distribution.
	25	*
	26	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	27	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	28	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	29	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	30	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	31	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	32	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	33	* SOFTWARE.
	34	*
	35	*/
	36
	37	#ifndef I40IW_ABI_H
	38	#define I40IW_ABI_H
	39
	40	#include <linux/types.h>
	41
	42	#define I40IW_ABI_VER 5
	43
	44	struct i40iw_alloc_ucontext_req {
	45	__u32 reserved32;
	46	__u8 userspace_ver;
	47	__u8 reserved8[3];
	48	};
	49
	50	struct i40iw_alloc_ucontext_resp {
	51	__u32 max_pds; /* maximum pds allowed for this user process */
	52	__u32 max_qps; /* maximum qps allowed for this user process */
	53	__u32 wq_size; /* size of the WQs (sq+rq) allocated to the mmaped area */
	54	__u8 kernel_ver;
	55	__u8 reserved[3];
	56	};
	57
	58	struct i40iw_alloc_pd_resp {
	59	__u32 pd_id;
	60	__u8 reserved[4];
	61	};
	62
	63	struct i40iw_create_cq_req {
	64	__aligned_u64 user_cq_buffer;
	65	__aligned_u64 user_shadow_area;
	66	};
	67
	68	struct i40iw_create_qp_req {
	69	__aligned_u64 user_wqe_buffers;
	70	__aligned_u64 user_compl_ctx;
	71
	72	/* UDA QP PHB */
	73	__aligned_u64 user_sq_phb; /* place for VA of the sq phb buff */
	74	__aligned_u64 user_rq_phb; /* place for VA of the rq phb buff */
	75	};
	76
	77	enum i40iw_memreg_type {
	78	IW_MEMREG_TYPE_MEM = 0x0000,
	79	IW_MEMREG_TYPE_QP = 0x0001,
	80	IW_MEMREG_TYPE_CQ = 0x0002,
	81	};
	82
	83	struct i40iw_mem_reg_req {
	84	__u16 reg_type; /* Memory, QP or CQ */
	85	__u16 cq_pages;
	86	__u16 rq_pages;
	87	__u16 sq_pages;
	88	};
	89
	90	struct i40iw_create_cq_resp {
	91	__u32 cq_id;
	92	__u32 cq_size;
	93	__u32 mmap_db_index;
	94	__u32 reserved;
	95	};
	96
	97	struct i40iw_create_qp_resp {
	98	__u32 qp_id;
	99	__u32 actual_sq_size;
	100	__u32 actual_rq_size;
	101	__u32 i40iw_drv_opt;
	102	__u16 push_idx;
	103	__u8 lsmm;
	104	__u8 rsvd2;
	105	};
	106
	107	#endif

include/uapi/rdma/ib_user_cm.h+24−24

@@ -73,8 +73,8 @@ struct ib_ucm_cmd_hdr { · 72 unmodified lines
73	};	73	};
74		74
75	struct ib_ucm_create_id {	75	struct ib_ucm_create_id {
76	__u64 uid;	76	__aligned_u64 uid;
77	__u64 response;	77	__aligned_u64 response;
78	};	78	};
79		79
80	struct ib_ucm_create_id_resp {	80	struct ib_ucm_create_id_resp {
@@ -82,7 +82,7 @@ struct ib_ucm_create_id_resp { · 1 unmodified line
82	};	82	};
83		83
84	struct ib_ucm_destroy_id {	84	struct ib_ucm_destroy_id {
85	__u64 response;	85	__aligned_u64 response;
86	__u32 id;	86	__u32 id;
87	__u32 reserved;	87	__u32 reserved;
88	};	88	};
@@ -92,7 +92,7 @@ struct ib_ucm_destroy_id_resp { · 3 unmodified lines
92	};	92	};
93		93
94	struct ib_ucm_attr_id {	94	struct ib_ucm_attr_id {
95	__u64 response;	95	__aligned_u64 response;
96	__u32 id;	96	__u32 id;
97	__u32 reserved;	97	__u32 reserved;
98	};	98	};
@@ -105,7 +105,7 @@ struct ib_ucm_attr_id_resp { · 6 unmodified lines
105	};	105	};
106		106
107	struct ib_ucm_init_qp_attr {	107	struct ib_ucm_init_qp_attr {
108	__u64 response;	108	__aligned_u64 response;
109	__u32 id;	109	__u32 id;
110	__u32 qp_state;	110	__u32 qp_state;
111	};	111	};
@@ -123,7 +123,7 @@ struct ib_ucm_notify { · 11 unmodified lines
123	};	123	};
124		124
125	struct ib_ucm_private_data {	125	struct ib_ucm_private_data {
126	__u64 data;	126	__aligned_u64 data;
127	__u32 id;	127	__u32 id;
128	__u8 len;	128	__u8 len;
129	__u8 reserved[3];	129	__u8 reserved[3];
@@ -135,9 +135,9 @@ struct ib_ucm_req { · 5 unmodified lines
135	__u32 qp_type;	135	__u32 qp_type;
136	__u32 psn;	136	__u32 psn;
137	__be64 sid;	137	__be64 sid;
138	__u64 data;	138	__aligned_u64 data;
139	__u64 primary_path;	139	__aligned_u64 primary_path;
140	__u64 alternate_path;	140	__aligned_u64 alternate_path;
141	__u8 len;	141	__u8 len;
142	__u8 peer_to_peer;	142	__u8 peer_to_peer;
143	__u8 responder_resources;	143	__u8 responder_resources;
@@ -153,8 +153,8 @@ struct ib_ucm_req { · 9 unmodified lines
153	};	153	};
154		154
155	struct ib_ucm_rep {	155	struct ib_ucm_rep {
156	__u64 uid;	156	__aligned_u64 uid;
157	__u64 data;	157	__aligned_u64 data;
158	__u32 id;	158	__u32 id;
159	__u32 qpn;	159	__u32 qpn;
160	__u32 psn;	160	__u32 psn;
@@ -172,15 +172,15 @@ struct ib_ucm_rep { · 11 unmodified lines
172	struct ib_ucm_info {	172	struct ib_ucm_info {
173	__u32 id;	173	__u32 id;
174	__u32 status;	174	__u32 status;
175	__u64 info;	175	__aligned_u64 info;
176	__u64 data;	176	__aligned_u64 data;
177	__u8 info_len;	177	__u8 info_len;
178	__u8 data_len;	178	__u8 data_len;
179	__u8 reserved[6];	179	__u8 reserved[6];
180	};	180	};
181		181
182	struct ib_ucm_mra {	182	struct ib_ucm_mra {
183	__u64 data;	183	__aligned_u64 data;
184	__u32 id;	184	__u32 id;
185	__u8 len;	185	__u8 len;
186	__u8 timeout;	186	__u8 timeout;
@@ -188,8 +188,8 @@ struct ib_ucm_mra { · 1 unmodified line
188	};	188	};
189		189
190	struct ib_ucm_lap {	190	struct ib_ucm_lap {
191	__u64 path;	191	__aligned_u64 path;
192	__u64 data;	192	__aligned_u64 data;
193	__u32 id;	193	__u32 id;
194	__u8 len;	194	__u8 len;
195	__u8 reserved[3];	195	__u8 reserved[3];
@@ -199,8 +199,8 @@ struct ib_ucm_sidr_req { · 3 unmodified lines
199	__u32 id;	199	__u32 id;
200	__u32 timeout;	200	__u32 timeout;
201	__be64 sid;	201	__be64 sid;
202	__u64 data;	202	__aligned_u64 data;
203	__u64 path;	203	__aligned_u64 path;
204	__u16 reserved_pkey;	204	__u16 reserved_pkey;
205	__u8 len;	205	__u8 len;
206	__u8 max_cm_retries;	206	__u8 max_cm_retries;
@@ -212,8 +212,8 @@ struct ib_ucm_sidr_rep { · 5 unmodified lines
212	__u32 qpn;	212	__u32 qpn;
213	__u32 qkey;	213	__u32 qkey;
214	__u32 status;	214	__u32 status;
215	__u64 info;	215	__aligned_u64 info;
216	__u64 data;	216	__aligned_u64 data;
217	__u8 info_len;	217	__u8 info_len;
218	__u8 data_len;	218	__u8 data_len;
219	__u8 reserved[6];	219	__u8 reserved[6];
@@ -222,9 +222,9 @@ struct ib_ucm_sidr_rep { · 2 unmodified lines
222	* event notification ABI structures.	222	* event notification ABI structures.
223	*/	223	*/
224	struct ib_ucm_event_get {	224	struct ib_ucm_event_get {
225	__u64 response;	225	__aligned_u64 response;
226	__u64 data;	226	__aligned_u64 data;
227	__u64 info;	227	__aligned_u64 info;
228	__u8 data_len;	228	__u8 data_len;
229	__u8 info_len;	229	__u8 info_len;
230	__u8 reserved[6];	230	__u8 reserved[6];
@@ -303,7 +303,7 @@ struct ib_ucm_sidr_rep_event_resp { · 72 unmodified lines
303	#define IB_UCM_PRES_ALTERNATE 0x08	303	#define IB_UCM_PRES_ALTERNATE 0x08
304		304
305	struct ib_ucm_event_resp {	305	struct ib_ucm_event_resp {
306	__u64 uid;	306	__aligned_u64 uid;
307	__u32 id;	307	__u32 id;
308	__u32 event;	308	__u32 event;
309	__u32 present;	309	__u32 present;

include/uapi/rdma/ib_user_ioctl_cmds.h+134−0

@@ -0,0 +1,134 @@
	1	/*
	2	* Copyright (c) 2018, Mellanox Technologies inc. All rights reserved.
	3	*
	4	* This software is available to you under a choice of one of two
	5	* licenses. You may choose to be licensed under the terms of the GNU
	6	* General Public License (GPL) Version 2, available from the file
	7	* COPYING in the main directory of this source tree, or the
	8	* OpenIB.org BSD license below:
	9	*
	10	* Redistribution and use in source and binary forms, with or
	11	* without modification, are permitted provided that the following
	12	* conditions are met:
	13	*
	14	* - Redistributions of source code must retain the above
	15	* copyright notice, this list of conditions and the following
	16	* disclaimer.
	17	*
	18	* - Redistributions in binary form must reproduce the above
	19	* copyright notice, this list of conditions and the following
	20	* disclaimer in the documentation and/or other materials
	21	* provided with the distribution.
	22	*
	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	25	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	26	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	27	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	28	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	29	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	30	* SOFTWARE.
	31	*/
	32
	33	#ifndef IB_USER_IOCTL_CMDS_H
	34	#define IB_USER_IOCTL_CMDS_H
	35
	36	#define UVERBS_ID_NS_MASK 0xF000
	37	#define UVERBS_ID_NS_SHIFT 12
	38
	39	#define UVERBS_UDATA_DRIVER_DATA_NS 1
	40	#define UVERBS_UDATA_DRIVER_DATA_FLAG (1UL << UVERBS_ID_NS_SHIFT)
	41
	42	enum uverbs_default_objects {
	43	UVERBS_OBJECT_DEVICE, /* No instances of DEVICE are allowed */
	44	UVERBS_OBJECT_PD,
	45	UVERBS_OBJECT_COMP_CHANNEL,
	46	UVERBS_OBJECT_CQ,
	47	UVERBS_OBJECT_QP,
	48	UVERBS_OBJECT_SRQ,
	49	UVERBS_OBJECT_AH,
	50	UVERBS_OBJECT_MR,
	51	UVERBS_OBJECT_MW,
	52	UVERBS_OBJECT_FLOW,
	53	UVERBS_OBJECT_XRCD,
	54	UVERBS_OBJECT_RWQ_IND_TBL,
	55	UVERBS_OBJECT_WQ,
	56	UVERBS_OBJECT_FLOW_ACTION,
	57	UVERBS_OBJECT_DM,
	58	};
	59
	60	enum {
	61	UVERBS_ATTR_UHW_IN = UVERBS_UDATA_DRIVER_DATA_FLAG,
	62	UVERBS_ATTR_UHW_OUT,
	63	};
	64
	65	enum uverbs_attrs_create_cq_cmd_attr_ids {
	66	UVERBS_ATTR_CREATE_CQ_HANDLE,
	67	UVERBS_ATTR_CREATE_CQ_CQE,
	68	UVERBS_ATTR_CREATE_CQ_USER_HANDLE,
	69	UVERBS_ATTR_CREATE_CQ_COMP_CHANNEL,
	70	UVERBS_ATTR_CREATE_CQ_COMP_VECTOR,
	71	UVERBS_ATTR_CREATE_CQ_FLAGS,
	72	UVERBS_ATTR_CREATE_CQ_RESP_CQE,
	73	};
	74
	75	enum uverbs_attrs_destroy_cq_cmd_attr_ids {
	76	UVERBS_ATTR_DESTROY_CQ_HANDLE,
	77	UVERBS_ATTR_DESTROY_CQ_RESP,
	78	};
	79
	80	enum uverbs_attrs_create_flow_action_esp {
	81	UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE,
	82	UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,
	83	UVERBS_ATTR_FLOW_ACTION_ESP_ESN,
	84	UVERBS_ATTR_FLOW_ACTION_ESP_KEYMAT,
	85	UVERBS_ATTR_FLOW_ACTION_ESP_REPLAY,
	86	UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,
	87	};
	88
	89	enum uverbs_attrs_destroy_flow_action_esp {
	90	UVERBS_ATTR_DESTROY_FLOW_ACTION_HANDLE,
	91	};
	92
	93	enum uverbs_methods_cq {
	94	UVERBS_METHOD_CQ_CREATE,
	95	UVERBS_METHOD_CQ_DESTROY,
	96	};
	97
	98	enum uverbs_methods_actions_flow_action_ops {
	99	UVERBS_METHOD_FLOW_ACTION_ESP_CREATE,
	100	UVERBS_METHOD_FLOW_ACTION_DESTROY,
	101	UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY,
	102	};
	103
	104	enum uverbs_attrs_alloc_dm_cmd_attr_ids {
	105	UVERBS_ATTR_ALLOC_DM_HANDLE,
	106	UVERBS_ATTR_ALLOC_DM_LENGTH,
	107	UVERBS_ATTR_ALLOC_DM_ALIGNMENT,
	108	};
	109
	110	enum uverbs_attrs_free_dm_cmd_attr_ids {
	111	UVERBS_ATTR_FREE_DM_HANDLE,
	112	};
	113
	114	enum uverbs_methods_dm {
	115	UVERBS_METHOD_DM_ALLOC,
	116	UVERBS_METHOD_DM_FREE,
	117	};
	118
	119	enum uverbs_attrs_reg_dm_mr_cmd_attr_ids {
	120	UVERBS_ATTR_REG_DM_MR_HANDLE,
	121	UVERBS_ATTR_REG_DM_MR_OFFSET,
	122	UVERBS_ATTR_REG_DM_MR_LENGTH,
	123	UVERBS_ATTR_REG_DM_MR_PD_HANDLE,
	124	UVERBS_ATTR_REG_DM_MR_ACCESS_FLAGS,
	125	UVERBS_ATTR_REG_DM_MR_DM_HANDLE,
	126	UVERBS_ATTR_REG_DM_MR_RESP_LKEY,
	127	UVERBS_ATTR_REG_DM_MR_RESP_RKEY,
	128	};
	129
	130	enum uverbs_methods_mr {
	131	UVERBS_METHOD_DM_MR_REG,
	132	};
	133
	134	#endif

include/uapi/rdma/ib_user_ioctl_verbs.h+57−39

@@ -1,5 +1,6 @@
		1	/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) */
1	/*	2	/*
2	* Copyright (c) 2017, Mellanox Technologies inc. All rights reserved.	3	* Copyright (c) 2017-2018, Mellanox Technologies inc. All rights reserved.
3	*	4	*
4	* This software is available to you under a choice of one of two	5	* This software is available to you under a choice of one of two
5	* licenses. You may choose to be licensed under the terms of the GNU	6	* licenses. You may choose to be licensed under the terms of the GNU
@@ -33,52 +34,69 @@ · 27 unmodified lines
33	#ifndef IB_USER_IOCTL_VERBS_H	34	#ifndef IB_USER_IOCTL_VERBS_H
34	#define IB_USER_IOCTL_VERBS_H	35	#define IB_USER_IOCTL_VERBS_H
35		36
36	#include <rdma/rdma_user_ioctl.h>	37	#include <linux/types.h>
37		38
38	#define UVERBS_UDATA_DRIVER_DATA_NS 1	39	#ifndef RDMA_UAPI_PTR
39	#define UVERBS_UDATA_DRIVER_DATA_FLAG (1UL << UVERBS_ID_NS_SHIFT)	40	#define RDMA_UAPI_PTR(_type, _name) __aligned_u64 _name
40		41	#endif
41	enum uverbs_default_objects {	42
42	UVERBS_OBJECT_DEVICE, /* No instances of DEVICE are allowed */	43	enum ib_uverbs_flow_action_esp_keymat {
43	UVERBS_OBJECT_PD,	44	IB_UVERBS_FLOW_ACTION_ESP_KEYMAT_AES_GCM,
44	UVERBS_OBJECT_COMP_CHANNEL,
45	UVERBS_OBJECT_CQ,
46	UVERBS_OBJECT_QP,
47	UVERBS_OBJECT_SRQ,
48	UVERBS_OBJECT_AH,
49	UVERBS_OBJECT_MR,
50	UVERBS_OBJECT_MW,
51	UVERBS_OBJECT_FLOW,
52	UVERBS_OBJECT_XRCD,
53	UVERBS_OBJECT_RWQ_IND_TBL,
54	UVERBS_OBJECT_WQ,
55	UVERBS_OBJECT_LAST,
56	};	45	};
57		46
58	enum {	47	enum ib_uverbs_flow_action_esp_keymat_aes_gcm_iv_algo {
59	UVERBS_UHW_IN = UVERBS_UDATA_DRIVER_DATA_FLAG,	48	IB_UVERBS_FLOW_ACTION_IV_ALGO_SEQ,
60	UVERBS_UHW_OUT,
61	};	49	};
62		50
63	enum uverbs_create_cq_cmd_attr_ids {	51	struct ib_uverbs_flow_action_esp_keymat_aes_gcm {
64	CREATE_CQ_HANDLE,	52	__aligned_u64 iv;
65	CREATE_CQ_CQE,	53	__u32 iv_algo; /* Use enum ib_uverbs_flow_action_esp_keymat_aes_gcm_iv_algo */
66	CREATE_CQ_USER_HANDLE,	54
67	CREATE_CQ_COMP_CHANNEL,	55	__u32 salt;
68	CREATE_CQ_COMP_VECTOR,	56	__u32 icv_len;
69	CREATE_CQ_FLAGS,	57
70	CREATE_CQ_RESP_CQE,	58	__u32 key_len;
		59	__u32 aes_key[256 / 32];
71	};	60	};
72		61
73	enum uverbs_destroy_cq_cmd_attr_ids {	62	enum ib_uverbs_flow_action_esp_replay {
74	DESTROY_CQ_HANDLE,	63	IB_UVERBS_FLOW_ACTION_ESP_REPLAY_NONE,
75	DESTROY_CQ_RESP,	64	IB_UVERBS_FLOW_ACTION_ESP_REPLAY_BMP,
76	};	65	};
77		66
78	enum uverbs_actions_cq_ops {	67	struct ib_uverbs_flow_action_esp_replay_bmp {
79	UVERBS_CQ_CREATE,	68	__u32 size;
80	UVERBS_CQ_DESTROY,
81	};	69	};
82		70
83	#endif	71	enum ib_uverbs_flow_action_esp_flags {
		72	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_INLINE_CRYPTO = 0UL << 0, /* Default */
		73	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_FULL_OFFLOAD = 1UL << 0,
		74
		75	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_TUNNEL = 0UL << 1, /* Default */
		76	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_TRANSPORT = 1UL << 1,
		77
		78	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_DECRYPT = 0UL << 2, /* Default */
		79	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_ENCRYPT = 1UL << 2,
84		80
		81	IB_UVERBS_FLOW_ACTION_ESP_FLAGS_ESN_NEW_WINDOW = 1UL << 3,
		82	};
		83
		84	struct ib_uverbs_flow_action_esp_encap {
		85	/* This struct represents a list of pointers to flow_xxxx_filter that
		86	* encapsulates the payload in ESP tunnel mode.
		87	*/
		88	RDMA_UAPI_PTR(void , val_ptr); / pointer to a flow_xxxx_filter */
		89	RDMA_UAPI_PTR(struct ib_uverbs_flow_action_esp_encap *, next_ptr);
		90	__u16 len; /* Len of the filter struct val_ptr points to */
		91	__u16 type; /* Use flow_spec_type enum */
		92	};
		93
		94	struct ib_uverbs_flow_action_esp {
		95	__u32 spi;
		96	__u32 seq;
		97	__u32 tfc_pad;
		98	__u32 flags;
		99	__aligned_u64 hard_limit_pkts;
		100	};
		101
		102	#endif

include/uapi/rdma/ib_user_mad.h+2−2

@@ -143,7 +143,7 @@ struct ib_user_mad_hdr { · 142 unmodified lines
143	*/	143	*/
144	struct ib_user_mad {	144	struct ib_user_mad {
145	struct ib_user_mad_hdr hdr;	145	struct ib_user_mad_hdr hdr;
146	__u64 data[0];	146	__aligned_u64 data[0];
147	};	147	};
148		148
149	/*	149	/*
@@ -225,7 +225,7 @@ struct ib_user_mad_reg_req2 { · 75 unmodified lines
225	__u8 mgmt_class_version;	225	__u8 mgmt_class_version;
226	__u16 res;	226	__u16 res;
227	__u32 flags;	227	__u32 flags;
228	__u64 method_mask[2];	228	__aligned_u64 method_mask[2];
229	__u32 oui;	229	__u32 oui;
230	__u8 rmpp_version;	230	__u8 rmpp_version;
231	__u8 reserved[3];	231	__u8 reserved[3];

include/uapi/rdma/ib_user_verbs.h+112−83

  */
 struct ib_uverbs_async_event_desc {
-	__u64 element;
+	__aligned_u64 element;
 	__u32 event_type;	/* enum ib_event_type */
 	__u32 reserved;
 };
 struct ib_uverbs_comp_event_desc {
-	__u64 cq_handle;
+	__aligned_u64 cq_handle;
 };
 struct ib_uverbs_cq_moderation_caps {
  */
 #define IB_USER_VERBS_CMD_COMMAND_MASK 0xff
-#define IB_USER_VERBS_CMD_FLAGS_MASK 0xff000000u
+#define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80000000u
-#define IB_USER_VERBS_CMD_FLAGS_SHIFT 24
-#define IB_USER_VERBS_CMD_FLAG_EXTENDED 0x80
 struct ib_uverbs_cmd_hdr {
 	__u32 command;
 };
 struct ib_uverbs_ex_cmd_hdr {
-	__u64 response;
+	__aligned_u64 response;
 	__u16 provider_in_words;
 	__u16 provider_out_words;
 	__u32 cmd_hdr_reserved;
 };
 struct ib_uverbs_get_context {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_get_context_resp {
 };
 struct ib_uverbs_query_device {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_query_device_resp {
-	__u64 fw_ver;
+	__aligned_u64 fw_ver;
 	__be64 node_guid;
 	__be64 sys_image_guid;
-	__u64 max_mr_size;
+	__aligned_u64 max_mr_size;
-	__u64 page_size_cap;
+	__aligned_u64 page_size_cap;
 	__u32 vendor_id;
 	__u32 vendor_part_id;
 	__u32 hw_ver;
 };
 struct ib_uverbs_odp_caps {
-	__u64 general_caps;
+	__aligned_u64 general_caps;
 	struct {
 		__u32 rc_odp_caps;
 		__u32 uc_odp_caps;
 	__u32 comp_mask;
 	__u32 response_length;
 	struct ib_uverbs_odp_caps odp_caps;
-	__u64 timestamp_mask;
+	__aligned_u64 timestamp_mask;
-	__u64 hca_core_clock; /* in KHZ */
+	__aligned_u64 hca_core_clock; /* in KHZ */
-	__u64 device_cap_flags_ex;
+	__aligned_u64 device_cap_flags_ex;
 	struct ib_uverbs_rss_caps rss_caps;
 	__u32  max_wq_type_rq;
 	__u32 raw_packet_caps;
 	struct ib_uverbs_tm_caps tm_caps;
 	struct ib_uverbs_cq_moderation_caps cq_moderation_caps;
+	__aligned_u64 max_dm_size;
 };
 struct ib_uverbs_query_port {
-	__u64 response;
+	__aligned_u64 response;
 	__u8  port_num;
 	__u8  reserved[7];
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_query_port_resp {
 };
 struct ib_uverbs_alloc_pd {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_alloc_pd_resp {
 };
 struct ib_uverbs_open_xrcd {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 fd;
 	__u32 oflags;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_open_xrcd_resp {
 };
 struct ib_uverbs_reg_mr {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 start;
+	__aligned_u64 start;
-	__u64 length;
+	__aligned_u64 length;
-	__u64 hca_va;
+	__aligned_u64 hca_va;
 	__u32 pd_handle;
 	__u32 access_flags;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_reg_mr_resp {
 };
 struct ib_uverbs_rereg_mr {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 mr_handle;
 	__u32 flags;
-	__u64 start;
+	__aligned_u64 start;
-	__u64 length;
+	__aligned_u64 length;
-	__u64 hca_va;
+	__aligned_u64 hca_va;
 	__u32 pd_handle;
 	__u32 access_flags;
 };
 };
 struct ib_uverbs_alloc_mw {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 pd_handle;
 	__u8  mw_type;
 	__u8  reserved[3];
 };
 struct ib_uverbs_create_comp_channel {
-	__u64 response;
+	__aligned_u64 response;
 };
 struct ib_uverbs_create_comp_channel_resp {
 };
 struct ib_uverbs_create_cq {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 cqe;
 	__u32 comp_vector;
 	__s32 comp_channel;
 	__u32 reserved;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 enum ib_uverbs_ex_create_cq_flags {
 };
 struct ib_uverbs_ex_create_cq {
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 cqe;
 	__u32 comp_vector;
 	__s32 comp_channel;
 };
 struct ib_uverbs_resize_cq {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 cq_handle;
 	__u32 cqe;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_resize_cq_resp {
 	__u32 cqe;
 	__u32 reserved;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_poll_cq {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 cq_handle;
 	__u32 ne;
 };
 struct ib_uverbs_wc {
-	__u64 wr_id;
+	__aligned_u64 wr_id;
 	__u32 status;
 	__u32 opcode;
 	__u32 vendor_err;
 };
 struct ib_uverbs_destroy_cq {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 cq_handle;
 	__u32 reserved;
 };
 };
 struct ib_uverbs_create_qp {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 pd_handle;
 	__u32 send_cq_handle;
 	__u32 recv_cq_handle;
 	__u8  qp_type;
 	__u8  is_srq;
 	__u8  reserved;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 enum ib_uverbs_create_qp_mask {
 };
 struct ib_uverbs_ex_create_qp {
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 pd_handle;
 	__u32 send_cq_handle;
 	__u32 recv_cq_handle;
 };
 struct ib_uverbs_open_qp {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 pd_handle;
 	__u32 qpn;
 	__u8  qp_type;
 	__u8  reserved[7];
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 /* also used for open response */
 };
 struct ib_uverbs_query_qp {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 qp_handle;
 	__u32 attr_mask;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_query_qp_resp {
 	__u8  alt_timeout;
 	__u8  sq_sig_all;
 	__u8  reserved[5];
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_modify_qp {
 	__u8  alt_port_num;
 	__u8  alt_timeout;
 	__u8  reserved[2];
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_ex_modify_qp {
 };
 struct ib_uverbs_destroy_qp {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 qp_handle;
 	__u32 reserved;
 };
  * document the ABI.
  */
 struct ib_uverbs_sge {
-	__u64 addr;
+	__aligned_u64 addr;
 	__u32 length;
 	__u32 lkey;
 };
 struct ib_uverbs_send_wr {
-	__u64 wr_id;
+	__aligned_u64 wr_id;
 	__u32 num_sge;
 	__u32 opcode;
 	__u32 send_flags;
 	} ex;
 	union {
 		struct {
-			__u64 remote_addr;
+			__aligned_u64 remote_addr;
 			__u32 rkey;
 			__u32 reserved;
 		} rdma;
 		struct {
-			__u64 remote_addr;
+			__aligned_u64 remote_addr;
-			__u64 compare_add;
+			__aligned_u64 compare_add;
-			__u64 swap;
+			__aligned_u64 swap;
 			__u32 rkey;
 			__u32 reserved;
 		} atomic;
 };
 struct ib_uverbs_post_send {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 qp_handle;
 	__u32 wr_count;
 	__u32 sge_count;
 };
 struct ib_uverbs_recv_wr {
-	__u64 wr_id;
+	__aligned_u64 wr_id;
 	__u32 num_sge;
 	__u32 reserved;
 };
 struct ib_uverbs_post_recv {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 qp_handle;
 	__u32 wr_count;
 	__u32 sge_count;
 };
 struct ib_uverbs_post_srq_recv {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 srq_handle;
 	__u32 wr_count;
 	__u32 sge_count;
 };
 struct ib_uverbs_create_ah {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 pd_handle;
 	__u32 reserved;
 	struct ib_uverbs_ah_attr attr;
 	__u32 qp_handle;
 	__u16 mlid;
 	__u16 reserved;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_detach_mcast {
 	__u32 qp_handle;
 	__u16 mlid;
 	__u16 reserved;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_flow_spec_hdr {
 	__u16 size;
 	__u16 reserved;
 	/* followed by flow_spec */
-	__u64 flow_spec_data[0];
+	__aligned_u64 flow_spec_data[0];
 };
 struct ib_uverbs_flow_eth_filter {
 	};
 };
+struct ib_uverbs_flow_spec_action_handle {
+	union {
+		struct ib_uverbs_flow_spec_hdr hdr;
+		struct {
+			__u32 type;
+			__u16 size;
+			__u16 reserved;
+		};
+	};
+	__u32			      handle;
+	__u32			      reserved1;
+};
 struct ib_uverbs_flow_tunnel_filter {
 	__be32 tunnel_id;
 };
 	struct ib_uverbs_flow_tunnel_filter mask;
 };
+struct ib_uverbs_flow_spec_esp_filter {
+	__u32 spi;
+	__u32 seq;
+};
+struct ib_uverbs_flow_spec_esp {
+	union {
+		struct ib_uverbs_flow_spec_hdr hdr;
+		struct {
+			__u32 type;
+			__u16 size;
+			__u16 reserved;
+		};
+	};
+	struct ib_uverbs_flow_spec_esp_filter val;
+	struct ib_uverbs_flow_spec_esp_filter mask;
+};
 struct ib_uverbs_flow_attr {
 	__u32 type;
 	__u16 size;
 };
 struct ib_uverbs_create_srq {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 pd_handle;
 	__u32 max_wr;
 	__u32 max_sge;
 	__u32 srq_limit;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_create_xsrq {
-	__u64 response;
+	__aligned_u64 response;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 srq_type;
 	__u32 pd_handle;
 	__u32 max_wr;
 	__u32 max_num_tags;
 	__u32 xrcd_handle;
 	__u32 cq_handle;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_create_srq_resp {
 	__u32 attr_mask;
 	__u32 max_wr;
 	__u32 srq_limit;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_query_srq {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 srq_handle;
 	__u32 reserved;
-	__u64 driver_data[0];
+	__aligned_u64 driver_data[0];
 };
 struct ib_uverbs_query_srq_resp {
 };
 struct ib_uverbs_destroy_srq {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 srq_handle;
 	__u32 reserved;
 };
 struct ib_uverbs_ex_create_wq  {
 	__u32 comp_mask;
 	__u32 wq_type;
-	__u64 user_handle;
+	__aligned_u64 user_handle;
 	__u32 pd_handle;
 	__u32 cq_handle;
 	__u32 max_wr;

include/uapi/rdma/mlx4-abi.h+42−10

 	__u16	bf_regs_per_page;
 };
+enum {
+	MLX4_USER_DEV_CAP_LARGE_CQE	= 1L << 0,
+};
 struct mlx4_ib_alloc_ucontext_resp {
 	__u32	dev_caps;
 	__u32	qp_tab_size;
 };
 struct mlx4_ib_create_cq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 };
 struct mlx4_ib_create_cq_resp {
 };
 struct mlx4_ib_resize_cq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
 };
 struct mlx4_ib_create_srq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 };
 struct mlx4_ib_create_srq_resp {
 };
 struct mlx4_ib_create_qp_rss {
-	__u64   rx_hash_fields_mask; /* Use  enum mlx4_ib_rx_hash_fields */
+	__aligned_u64 rx_hash_fields_mask; /* Use  enum mlx4_ib_rx_hash_fields */
 	__u8    rx_hash_function; /* Use enum mlx4_ib_rx_hash_function_flags */
 	__u8    reserved[7];
 	__u8    rx_hash_key[40];
 };
 struct mlx4_ib_create_qp {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 	__u8	log_sq_bb_count;
 	__u8	log_sq_stride;
 	__u8	sq_no_prefetch;
 };
 struct mlx4_ib_create_wq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 	__u8	log_range_size;
 	__u8	reserved[3];
 	__u32   comp_mask;
 	MLX4_IB_RX_HASH_INNER		= 1ULL << 31,
 };
+struct mlx4_ib_rss_caps {
+	__aligned_u64 rx_hash_fields_mask; /* enum mlx4_ib_rx_hash_fields */
+	__u8 rx_hash_function; /* enum mlx4_ib_rx_hash_function_flags */
+	__u8 reserved[7];
+};
+enum query_device_resp_mask {
+	MLX4_IB_QUERY_DEV_RESP_MASK_CORE_CLOCK_OFFSET = 1UL << 0,
+};
+struct mlx4_ib_tso_caps {
+	__u32 max_tso; /* Maximum tso payload size in bytes */
+	/* Corresponding bit will be set if qp type from
+	 * 'enum ib_qp_type' is supported.
+	 */
+	__u32 supported_qpts;
+};
+struct mlx4_uverbs_ex_query_device_resp {
+	__u32			comp_mask;
+	__u32			response_length;
+	__aligned_u64		hca_core_clock_offset;
+	__u32			max_inl_recv_sz;
+	__u32			reserved;
+	struct mlx4_ib_rss_caps	rss_caps;
+	struct mlx4_ib_tso_caps tso_caps;
+};
 #endif /* MLX4_ABI_USER_H */

include/uapi/rdma/mlx5-abi.h+50−22

 	__u8	reserved0;
 	__u16	reserved1;
 	__u32	reserved2;
-	__u64	lib_caps;
+	__aligned_u64 lib_caps;
 };
 enum mlx5_ib_alloc_ucontext_resp_mask {
 	MLX5_USER_INLINE_MODE_TCP_UDP,
 };
+enum {
+	MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM = 1 << 0,
+	MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_REQ_METADATA = 1 << 1,
+	MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_SPI_STEERING = 1 << 2,
+	MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_FULL_OFFLOAD = 1 << 3,
+	MLX5_USER_ALLOC_UCONTEXT_FLOW_ACTION_FLAGS_ESP_AES_GCM_TX_IV_IS_ESN = 1 << 4,
+};
 struct mlx5_ib_alloc_ucontext_resp {
 	__u32	qp_tab_size;
 	__u32	bf_reg_size;
 	__u32	max_recv_wr;
 	__u32	max_srq_recv_wr;
 	__u16	num_ports;
-	__u16	reserved1;
+	__u16	flow_action_flags;
 	__u32	comp_mask;
 	__u32	response_length;
 	__u8	cqe_version;
 	__u8	cmds_supp_uhw;
 	__u8	eth_min_inline;
 	__u8	clock_info_versions;
-	__u64	hca_core_clock_offset;
+	__aligned_u64 hca_core_clock_offset;
 	__u32	log_uar_size;
 	__u32	num_uars_per_page;
 	__u32	num_dyn_bfregs;
 };
 struct mlx5_ib_rss_caps {
-	__u64 rx_hash_fields_mask; /* enum mlx5_rx_hash_fields */
+	__aligned_u64 rx_hash_fields_mask; /* enum mlx5_rx_hash_fields */
 	__u8 rx_hash_function; /* enum mlx5_rx_hash_function_flags */
 	__u8 reserved[7];
 };
 	__u32 supported_format; /* enum mlx5_ib_cqe_comp_res_format */
 };
+enum mlx5_ib_packet_pacing_cap_flags {
+	MLX5_IB_PP_SUPPORT_BURST	= 1 << 0,
+};
 struct mlx5_packet_pacing_caps {
 	__u32 qp_rate_limit_min;
 	__u32 qp_rate_limit_max; /* In kpbs */
 	 * supported_qpts |= 1 << IB_QPT_RAW_PACKET
 	 */
 	__u32 supported_qpts;
-	__u32 reserved;
+	__u8  cap_flags; /* enum mlx5_ib_packet_pacing_cap_flags */
+	__u8  reserved[3];
 };
 enum mlx5_ib_mpw_caps {
 };
 struct mlx5_ib_create_cq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 	__u32	cqe_size;
 	__u8    cqe_comp_en;
 	__u8    cqe_comp_res_format;
 };
 struct mlx5_ib_resize_cq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
 	__u16	cqe_size;
 	__u16	reserved0;
 	__u32	reserved1;
 };
 struct mlx5_ib_create_srq {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 	__u32	flags;
 	__u32	reserved0; /* explicit padding (optional on i386) */
 	__u32	uidx;
 };
 struct mlx5_ib_create_qp {
-	__u64	buf_addr;
+	__aligned_u64 buf_addr;
-	__u64	db_addr;
+	__aligned_u64 db_addr;
 	__u32	sq_wqe_count;
 	__u32	rq_wqe_count;
 	__u32	rq_wqe_shift;
 	__u32	uidx;
 	__u32	bfreg_index;
 	union {
-		__u64	sq_buf_addr;
+		__aligned_u64 sq_buf_addr;
-		__u64	access_key;
+		__aligned_u64 access_key;
 	};
 };
 	MLX5_RX_HASH_DST_PORT_TCP	= 1 << 5,
 	MLX5_RX_HASH_SRC_PORT_UDP	= 1 << 6,
 	MLX5_RX_HASH_DST_PORT_UDP	= 1 << 7,
+	MLX5_RX_HASH_IPSEC_SPI		= 1 << 8,
 	/* Save bits for future fields */
 	MLX5_RX_HASH_INNER		= (1UL << 31),
 };
 struct mlx5_ib_create_qp_rss {
-	__u64 rx_hash_fields_mask; /* enum mlx5_rx_hash_fields */
+	__aligned_u64 rx_hash_fields_mask; /* enum mlx5_rx_hash_fields */
 	__u8 rx_hash_function; /* enum mlx5_rx_hash_function_flags */
 	__u8 rx_key_len; /* valid only for Toeplitz */
 	__u8 reserved[6];
 struct mlx5_ib_create_qp_resp {
 	__u32	bfreg_index;
+	__u32   reserved;
 };
 struct mlx5_ib_alloc_mw {
 };
 struct mlx5_ib_create_wq {
-	__u64   buf_addr;
+	__aligned_u64 buf_addr;
-	__u64   db_addr;
+	__aligned_u64 db_addr;
 	__u32   rq_wqe_count;
 	__u32   rq_wqe_shift;
 	__u32   user_index;
 	__u8	reserved[6];
 };
+struct mlx5_ib_burst_info {
+	__u32       max_burst_sz;
+	__u16       typical_pkt_sz;
+	__u16       reserved;
+};
+struct mlx5_ib_modify_qp {
+	__u32			   comp_mask;
+	struct mlx5_ib_burst_info  burst_info;
+	__u32			   reserved;
+};
 struct mlx5_ib_modify_qp_resp {
 	__u32	response_length;
 	__u32	dctn;
 struct mlx5_ib_clock_info {
 	__u32 sign;
 	__u32 resv;
-	__u64 nsec;
+	__aligned_u64 nsec;
-	__u64 cycles;
+	__aligned_u64 cycles;
-	__u64 frac;
+	__aligned_u64 frac;
 	__u32 mult;
 	__u32 shift;
-	__u64 mask;
+	__aligned_u64 mask;
-	__u64 overflow_period;
+	__aligned_u64 overflow_period;
 };
 enum mlx5_ib_mmap_cmd {
 	MLX5_IB_MMAP_CORE_CLOCK                 = 5,
 	MLX5_IB_MMAP_ALLOC_WC                   = 6,
 	MLX5_IB_MMAP_CLOCK_INFO                 = 7,
+	MLX5_IB_MMAP_DEVICE_MEM                 = 8,
 };
 enum {

include/uapi/rdma/mlx5_user_ioctl_cmds.h+48−0

@@ -0,0 +1,48 @@
	1	/*
	2	* Copyright (c) 2018, Mellanox Technologies inc. All rights reserved.
	3	*
	4	* This software is available to you under a choice of one of two
	5	* licenses. You may choose to be licensed under the terms of the GNU
	6	* General Public License (GPL) Version 2, available from the file
	7	* COPYING in the main directory of this source tree, or the
	8	* OpenIB.org BSD license below:
	9	*
	10	* Redistribution and use in source and binary forms, with or
	11	* without modification, are permitted provided that the following
	12	* conditions are met:
	13	*
	14	* - Redistributions of source code must retain the above
	15	* copyright notice, this list of conditions and the following
	16	* disclaimer.
	17	*
	18	* - Redistributions in binary form must reproduce the above
	19	* copyright notice, this list of conditions and the following
	20	* disclaimer in the documentation and/or other materials
	21	* provided with the distribution.
	22	*
	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	25	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	26	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	27	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	28	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	29	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	30	* SOFTWARE.
	31	*/
	32
	33	#ifndef MLX5_USER_IOCTL_CMDS_H
	34	#define MLX5_USER_IOCTL_CMDS_H
	35
	36	#include <rdma/ib_user_ioctl_cmds.h>
	37
	38	enum mlx5_ib_create_flow_action_attrs {
	39	/* This attribute belong to the driver namespace */
	40	MLX5_IB_ATTR_CREATE_FLOW_ACTION_FLAGS = (1U << UVERBS_ID_NS_SHIFT),
	41	};
	42
	43	enum mlx5_ib_alloc_dm_attrs {
	44	MLX5_IB_ATTR_ALLOC_DM_RESP_START_OFFSET = (1U << UVERBS_ID_NS_SHIFT),
	45	MLX5_IB_ATTR_ALLOC_DM_RESP_PAGE_INDEX,
	46	};
	47
	48	#endif

include/uapi/rdma/mlx5_user_ioctl_verbs.h+43−0

@@ -0,0 +1,43 @@
	1	/*
	2	* Copyright (c) 2018, Mellanox Technologies inc. All rights reserved.
	3	*
	4	* This software is available to you under a choice of one of two
	5	* licenses. You may choose to be licensed under the terms of the GNU
	6	* General Public License (GPL) Version 2, available from the file
	7	* COPYING in the main directory of this source tree, or the
	8	* OpenIB.org BSD license below:
	9	*
	10	* Redistribution and use in source and binary forms, with or
	11	* without modification, are permitted provided that the following
	12	* conditions are met:
	13	*
	14	* - Redistributions of source code must retain the above
	15	* copyright notice, this list of conditions and the following
	16	* disclaimer.
	17	*
	18	* - Redistributions in binary form must reproduce the above
	19	* copyright notice, this list of conditions and the following
	20	* disclaimer in the documentation and/or other materials
	21	* provided with the distribution.
	22	*
	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	25	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	26	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	27	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	28	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	29	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	30	* SOFTWARE.
	31	*/
	32
	33	#ifndef MLX5_USER_IOCTL_VERBS_H
	34	#define MLX5_USER_IOCTL_VERBS_H
	35
	36	#include <linux/types.h>
	37
	38	enum mlx5_ib_uapi_flow_action_flags {
	39	MLX5_IB_UAPI_FLOW_ACTION_FLAGS_REQUIRE_METADATA = 1 << 0,
	40	};
	41
	42	#endif
	43

include/uapi/rdma/mthca-abi.h+5−5

@@ -74,8 +74,8 @@ struct mthca_reg_mr { · 73 unmodified lines
74	struct mthca_create_cq {	74	struct mthca_create_cq {
75	__u32 lkey;	75	__u32 lkey;
76	__u32 pdn;	76	__u32 pdn;
77	__u64 arm_db_page;	77	__aligned_u64 arm_db_page;
78	__u64 set_db_page;	78	__aligned_u64 set_db_page;
79	__u32 arm_db_index;	79	__u32 arm_db_index;
80	__u32 set_db_index;	80	__u32 set_db_index;
81	};	81	};
@@ -93,7 +93,7 @@ struct mthca_resize_cq { · 11 unmodified lines
93	struct mthca_create_srq {	93	struct mthca_create_srq {
94	__u32 lkey;	94	__u32 lkey;
95	__u32 db_index;	95	__u32 db_index;
96	__u64 db_page;	96	__aligned_u64 db_page;
97	};	97	};
98		98
99	struct mthca_create_srq_resp {	99	struct mthca_create_srq_resp {
@@ -104,8 +104,8 @@ struct mthca_create_srq_resp { · 4 unmodified lines
104	struct mthca_create_qp {	104	struct mthca_create_qp {
105	__u32 lkey;	105	__u32 lkey;
106	__u32 reserved;	106	__u32 reserved;
107	__u64 sq_db_page;	107	__aligned_u64 sq_db_page;
108	__u64 rq_db_page;	108	__aligned_u64 rq_db_page;
109	__u32 sq_db_index;	109	__u32 sq_db_index;
110	__u32 rq_db_index;	110	__u32 rq_db_index;
111	};	111	};

include/uapi/rdma/nes-abi.h+3−3

@@ -72,14 +72,14 @@ struct nes_alloc_pd_resp { · 71 unmodified lines
72	};	72	};
73		73
74	struct nes_create_cq_req {	74	struct nes_create_cq_req {
75	__u64 user_cq_buffer;	75	__aligned_u64 user_cq_buffer;
76	__u32 mcrqf;	76	__u32 mcrqf;
77	__u8 reserved[4];	77	__u8 reserved[4];
78	};	78	};
79		79
80	struct nes_create_qp_req {	80	struct nes_create_qp_req {
81	__u64 user_wqe_buffers;	81	__aligned_u64 user_wqe_buffers;
82	__u64 user_qp_buffer;	82	__aligned_u64 user_qp_buffer;
83	};	83	};
84		84
85	enum iwnes_memreg_type {	85	enum iwnes_memreg_type {

include/uapi/rdma/ocrdma-abi.h+18−18

@@ -55,17 +55,17 @@ struct ocrdma_alloc_ucontext_resp { · 54 unmodified lines
55	__u32 wqe_size;	55	__u32 wqe_size;
56	__u32 max_inline_data;	56	__u32 max_inline_data;
57	__u32 dpp_wqe_size;	57	__u32 dpp_wqe_size;
58	__u64 ah_tbl_page;	58	__aligned_u64 ah_tbl_page;
59	__u32 ah_tbl_len;	59	__u32 ah_tbl_len;
60	__u32 rqe_size;	60	__u32 rqe_size;
61	__u8 fw_ver[32];	61	__u8 fw_ver[32];
62	/* for future use/new features in progress */	62	/* for future use/new features in progress */
63	__u64 rsvd1;	63	__aligned_u64 rsvd1;
64	__u64 rsvd2;	64	__aligned_u64 rsvd2;
65	};	65	};
66		66
67	struct ocrdma_alloc_pd_ureq {	67	struct ocrdma_alloc_pd_ureq {
68	__u64 rsvd1;	68	__u32 rsvd[2];
69	};	69	};
70		70
71	struct ocrdma_alloc_pd_uresp {	71	struct ocrdma_alloc_pd_uresp {
@@ -73,7 +73,7 @@ struct ocrdma_alloc_pd_uresp { · 1 unmodified line
73	__u32 dpp_enabled;	73	__u32 dpp_enabled;
74	__u32 dpp_page_addr_hi;	74	__u32 dpp_page_addr_hi;
75	__u32 dpp_page_addr_lo;	75	__u32 dpp_page_addr_lo;
76	__u64 rsvd1;	76	__u32 rsvd[2];
77	};	77	};
78		78
79	struct ocrdma_create_cq_ureq {	79	struct ocrdma_create_cq_ureq {
@@ -87,13 +87,13 @@ struct ocrdma_create_cq_uresp { · 7 unmodified lines
87	__u32 page_size;	87	__u32 page_size;
88	__u32 num_pages;	88	__u32 num_pages;
89	__u32 max_hw_cqe;	89	__u32 max_hw_cqe;
90	__u64 page_addr[MAX_CQ_PAGES];	90	__aligned_u64 page_addr[MAX_CQ_PAGES];
91	__u64 db_page_addr;	91	__aligned_u64 db_page_addr;
92	__u32 db_page_size;	92	__u32 db_page_size;
93	__u32 phase_change;	93	__u32 phase_change;
94	/* for future use/new features in progress */	94	/* for future use/new features in progress */
95	__u64 rsvd1;	95	__aligned_u64 rsvd1;
96	__u64 rsvd2;	96	__aligned_u64 rsvd2;
97	};	97	};
98		98
99	#define MAX_QP_PAGES 8	99	#define MAX_QP_PAGES 8
@@ -115,9 +115,9 @@ struct ocrdma_create_qp_uresp { · 15 unmodified lines
115	__u32 rq_page_size;	115	__u32 rq_page_size;
116	__u32 num_sq_pages;	116	__u32 num_sq_pages;
117	__u32 num_rq_pages;	117	__u32 num_rq_pages;
118	__u64 sq_page_addr[MAX_QP_PAGES];	118	__aligned_u64 sq_page_addr[MAX_QP_PAGES];
119	__u64 rq_page_addr[MAX_QP_PAGES];	119	__aligned_u64 rq_page_addr[MAX_QP_PAGES];
120	__u64 db_page_addr;	120	__aligned_u64 db_page_addr;
121	__u32 db_page_size;	121	__u32 db_page_size;
122	__u32 dpp_credit;	122	__u32 dpp_credit;
123	__u32 dpp_offset;	123	__u32 dpp_offset;
@@ -126,8 +126,8 @@ struct ocrdma_create_qp_uresp { · 2 unmodified lines
126	__u32 db_sq_offset;	126	__u32 db_sq_offset;
127	__u32 db_rq_offset;	127	__u32 db_rq_offset;
128	__u32 db_shift;	128	__u32 db_shift;
129	__u64 rsvd[11];	129	__aligned_u64 rsvd[11];
130	} __packed;	130	};
131		131
132	struct ocrdma_create_srq_uresp {	132	struct ocrdma_create_srq_uresp {
133	__u16 rq_dbid;	133	__u16 rq_dbid;
@@ -137,16 +137,16 @@ struct ocrdma_create_srq_uresp { · 3 unmodified lines
137	__u32 rq_page_size;	137	__u32 rq_page_size;
138	__u32 num_rq_pages;	138	__u32 num_rq_pages;
139		139
140	__u64 rq_page_addr[MAX_QP_PAGES];	140	__aligned_u64 rq_page_addr[MAX_QP_PAGES];
141	__u64 db_page_addr;	141	__aligned_u64 db_page_addr;
142		142
143	__u32 db_page_size;	143	__u32 db_page_size;
144	__u32 num_rqe_allocated;	144	__u32 num_rqe_allocated;
145	__u32 db_rq_offset;	145	__u32 db_rq_offset;
146	__u32 db_shift;	146	__u32 db_shift;
147		147
148	__u64 rsvd2;	148	__aligned_u64 rsvd2;
149	__u64 rsvd3;	149	__aligned_u64 rsvd3;
150	};	150	};
151		151
152	#endif /* OCRDMA_ABI_USER_H */	152	#endif /* OCRDMA_ABI_USER_H */

include/uapi/rdma/qedr-abi.h+12−8

 /* user kernel communication data structures. */
 struct qedr_alloc_ucontext_resp {
-	__u64 db_pa;
+	__aligned_u64 db_pa;
 	__u32 db_size;
 	__u32 max_send_wr;
 	__u8 dpm_enabled;
 	__u8 wids_enabled;
 	__u16 wid_count;
+	__u32 reserved;
 };
 struct qedr_alloc_pd_ureq {
-	__u64 rsvd1;
+	__aligned_u64 rsvd1;
 };
 struct qedr_alloc_pd_uresp {
 	__u32 pd_id;
+	__u32 reserved;
 };
 struct qedr_create_cq_ureq {
-	__u64 addr;
+	__aligned_u64 addr;
-	__u64 len;
+	__aligned_u64 len;
 };
 struct qedr_create_cq_uresp {
 	__u32 db_offset;
 	__u16 icid;
+	__u16 reserved;
 };
 struct qedr_create_qp_ureq {
 	/* SQ */
 	/* user space virtual address of SQ buffer */
-	__u64 sq_addr;
+	__aligned_u64 sq_addr;
 	/* length of SQ buffer */
-	__u64 sq_len;
+	__aligned_u64 sq_len;
 	/* RQ */
 	/* user space virtual address of RQ buffer */
-	__u64 rq_addr;
+	__aligned_u64 rq_addr;
 	/* length of RQ buffer */
-	__u64 rq_len;
+	__aligned_u64 rq_len;
 };
 struct qedr_create_qp_uresp {
 	__u16 rq_icid;
 	__u32 rq_db2_offset;
+	__u32 reserved;
 };
 #endif /* __QEDR_USER_H__ */

include/uapi/rdma/rdma_netlink.h+51−0

@@ -238,6 +238,14 @@ enum rdma_nldev_command { · 237 unmodified lines
238		238
239	RDMA_NLDEV_CMD_RES_QP_GET, /* can dump */	239	RDMA_NLDEV_CMD_RES_QP_GET, /* can dump */
240		240
		241	RDMA_NLDEV_CMD_RES_CM_ID_GET, /* can dump */
		242
		243	RDMA_NLDEV_CMD_RES_CQ_GET, /* can dump */
		244
		245	RDMA_NLDEV_CMD_RES_MR_GET, /* can dump */
		246
		247	RDMA_NLDEV_CMD_RES_PD_GET, /* can dump */
		248
241	RDMA_NLDEV_NUM_OPS	249	RDMA_NLDEV_NUM_OPS
242	};	250	};
243		251
@@ -350,6 +358,49 @@ enum rdma_nldev_attr { · 106 unmodified lines
350	*/	358	*/
351	RDMA_NLDEV_ATTR_RES_KERN_NAME, /* string */	359	RDMA_NLDEV_ATTR_RES_KERN_NAME, /* string */
352		360
		361	RDMA_NLDEV_ATTR_RES_CM_ID, /* nested table */
		362	RDMA_NLDEV_ATTR_RES_CM_ID_ENTRY, /* nested table */
		363	/*
		364	* rdma_cm_id port space.
		365	*/
		366	RDMA_NLDEV_ATTR_RES_PS, /* u32 */
		367	/*
		368	* Source and destination socket addresses
		369	*/
		370	RDMA_NLDEV_ATTR_RES_SRC_ADDR, /* __kernel_sockaddr_storage */
		371	RDMA_NLDEV_ATTR_RES_DST_ADDR, /* __kernel_sockaddr_storage */
		372
		373	RDMA_NLDEV_ATTR_RES_CQ, /* nested table */
		374	RDMA_NLDEV_ATTR_RES_CQ_ENTRY, /* nested table */
		375	RDMA_NLDEV_ATTR_RES_CQE, /* u32 */
		376	RDMA_NLDEV_ATTR_RES_USECNT, /* u64 */
		377	RDMA_NLDEV_ATTR_RES_POLL_CTX, /* u8 */
		378
		379	RDMA_NLDEV_ATTR_RES_MR, /* nested table */
		380	RDMA_NLDEV_ATTR_RES_MR_ENTRY, /* nested table */
		381	RDMA_NLDEV_ATTR_RES_RKEY, /* u32 */
		382	RDMA_NLDEV_ATTR_RES_LKEY, /* u32 */
		383	RDMA_NLDEV_ATTR_RES_IOVA, /* u64 */
		384	RDMA_NLDEV_ATTR_RES_MRLEN, /* u64 */
		385
		386	RDMA_NLDEV_ATTR_RES_PD, /* nested table */
		387	RDMA_NLDEV_ATTR_RES_PD_ENTRY, /* nested table */
		388	RDMA_NLDEV_ATTR_RES_LOCAL_DMA_LKEY, /* u32 */
		389	RDMA_NLDEV_ATTR_RES_UNSAFE_GLOBAL_RKEY, /* u32 */
		390
		391	/*
		392	* Provides logical name and index of netdevice which is
		393	* connected to physical port. This information is relevant
		394	* for RoCE and iWARP.
		395	*
		396	* The netdevices which are associated with containers are
		397	* supposed to be exported together with GID table once it
		398	* will be exposed through the netlink. Because the
		399	* associated netdevices are properties of GIDs.
		400	*/
		401	RDMA_NLDEV_ATTR_NDEV_INDEX, /* u32 */
		402	RDMA_NLDEV_ATTR_NDEV_NAME, /* string */
		403
353	RDMA_NLDEV_ATTR_MAX	404	RDMA_NLDEV_ATTR_MAX
354	};	405	};
355	#endif /* _UAPI_RDMA_NETLINK_H */	406	#endif /* _UAPI_RDMA_NETLINK_H */

include/uapi/rdma/rdma_user_cm.h+31−18

 	RDMA_USER_CM_CMD_JOIN_MCAST
 };
+/* See IBTA Annex A11, servies ID bytes 4 & 5 */
+enum rdma_ucm_port_space {
+	RDMA_PS_IPOIB = 0x0002,
+	RDMA_PS_IB    = 0x013F,
+	RDMA_PS_TCP   = 0x0106,
+	RDMA_PS_UDP   = 0x0111,
+};
 /*
  * command ABI structures.
  */
 };
 struct rdma_ucm_create_id {
-	__u64 uid;
+	__aligned_u64 uid;
-	__u64 response;
+	__aligned_u64 response;
-	__u16 ps;
+	__u16 ps;                  /* use enum rdma_ucm_port_space */
 	__u8  qp_type;
 	__u8  reserved[5];
 };
 };
 struct rdma_ucm_destroy_id {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 id;
 	__u32 reserved;
 };
 };
 struct rdma_ucm_bind_ip {
-	__u64 response;
+	__aligned_u64 response;
 	struct sockaddr_in6 addr;
 	__u32 id;
 };
 };
 struct rdma_ucm_query {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 id;
 	__u32 option;
 };
 struct rdma_ucm_query_route_resp {
-	__u64 node_guid;
+	__aligned_u64 node_guid;
 	struct ib_user_path_rec ib_route[2];
 	struct sockaddr_in6 src_addr;
 	struct sockaddr_in6 dst_addr;
 };
 struct rdma_ucm_query_addr_resp {
-	__u64 node_guid;
+	__aligned_u64 node_guid;
 	__u8  port_num;
 	__u8  reserved;
 	__u16 pkey;
 };
 struct rdma_ucm_accept {
-	__u64 uid;
+	__aligned_u64 uid;
 	struct rdma_ucm_conn_param conn_param;
 	__u32 id;
 	__u32 reserved;
 };
 struct rdma_ucm_init_qp_attr {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 id;
 	__u32 qp_state;
 };
 };
 struct rdma_ucm_join_ip_mcast {
-	__u64 response;		/* rdma_ucm_create_id_resp */
+	__aligned_u64 response;		/* rdma_ucm_create_id_resp */
-	__u64 uid;
+	__aligned_u64 uid;
 	struct sockaddr_in6 addr;
 	__u32 id;
 };
 };
 struct rdma_ucm_join_mcast {
-	__u64 response;		/* rdma_ucma_create_id_resp */
+	__aligned_u64 response;		/* rdma_ucma_create_id_resp */
-	__u64 uid;
+	__aligned_u64 uid;
 	__u32 id;
 	__u16 addr_size;
 	__u16 join_flags;
 };
 struct rdma_ucm_get_event {
-	__u64 response;
+	__aligned_u64 response;
 };
 struct rdma_ucm_event_resp {
-	__u64 uid;
+	__aligned_u64 uid;
 	__u32 id;
 	__u32 event;
 	__u32 status;
+	/*
+	 * NOTE: This union is not aligned to 8 bytes so none of the union
+	 * members may contain a u64 or anything with higher alignment than 4.
+	 */
 	union {
 		struct rdma_ucm_conn_param conn;
 		struct rdma_ucm_ud_param   ud;
 	} param;
+	__u32 reserved;
 };
 /* Option levels */
 };
 struct rdma_ucm_set_option {
-	__u64 optval;
+	__aligned_u64 optval;
 	__u32 id;
 	__u32 level;
 	__u32 optname;
 };
 struct rdma_ucm_migrate_id {
-	__u64 response;
+	__aligned_u64 response;
 	__u32 id;
 	__u32 fd;
 };

include/uapi/rdma/rdma_user_ioctl.h+1−37

@@ -34,49 +34,13 @@ · 33 unmodified lines
34	#ifndef RDMA_USER_IOCTL_H	34	#ifndef RDMA_USER_IOCTL_H
35	#define RDMA_USER_IOCTL_H	35	#define RDMA_USER_IOCTL_H
36		36
37	#include <linux/types.h>
38	#include <linux/ioctl.h>
39	#include <rdma/ib_user_mad.h>	37	#include <rdma/ib_user_mad.h>
40	#include <rdma/hfi/hfi1_ioctl.h>	38	#include <rdma/hfi/hfi1_ioctl.h>
		39	#include <rdma/rdma_user_ioctl_cmds.h>
41		40
42	/* Documentation/ioctl/ioctl-number.txt */
43	#define RDMA_IOCTL_MAGIC 0x1b
44	/* Legacy name, for user space application which already use it */	41	/* Legacy name, for user space application which already use it */
45	#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC	42	#define IB_IOCTL_MAGIC RDMA_IOCTL_MAGIC
46		43
47	#define RDMA_VERBS_IOCTL \
48	_IOWR(RDMA_IOCTL_MAGIC, 1, struct ib_uverbs_ioctl_hdr)
49
50	#define UVERBS_ID_NS_MASK 0xF000
51	#define UVERBS_ID_NS_SHIFT 12
52
53	enum {
54	/* User input */
55	UVERBS_ATTR_F_MANDATORY = 1U << 0,
56	/*
57	* Valid output bit should be ignored and considered set in
58	* mandatory fields. This bit is kernel output.
59	*/
60	UVERBS_ATTR_F_VALID_OUTPUT = 1U << 1,
61	};
62
63	struct ib_uverbs_attr {
64	__u16 attr_id; /* command specific type attribute */
65	__u16 len; /* only for pointers */
66	__u16 flags; /* combination of UVERBS_ATTR_F_XXXX */
67	__u16 reserved;
68	__aligned_u64 data; /* ptr to command, inline data or idr/fd */
69	};
70
71	struct ib_uverbs_ioctl_hdr {
72	__u16 length;
73	__u16 object_id;
74	__u16 method_id;
75	__u16 num_attrs;
76	__aligned_u64 reserved;
77	struct ib_uverbs_attr attrs[0];
78	};
79
80	/*	44	/*
81	* General blocks assignments	45	* General blocks assignments
82	* It is closed on purpose do not expose it it user space	46	* It is closed on purpose do not expose it it user space

include/uapi/rdma/rdma_user_ioctl_cmds.h+99−0

@@ -0,0 +1,99 @@
	1	/*
	2	* Copyright (c) 2018, Mellanox Technologies inc. All rights reserved.
	3	*
	4	* This software is available to you under a choice of one of two
	5	* licenses. You may choose to be licensed under the terms of the GNU
	6	* General Public License (GPL) Version 2, available from the file
	7	* COPYING in the main directory of this source tree, or the
	8	* OpenIB.org BSD license below:
	9	*
	10	* Redistribution and use in source and binary forms, with or
	11	* without modification, are permitted provided that the following
	12	* conditions are met:
	13	*
	14	* - Redistributions of source code must retain the above
	15	* copyright notice, this list of conditions and the following
	16	* disclaimer.
	17	*
	18	* - Redistributions in binary form must reproduce the above
	19	* copyright notice, this list of conditions and the following
	20	* disclaimer in the documentation and/or other materials
	21	* provided with the distribution.
	22	*
	23	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	24	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	25	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	26	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	27	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	28	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	29	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	30	* SOFTWARE.
	31	*/
	32
	33	#ifndef RDMA_USER_IOCTL_CMDS_H
	34	#define RDMA_USER_IOCTL_CMDS_H
	35
	36	#include <linux/types.h>
	37	#include <linux/ioctl.h>
	38
	39	/* Documentation/ioctl/ioctl-number.txt */
	40	#define RDMA_IOCTL_MAGIC 0x1b
	41	#define RDMA_VERBS_IOCTL \
	42	_IOWR(RDMA_IOCTL_MAGIC, 1, struct ib_uverbs_ioctl_hdr)
	43
	44	enum {
	45	/* User input */
	46	UVERBS_ATTR_F_MANDATORY = 1U << 0,
	47	/*
	48	* Valid output bit should be ignored and considered set in
	49	* mandatory fields. This bit is kernel output.
	50	*/
	51	UVERBS_ATTR_F_VALID_OUTPUT = 1U << 1,
	52	};
	53
	54	struct ib_uverbs_attr {
	55	__u16 attr_id; /* command specific type attribute */
	56	__u16 len; /* only for pointers */
	57	__u16 flags; /* combination of UVERBS_ATTR_F_XXXX */
	58	union {
	59	struct {
	60	__u8 elem_id;
	61	__u8 reserved;
	62	} enum_data;
	63	__u16 reserved;
	64	} attr_data;
	65	__aligned_u64 data; /* ptr to command, inline data or idr/fd */
	66	};
	67
	68	struct ib_uverbs_ioctl_hdr {
	69	__u16 length;
	70	__u16 object_id;
	71	__u16 method_id;
	72	__u16 num_attrs;
	73	__aligned_u64 reserved1;
	74	__u32 driver_id;
	75	__u32 reserved2;
	76	struct ib_uverbs_attr attrs[0];
	77	};
	78
	79	enum rdma_driver_id {
	80	RDMA_DRIVER_UNKNOWN,
	81	RDMA_DRIVER_MLX5,
	82	RDMA_DRIVER_MLX4,
	83	RDMA_DRIVER_CXGB3,
	84	RDMA_DRIVER_CXGB4,
	85	RDMA_DRIVER_MTHCA,
	86	RDMA_DRIVER_BNXT_RE,
	87	RDMA_DRIVER_OCRDMA,
	88	RDMA_DRIVER_NES,
	89	RDMA_DRIVER_I40IW,
	90	RDMA_DRIVER_VMW_PVRDMA,
	91	RDMA_DRIVER_QEDR,
	92	RDMA_DRIVER_HNS,
	93	RDMA_DRIVER_USNIC,
	94	RDMA_DRIVER_RXE,
	95	RDMA_DRIVER_HFI1,
	96	RDMA_DRIVER_QIB,
	97	};
	98
	99	#endif

include/uapi/rdma/rdma_user_rxe.h+46−12

 #define RDMA_USER_RXE_H
 #include <linux/types.h>
+#include <linux/socket.h>
+#include <linux/in.h>
+#include <linux/in6.h>
 union rxe_gid {
 	__u8	raw[16];
 struct rxe_av {
 	__u8			port_num;
 	__u8			network_type;
+	__u16			reserved1;
+	__u32			reserved2;
 	struct rxe_global_route	grh;
 	union {
-		struct sockaddr		_sockaddr;
 		struct sockaddr_in	_sockaddr_in;
 		struct sockaddr_in6	_sockaddr_in6;
 	} sgid_addr, dgid_addr;
 };
 struct rxe_send_wr {
-	__u64			wr_id;
+	__aligned_u64		wr_id;
 	__u32			num_sge;
 	__u32			opcode;
 	__u32			send_flags;
 	} ex;
 	union {
 		struct {
-			__u64	remote_addr;
+			__aligned_u64 remote_addr;
 			__u32	rkey;
+			__u32	reserved;
 		} rdma;
 		struct {
-			__u64	remote_addr;
+			__aligned_u64 remote_addr;
-			__u64	compare_add;
+			__aligned_u64 compare_add;
-			__u64	swap;
+			__aligned_u64 swap;
 			__u32	rkey;
+			__u32	reserved;
 		} atomic;
 		struct {
 			__u32	remote_qpn;
 			__u32	remote_qkey;
 			__u16	pkey_index;
 		} ud;
+		/* reg is only used by the kernel and is not part of the uapi */
 		struct {
-			struct ib_mr *mr;
+			union {
+				struct ib_mr *mr;
+				__aligned_u64 reserved;
+			};
 			__u32        key;
-			int          access;
+			__u32        access;
 		} reg;
 	} wr;
 };
 struct rxe_sge {
-	__u64	addr;
+	__aligned_u64 addr;
 	__u32	length;
 	__u32	lkey;
 };
 struct mminfo {
-	__u64			offset;
+	__aligned_u64  		offset;
 	__u32			size;
 	__u32			pad;
 };
 	__u32			cur_sge;
 	__u32			num_sge;
 	__u32			sge_offset;
+	__u32			reserved;
 	union {
 		__u8		inline_data[0];
 		struct rxe_sge	sge[0];
 	struct rxe_av		av;
 	__u32			status;
 	__u32			state;
-	__u64			iova;
+	__aligned_u64		iova;
 	__u32			mask;
 	__u32			first_psn;
 	__u32			last_psn;
 };
 struct rxe_recv_wqe {
-	__u64			wr_id;
+	__aligned_u64		wr_id;
 	__u32			num_sge;
 	__u32			padding;
 	struct rxe_dma_info	dma;
 };
+struct rxe_create_cq_resp {
+	struct mminfo mi;
+};
+struct rxe_resize_cq_resp {
+	struct mminfo mi;
+};
+struct rxe_create_qp_resp {
+	struct mminfo rq_mi;
+	struct mminfo sq_mi;
+};
+struct rxe_create_srq_resp {
+	struct mminfo mi;
+	__u32 srq_num;
+	__u32 reserved;
+};
+struct rxe_modify_srq_cmd {
+	__aligned_u64 mmap_info_addr;
+};
 #endif /* RDMA_USER_RXE_H */

include/uapi/rdma/vmw_pvrdma-abi.h+25−24

 };
 struct pvrdma_create_cq {
-	__u64 buf_addr;
+	__aligned_u64 buf_addr;
 	__u32 buf_size;
 	__u32 reserved;
 };
 };
 struct pvrdma_resize_cq {
-	__u64 buf_addr;
+	__aligned_u64 buf_addr;
 	__u32 buf_size;
 	__u32 reserved;
 };
 struct pvrdma_create_srq {
-	__u64 buf_addr;
+	__aligned_u64 buf_addr;
 	__u32 buf_size;
 	__u32 reserved;
 };
 };
 struct pvrdma_create_qp {
-	__u64 rbuf_addr;
+	__aligned_u64 rbuf_addr;
-	__u64 sbuf_addr;
+	__aligned_u64 sbuf_addr;
 	__u32 rbuf_size;
 	__u32 sbuf_size;
-	__u64 qp_addr;
+	__aligned_u64 qp_addr;
 };
 /* PVRDMA masked atomic compare and swap */
 struct pvrdma_ex_cmp_swap {
-	__u64 swap_val;
+	__aligned_u64 swap_val;
-	__u64 compare_val;
+	__aligned_u64 compare_val;
-	__u64 swap_mask;
+	__aligned_u64 swap_mask;
-	__u64 compare_mask;
+	__aligned_u64 compare_mask;
 };
 /* PVRDMA masked atomic fetch and add */
 struct pvrdma_ex_fetch_add {
-	__u64 add_val;
+	__aligned_u64 add_val;
-	__u64 field_boundary;
+	__aligned_u64 field_boundary;
 };
 /* PVRDMA address vector. */
 /* PVRDMA scatter/gather entry */
 struct pvrdma_sge {
-	__u64   addr;
+	__aligned_u64 addr;
 	__u32   length;
 	__u32   lkey;
 };
 /* PVRDMA receive queue work request */
 struct pvrdma_rq_wqe_hdr {
-	__u64 wr_id;		/* wr id */
+	__aligned_u64 wr_id;		/* wr id */
 	__u32 num_sge;		/* size of s/g array */
 	__u32 total_len;	/* reserved */
 };
 /* PVRDMA send queue work request */
 struct pvrdma_sq_wqe_hdr {
-	__u64 wr_id;		/* wr id */
+	__aligned_u64 wr_id;		/* wr id */
 	__u32 num_sge;		/* size of s/g array */
 	__u32 total_len;	/* reserved */
 	__u32 opcode;		/* operation type */
 	__u32 reserved;
 	union {
 		struct {
-			__u64 remote_addr;
+			__aligned_u64 remote_addr;
 			__u32 rkey;
 			__u8 reserved[4];
 		} rdma;
 		struct {
-			__u64 remote_addr;
+			__aligned_u64 remote_addr;
-			__u64 compare_add;
+			__aligned_u64 compare_add;
-			__u64 swap;
+			__aligned_u64 swap;
 			__u32 rkey;
 			__u32 reserved;
 		} atomic;
 		struct {
-			__u64 remote_addr;
+			__aligned_u64 remote_addr;
 			__u32 log_arg_sz;
 			__u32 rkey;
 			union {
 			} wr_data;
 		} masked_atomics;
 		struct {
-			__u64 iova_start;
+			__aligned_u64 iova_start;
-			__u64 pl_pdir_dma;
+			__aligned_u64 pl_pdir_dma;
 			__u32 page_shift;
 			__u32 page_list_len;
 			__u32 length;
 			__u32 access_flags;
 			__u32 rkey;
+			__u32 reserved;
 		} fast_reg;
 		struct {
 			__u32 remote_qpn;
 /* Completion queue element. */
 struct pvrdma_cqe {
-	__u64 wr_id;
+	__aligned_u64 wr_id;
-	__u64 qp;
+	__aligned_u64 qp;
 	__u32 opcode;
 	__u32 status;
 	__u32 byte_len;

include/uapi/sound/asound.h+1−0

@@ -242,6 +242,7 @@ typedef int __bitwise snd_pcm_format_t; · 241 unmodified lines
242	#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */	242	#define SNDRV_PCM_FORMAT_DSD_U16_BE ((__force snd_pcm_format_t) 51) /* DSD, 2-byte samples DSD (x16), big endian */
243	#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */	243	#define SNDRV_PCM_FORMAT_DSD_U32_BE ((__force snd_pcm_format_t) 52) /* DSD, 4-byte samples DSD (x32), big endian */
244	#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE	244	#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U32_BE
		245	#define SNDRV_PCM_FORMAT_FIRST SNDRV_PCM_FORMAT_S8
245		246
246	#ifdef SNDRV_LITTLE_ENDIAN	247	#ifdef SNDRV_LITTLE_ENDIAN
247	#define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE	248	#define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE

Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code