diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-02 10:18:09 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-02 10:18:09 -0700 |
| commit | 3287ecdf14fd40dbeca831d8cb1b1b73b1885dcb (patch) | |
| tree | f627f6a90a88acdeea919f0f214f97f436e2f812 | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
| parent | 3249527f19d660c5adfb2b6f4ffd4ca0506b8755 (diff) | |
| download | linux-3287ecdf14fd40dbeca831d8cb1b1b73b1885dcb.tar.gz linux-3287ecdf14fd40dbeca831d8cb1b1b73b1885dcb.tar.bz2 linux-3287ecdf14fd40dbeca831d8cb1b1b73b1885dcb.zip | |
Merge tag 'tee-drv-for-4.18' of git://git.linaro.org/people/jens.wiklander/linux-tee into next/drivers
Misc enhancement for tee driver subsystem
* Replaces getnstimeofday64() with ktime_get_real_ts64()
* Adds OPTEE_SHM_NUM_PRIV_PAGES to configure how many pages should be
statically reserved for driver private allocations
* tag 'tee-drv-for-4.18' of git://git.linaro.org/people/jens.wiklander/linux-tee:
tee: optee: making OPTEE_SHM_NUM_PRIV_PAGES configurable via Kconfig
tee: replace getnstimeofday64() with ktime_get_real_ts64()
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | drivers/tee/optee/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/tee/optee/core.c | 2 | ||||
| -rw-r--r-- | drivers/tee/optee/rpc.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig index 0126de898036..3c59e19029be 100644 --- a/drivers/tee/optee/Kconfig +++ b/drivers/tee/optee/Kconfig @@ -5,3 +5,11 @@ config OPTEE help This implements the OP-TEE Trusted Execution Environment (TEE) driver. + +config OPTEE_SHM_NUM_PRIV_PAGES + int "Private Shared Memory Pages" + default 1 + depends on OPTEE + help + This sets the number of private shared memory pages to be + used by OP-TEE TEE driver. diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index e5fd5ed217da..e1aafe842d66 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -32,7 +32,7 @@ #define DRIVER_NAME "optee" -#define OPTEE_SHM_NUM_PRIV_PAGES 1 +#define OPTEE_SHM_NUM_PRIV_PAGES CONFIG_OPTEE_SHM_NUM_PRIV_PAGES /** * optee_from_msg_param() - convert from OPTEE_MSG parameters to diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 41aea12e2bcc..b45c73dd37a5 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -48,7 +48,7 @@ static void handle_rpc_func_cmd_get_time(struct optee_msg_arg *arg) OPTEE_MSG_ATTR_TYPE_VALUE_OUTPUT) goto bad; - getnstimeofday64(&ts); + ktime_get_real_ts64(&ts); arg->params[0].u.value.a = ts.tv_sec; arg->params[0].u.value.b = ts.tv_nsec; |