github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Move tee_ioctl_shm_register_data to above IOCTL definition

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJUBAABCgA+FiEE0qerISgy2SKkqO79Wr/6JGat8H4FAmrBDgggHGplbnMud2lr
 bGFuZGVyQG9zcy5xdWFsY29tbS5jb20ACgkQWr/6JGat8H6jcBAAttIJ/7+jsS3y
 Ip6in3NiGlGL/gRnuJsjz5g/R57z6gEiyWKdpqu8QMmEcCqoKwsS4eDTCkXS3Fxo
 1Gz+CxibHiy0PjocXnVi5nlAuXCUI94fhrDFe1/ut+2yQfviAWFSp7Yn/HPcZIyy
 IiJcUsgIinkOVmyJ3BhnOcGCr2UJS2arteKOryr9pdrILrvk2kUk2FCYShkeuTcw
 SH8iVLbGDjRX5HgmIKcEKuaLxY3oA5HaWdtAD1qEjwkL7MVQ86p/AbFR4feLWEea
 GXCSQgbcYIU32t1rJDOEfjrHsRab4KDosANdG5zMGFpnga+V9OatRSI4InNWQGbQ
 YRsTF8+kHYUavXgYmn2Kbq3TCgWSZX5GAnaE6cf5y6MHj3V7zdhLGUuzwtOHab3n
 pfNf+FRELsRSjPCAw0V5Lw67CBIYLzYAKP7FK+dKTYRen8zrkSmrtTyMufxCCguK
 sSikKlcn9PQblBv2+JTUHFoVlsDp2wHCLl8wDwBoRMRlLai1sWSah67dRRSpK/it
 lb38GzoQEEGK0iKgV5bfomq4QrD9TokDNJhJJV9VaTOCmOF6DC8UsZuMEohjevaZ
 udOyXFPzCSsssiDOukPgNIgFSkY1UPcrqmYf+2Ij0xI4yNJjmI5XizP5gAD9lQ+X
 RC8sRh0s0mflXUWsVoDg0On+IvCz+4Q=
 =9L7t
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmrOSH4ACgkQmmx57+YA
 GNmQmRAAgbYXUzksm5sED2nXryKMRv5TWxZQkXC/2rzjEv8i8nPc1WkUf2eIqK+p
 6b0rwPNapXweaqcv2rwzpGJvVr/nQh6nMYRyn8MckeRR5bOzx/KzL0sBKxGbBFEa
 EfBnPsSD/9Yn+3Dipt/Wepj3oQYWBoykQ78oRkazz+yadWb6AFjQpoMkG4s+NN7r
 /3qkl5pervacMFL/8yZ+34WaMIYxB/cJEKS+WiZdQd3ufxNHvmtgUB/dVpoLUaKV
 XvqEL/aYzWA+ZvLgpae1K3M/8s9wnwf8+rFppzM0TJQi9K5YerWJFctaSUtYn0Fa
 zuVsdxZkzpldQBvv6yhdL/xdFSCCXB0Em8iORiBJAUTazacj9fcYT7Z/lDfrj0rE
 4rPt9RsU9RFAM7ax2/YF/cgexWdOjejI8KY3lRNkVYXo4Susff9rCq0PgUyf8gaP
 YvJKqsTlU2vATnUdp89u4hS1aomvzAf1kajcRYe3CQONhpmbzTIOW2lx1YyyHKHd
 nqJ2DdJIsKvE98mzYVByT5CiAWFSwzuLf2+9u2F7Qwmp/R+lDPu5UNKEe/Y2G9ns
 H2uYoEZDRjhxQhzxgz1HnWwpKRjySRV0oRuVyGEpvdBvrLvmAkDt3l0wugRLCRdt
 G5CK/MW7T8pIkgisJSyFzmq6nZP7/Z1D7U7dd/yejOEBSKtSC5w=
 =f6j1
 -----END PGP SIGNATURE-----

Merge tag 'tee-for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee into soc/drivers

Move tee_ioctl_shm_register_data to above IOCTL definition

* tag 'tee-for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee:
  tee: move tee_ioctl_shm_register_data to above IOCTL definition

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-10-13 17:04:25 +02:00
commit a2f5da3f5c
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/uapi/linux/tee.h
View File

@ -384,24 +384,6 @@ struct tee_iocl_supp_send_arg {
#define TEE_IOC_SUPPL_SEND _IOR(TEE_IOC_MAGIC, TEE_IOC_BASE + 7, \
struct tee_ioctl_buf_data)
/**
* struct tee_ioctl_shm_register_data - Shared memory register argument
* @addr: [in] Start address of shared memory to register
* @length: [in/out] Length of shared memory to register
* @flags: [in/out] Flags to/from registration.
* @id: [out] Identifier of the shared memory
*
* The flags field should currently be zero as input. Updated by the call
* with actual flags as defined by TEE_IOCTL_SHM_* above.
* This structure is used as argument for TEE_IOC_SHM_REGISTER below.
*/
struct tee_ioctl_shm_register_data {
__u64 addr;
__u64 length;
__u32 flags;
__s32 id;
};
/**
* struct tee_ioctl_shm_register_fd_data - Shared memory registering argument
* @fd: [in] File descriptor identifying dmabuf reference
@ -426,13 +408,31 @@ struct tee_ioctl_shm_register_fd_data {
* Returns a file descriptor on success or < 0 on failure
*
* The returned file descriptor refers to the shared memory object in the
* kernel. The supplied file deccriptor can be closed if it's not needed
* kernel. The supplied file descriptor can be closed if it's not needed
* for other purposes. The shared memory is freed when the descriptor is
* closed.
*/
#define TEE_IOC_SHM_REGISTER_FD _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 8, \
struct tee_ioctl_shm_register_fd_data)
/**
* struct tee_ioctl_shm_register_data - Shared memory register argument
* @addr: [in] Start address of shared memory to register
* @length: [in/out] Length of shared memory to register
* @flags: [in/out] Flags to/from registration.
* @id: [out] Identifier of the shared memory
*
* The flags field should currently be zero as input. Updated by the call
* with actual flags as defined by TEE_IOCTL_SHM_* above.
* This structure is used as argument for TEE_IOC_SHM_REGISTER below.
*/
struct tee_ioctl_shm_register_data {
__u64 addr;
__u64 length;
__u32 flags;
__s32 id;
};
/**
* TEE_IOC_SHM_REGISTER - Register shared memory argument
*
@ -440,7 +440,7 @@ struct tee_ioctl_shm_register_fd_data {
*
* Returns a file descriptor on success or < 0 on failure
*
* The shared memory is unregisterred when the descriptor is closed.
* The shared memory is unregistered when the descriptor is closed.
*/
#define TEE_IOC_SHM_REGISTER _IOWR(TEE_IOC_MAGIC, TEE_IOC_BASE + 9, \
struct tee_ioctl_shm_register_data)