AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

tee: optee: enable dynamic SHM support

Browse Source 
Previous patches added various features that are needed for dynamic SHM.
Dynamic SHM allows Normal World to share any buffers with OP-TEE.
While original design suggested to use pre-allocated region (usually of
1M to 2M of size), this new approach allows to use all non-secure RAM for
command buffers, RPC allocations and TA parameters.

This patch checks capability OPTEE_SMC_SEC_CAP_DYNAMIC_SHM. If it was set
by OP-TEE, then kernel part of OP-TEE will use kernel page allocator
to allocate command buffers. Also it will set TEE_GEN_CAP_REG_MEM
capability to tell userspace that it supports shared memory registration.

Signed-off-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
Volodymyr Babchuk 2017-11-29 14:48:36 +02:00 committed by Jens Wiklander
parent abd135ba21
commit f58e236c9d
1 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/tee/optee/core.c
View File

@ -28,6 +28,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include "optee_private.h" #include "optee_private.h"
#include "optee_smc.h" #include "optee_smc.h"
#include "shm_pool.h"
#define DRIVER_NAME "optee" #define DRIVER_NAME "optee"
@ -219,6 +220,10 @@ static void optee_get_version(struct tee_device *teedev,
.impl_caps = TEE_OPTEE_CAP_TZ, .impl_caps = TEE_OPTEE_CAP_TZ,
.gen_caps = TEE_GEN_CAP_GP, .gen_caps = TEE_GEN_CAP_GP,
}; };
struct optee *optee = tee_get_drvdata(teedev);
if (optee->sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM)
v.gen_caps |= TEE_GEN_CAP_REG_MEM;
*vers = v; *vers = v;
} }
@ -397,21 +402,22 @@ static bool optee_msg_exchange_capabilities(optee_invoke_fn *invoke_fn,
} }
static struct tee_shm_pool * static struct tee_shm_pool *
optee_config_shm_memremap(optee_invoke_fn *invoke_fn, void **memremaped_shm) optee_config_shm_memremap(optee_invoke_fn *invoke_fn, void **memremaped_shm,
u32 sec_caps)
{ {
union { union {
struct arm_smccc_res smccc; struct arm_smccc_res smccc;
struct optee_smc_get_shm_config_result result; struct optee_smc_get_shm_config_result result;
} res; } res;
struct tee_shm_pool *pool;
unsigned long vaddr; unsigned long vaddr;
phys_addr_t paddr; phys_addr_t paddr;
size_t size; size_t size;
phys_addr_t begin; phys_addr_t begin;
phys_addr_t end; phys_addr_t end;
void *va; void *va;
struct tee_shm_pool_mem_info priv_info; struct tee_shm_pool_mgr *priv_mgr;
struct tee_shm_pool_mem_info dmabuf_info; struct tee_shm_pool_mgr *dmabuf_mgr;
void *rc;
invoke_fn(OPTEE_SMC_GET_SHM_CONFIG, 0, 0, 0, 0, 0, 0, 0, &res.smccc); invoke_fn(OPTEE_SMC_GET_SHM_CONFIG, 0, 0, 0, 0, 0, 0, 0, &res.smccc);
if (res.result.status != OPTEE_SMC_RETURN_OK) { if (res.result.status != OPTEE_SMC_RETURN_OK) {
@ -441,22 +447,49 @@ optee_config_shm_memremap(optee_invoke_fn *invoke_fn, void **memremaped_shm)
} }
vaddr = (unsigned long)va; vaddr = (unsigned long)va;
priv_info.vaddr = vaddr; /*
priv_info.paddr = paddr; * If OP-TEE can work with unregistered SHM, we will use own pool
priv_info.size = OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE; * for private shm
dmabuf_info.vaddr = vaddr + OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE; */
dmabuf_info.paddr = paddr + OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE; if (sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) {
dmabuf_info.size = size - OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE; rc = optee_shm_pool_alloc_pages();
if (IS_ERR(rc))
goto err_memunmap;
priv_mgr = rc;
} else {
const size_t sz = OPTEE_SHM_NUM_PRIV_PAGES * PAGE_SIZE;
pool = tee_shm_pool_alloc_res_mem(&priv_info, &dmabuf_info); rc = tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, sz,
if (IS_ERR(pool)) { 3 /* 8 bytes aligned */);
memunmap(va); if (IS_ERR(rc))
goto out; goto err_memunmap;
priv_mgr = rc;
vaddr += sz;
paddr += sz;
size -= sz;
} }
rc = tee_shm_pool_mgr_alloc_res_mem(vaddr, paddr, size, PAGE_SHIFT);
if (IS_ERR(rc))
goto err_free_priv_mgr;
dmabuf_mgr = rc;
rc = tee_shm_pool_alloc(priv_mgr, dmabuf_mgr);
if (IS_ERR(rc))
goto err_free_dmabuf_mgr;
*memremaped_shm = va; *memremaped_shm = va;
out:
return pool; return rc;
err_free_dmabuf_mgr:
tee_shm_pool_mgr_destroy(dmabuf_mgr);
err_free_priv_mgr:
tee_shm_pool_mgr_destroy(priv_mgr);
err_memunmap:
memunmap(va);
return rc;
} }
/* Simple wrapper functions to be able to use a function pointer */ /* Simple wrapper functions to be able to use a function pointer */
@ -534,7 +567,7 @@ static struct optee *optee_probe(struct device_node *np)
if (!(sec_caps & OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM)) if (!(sec_caps & OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
pool = optee_config_shm_memremap(invoke_fn, &memremaped_shm); pool = optee_config_shm_memremap(invoke_fn, &memremaped_shm, sec_caps);
if (IS_ERR(pool)) if (IS_ERR(pool))
return (void *)pool; return (void *)pool;