diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-03-01 17:00:40 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-03-01 17:01:16 +0300 |
| commit | 3473b71e21609c9dfb74d0a5a13d6321d3049c05 (patch) | |
| tree | 8012fa7c602a79c9c90303694b7749dcd2f0e136 /include | |
| parent | 4f640201a8aebcee053712828f5457aee9909cc8 (diff) | |
| parent | 32356d309c22a9497e612ed437d66407e15935f3 (diff) | |
| download | linux-3473b71e21609c9dfb74d0a5a13d6321d3049c05.tar.xz | |
Merge tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers
OP-TEE driver
- dual license for optee_msg.h and optee_smc.h
Generic
- add cancellation support to client interface
* tag 'tee-misc-for-v5.1' of https://git.linaro.org/people/jens.wiklander/linux-tee:
tee: optee: update optee_msg.h and optee_smc.h to dual license
tee: add cancellation support to client interface
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tee_drv.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 56d7f1b4516d..4a49f80e7f71 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -535,6 +535,18 @@ int tee_client_invoke_func(struct tee_context *ctx, struct tee_ioctl_invoke_arg *arg, struct tee_param *param); +/** + * tee_client_cancel_req() - Request cancellation of the previous open-session + * or invoke-command operations in a Trusted Application + * @ctx: TEE Context + * @arg: Cancellation arguments, see description of + * struct tee_ioctl_cancel_arg + * + * Returns < 0 on error else 0 if the cancellation was successfully requested. + */ +int tee_client_cancel_req(struct tee_context *ctx, + struct tee_ioctl_cancel_arg *arg); + static inline bool tee_param_is_memref(struct tee_param *param) { switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) { |