diff options
| author | Arnd Bergmann <[email protected]> | 2020-05-25 16:38:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2020-05-25 16:38:01 +0200 |
| commit | b4ad9a32b2042ac6be38d33e8317fb8fc712619e (patch) | |
| tree | b8f5fd9b0e7a6f81a507660f6de4fba8541d7ff6 /include/linux | |
| parent | acb09eca328d7ca67362acfe1423fdc1ea64505e (diff) | |
| parent | 104edb94cc4b3101bab33161cd861de13e85610b (diff) | |
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
Link: https://lore.kernel.org/r/20200504181049.GA10860@jade
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/tee_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 1412e9cc79ce..e96154d92b1e 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -26,6 +26,7 @@ #define TEE_SHM_REGISTER BIT(3) /* Memory registered in secure world */ #define TEE_SHM_USER_MAPPED BIT(4) /* Memory mapped in user space */ #define TEE_SHM_POOL BIT(5) /* Memory allocated from pool */ +#define TEE_SHM_KERNEL_MAPPED BIT(6) /* Memory mapped in kernel space */ struct device; struct tee_device; |