diff options
author | Jens Wiklander <jens.wiklander@linaro.org> | 2018-10-19 10:55:44 +0200 |
---|---|---|
committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2018-11-15 11:42:52 +0100 |
commit | 4cdeb627ad3c8723bff2790b2f94713037f8e751 (patch) | |
tree | 4b1e0446c278bf4bfba4c2273e40953f595e9197 | |
parent | 13eb4e3c7c97e2882d47570eda50d38e8008f160 (diff) |
core: msg_param: remove unused functions
Removes the unused functions msg_param_init_memparam() and
msg_param_get_buf_size().
Acked-by: Etienne Carriere <etienne.carriere@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r-- | core/include/kernel/msg_param.h | 56 | ||||
-rw-r--r-- | core/kernel/msg_param.c | 52 |
2 files changed, 0 insertions, 108 deletions
diff --git a/core/include/kernel/msg_param.h b/core/include/kernel/msg_param.h index 4c9e5ae6..a5b24bba 100644 --- a/core/include/kernel/msg_param.h +++ b/core/include/kernel/msg_param.h @@ -35,16 +35,6 @@ #include <kernel/msg_param.h> #include <mm/mobj.h> -/* - * This enum is used in tee_fill_memparam(). It describes direction of memory - * parameter. - */ -enum msg_param_mem_dir { - MSG_PARAM_MEM_DIR_IN = 0, - MSG_PARAM_MEM_DIR_OUT, - MSG_PARAM_MEM_DIR_INOUT, -}; - /** * msg_param_mobj_from_noncontig() - construct mobj from non-contiguous * list of pages. @@ -61,52 +51,6 @@ struct mobj *msg_param_mobj_from_noncontig(paddr_t buf_ptr, size_t size, uint64_t shm_ref, bool map_buffer); /** - * msg_param_init_memparam() - fill memory reference parameter for RPC call - * @param - parameter to fill - * @mobj - mobj describing the shared memory buffer - * @offset - offset of the buffer - * @size - size of the buffer - * @dir - data direction - * - * Idea behind this function is that thread_rpc_alloc() can return - * either buffer from preallocated memory pool, of buffer constructed - * from supplicant's memory. In first case parameter will have type - * OPTEE_MSG_ATTR_TYPE_TMEM_* and OPTEE_MSG_ATTR_TYPE_RMEM_ in second case. - * This function will fill parameter structure with right type, depending on - * the passed mobj. - * - * return: - * true on success, false on failure - */ -bool msg_param_init_memparam(struct optee_msg_param *param, struct mobj *mobj, - size_t offset, size_t size, - enum msg_param_mem_dir dir); -/** - * msg_param_get_buf_size() - helper functions that reads [T/R]MEM - * parameter size - * - * @param - struct optee_msg_param to read size from - * - * return: - * corresponding size field - */ -static inline size_t msg_param_get_buf_size(const struct optee_msg_param *param) -{ - switch (param->attr & OPTEE_MSG_ATTR_TYPE_MASK) { - case OPTEE_MSG_ATTR_TYPE_TMEM_INPUT: - case OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT: - case OPTEE_MSG_ATTR_TYPE_TMEM_INOUT: - return param->u.tmem.size; - case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT: - case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT: - case OPTEE_MSG_ATTR_TYPE_RMEM_INOUT: - return param->u.rmem.size; - default: - return 0; - } -} - -/** * msg_param_attr_is_tmem - helper functions that cheks if attribute is tmem * * @attr - attribute to check diff --git a/core/kernel/msg_param.c b/core/kernel/msg_param.c index 43f6df10..937f05d8 100644 --- a/core/kernel/msg_param.c +++ b/core/kernel/msg_param.c @@ -140,55 +140,3 @@ out: free(pages); return mobj; } - -bool msg_param_init_memparam(struct optee_msg_param *param, struct mobj *mobj, - size_t offset, size_t size, - enum msg_param_mem_dir dir) -{ - if (mobj_matches(mobj, CORE_MEM_REG_SHM)) { - /* Registered SHM mobj */ - switch (dir) { - case MSG_PARAM_MEM_DIR_IN: - param->attr = OPTEE_MSG_ATTR_TYPE_RMEM_INPUT; - break; - case MSG_PARAM_MEM_DIR_OUT: - param->attr = OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT; - break; - case MSG_PARAM_MEM_DIR_INOUT: - param->attr = OPTEE_MSG_ATTR_TYPE_RMEM_INOUT; - break; - default: - return false; - } - - param->u.rmem.size = size; - param->u.rmem.offs = offset; - param->u.rmem.shm_ref = mobj_get_cookie(mobj); - } else if (mobj_matches(mobj, CORE_MEM_NSEC_SHM)) { - /* MOBJ from from predefined pool */ - paddr_t pa; - - if (mobj_get_pa(mobj, 0, 0, &pa) != TEE_SUCCESS) - return false; - - switch (dir) { - case MSG_PARAM_MEM_DIR_IN: - param->attr = OPTEE_MSG_ATTR_TYPE_TMEM_INPUT; - break; - case MSG_PARAM_MEM_DIR_OUT: - param->attr = OPTEE_MSG_ATTR_TYPE_TMEM_OUTPUT; - break; - case MSG_PARAM_MEM_DIR_INOUT: - param->attr = OPTEE_MSG_ATTR_TYPE_TMEM_INOUT; - break; - default: - return false; - } - - param->u.tmem.buf_ptr = pa + offset; - param->u.tmem.shm_ref = mobj_get_cookie(mobj); - param->u.tmem.size = size; - } else - return false; - return true; -} |