Merge tag 'tee-subsys-for-5.8' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

TEE subsystem work - Reserve GlobalPlatform implementation defined logon method range - Add support to register kernel memory with TEE to allow TEE bus drivers to register memory references. * tag 'tee-subsys-for-5.8' of git://git.linaro.org/people/jens.wiklander/linux-tee: tee: add private login method for kernel clients tee: enable support to register kernel memory

Arnd Bergmann committed 6 years ago

Commit b4ad9a32 parents acb09ec 104edb94 files · +42 −3Browse files

Showing the changes to include/linux (1 of 4 files). Show all

Unified · Split

include/linux/tee_drv.h+1−0

@@ -26,6 +26,7 @@ · 25 unmodified lines
26	#define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */	26	#define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */
27	#define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */	27	#define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */
28	#define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */	28	#define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */
		29	#define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */
29		30
30	struct device;	31	struct device;
31	struct tee_device;	32	struct tee_device;