From 83b58f93a2722624096e87227fbcdf53820b2bc1 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Mon, 14 Mar 2022 16:30:10 -0700 Subject: [PATCH] trusty: Update TIPC UAPI header TRUSTY_SEND_SECURE operation was added to Trusty Linux driver by aosp/1930989. Bug: 224563842 Test: m libtrusty Change-Id: Ic922ec177a8d35dba351415ab429216a1931a64d --- trusty/libtrusty/include/trusty/ipc.h | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/trusty/libtrusty/include/trusty/ipc.h b/trusty/libtrusty/include/trusty/ipc.h index 1fa6fe4aa..04e84c650 100644 --- a/trusty/libtrusty/include/trusty/ipc.h +++ b/trusty/libtrusty/include/trusty/ipc.h @@ -23,15 +23,19 @@ /** * enum transfer_kind - How to send an fd to Trusty - * @TRUSTY_SHARE: Memory will be accessible by Linux and Trusty. On ARM it will - * be mapped as nonsecure. Suitable for shared memory. The paired - * fd must be a "memfd". - * @TRUSTY_LEND: Memory will be accessible only to Trusty. On ARM it will be - * transitioned to "Secure" memory if Trusty is in TrustZone. - * This transfer kind is suitable for donating video buffers or - * other similar resources. The paired fd may need to come from a - * platform-specific allocator for memory that may be - * transitioned to "Secure". + * @TRUSTY_SHARE: Memory will be accessible by Linux and Trusty. On ARM it + * will be mapped as nonsecure. Suitable for shared memory. + * The paired fd must be a "dma_buf". + * @TRUSTY_LEND: Memory will be accessible only to Trusty. On ARM it will + * be transitioned to "Secure" memory if Trusty is in + * TrustZone. This transfer kind is suitable for donating + * video buffers or other similar resources. The paired fd + * may need to come from a platform-specific allocator for + * memory that may be transitioned to "Secure". + * @TRUSTY_SEND_SECURE: Send memory that is already "Secure". Memory will be + * accessible only to Trusty. The paired fd may need to + * come from a platform-specific allocator that returns + * "Secure" buffers. * * Describes how the user would like the resource in question to be sent to * Trusty. Options may be valid only for certain kinds of fds. @@ -39,6 +43,7 @@ enum transfer_kind { TRUSTY_SHARE = 0, TRUSTY_LEND = 1, + TRUSTY_SEND_SECURE = 2, }; /**