OP-TEE: update optee_linuxdriver to match updated optee_os & optee_client

[firefly-linux-kernel-4.4.55.git] / security / optee_linuxdriver / core / tee_supp_com.h

diff --git a/security/optee_linuxdriver/core/tee_supp_com.h b/security/optee_linuxdriver/core/tee_supp_com.h
index 841fe9f1fbd33b8176b56c6e337ea828c70d6138..e5117e8357cc030513575f33fc77f26636367ff9 100644 (file)
--- a/security/optee_linuxdriver/core/tee_supp_com.h
+++ b/security/optee_linuxdriver/core/tee_supp_com.h
@@ -65,16 +65,21 @@ struct tee_rpc_free {
 };
 
 struct tee_rpc_cmd {
-       void *buffer;
+       union {
+               void    *buffer;
+               uint64_t padding_buf;
+       };
        uint32_t size;
        uint32_t type;
        int fd;
+       int reserved;
 };
 
 struct tee_rpc_invoke {
        uint32_t cmd;
        uint32_t res;
        uint32_t nbr_bf;
+       uint32_t reserved;
        struct tee_rpc_cmd cmds[TEE_RPC_BUFFER_NUMBER];
 };
 
@@ -83,6 +88,7 @@ struct tee_rpc {
        struct tee_rpc_invoke commFromUser;
        struct semaphore datatouser;
        struct semaphore datafromuser;
+       struct mutex thrd_mutex; /* Block the thread to wait for supp answer */
        struct mutex outsync; /* Out sync mutex */
        struct mutex insync; /* In sync mutex */
        struct mutex reqsync; /* Request sync mutex */