Tee-dev

tee-dev@lists.linaro.org

292 discussions

[PATCH] optee: toolchain: Support 32-bit host machine

by prasanna karthik

Support building optee on 32-bit Host Linux distribution Signed-off-by: Prasanna K Mutharaju <prasannakarthik(a)outlook.com> --- toolchain.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/toolchain.mk b/toolchain.mk index 33c6dfb..d77c2f2 100644 --- a/toolchain.mk +++ b/toolchain.mk @@ -4,10 +4,17 @@ ROOT ?= $(CURDIR)/.. TOOLCHAIN_ROOT ?= $(ROOT)/toolchains +LBITS := $(shell getconf LONG_BIT) AARCH32_PATH ?= $(TOOLCHAIN_ROOT)/aarch32 AARCH32_CROSS_COMPILE ?= $(AARCH32_PATH)/bin/arm-linux-gnueabihf- -AARCH32_GCC_VERSION ?= gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf -SRC_AARCH32_GCC ?= http://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/arm-li… + +ifeq ($(LBITS),64) + AARCH32_GCC_VERSION ?= gcc-linaro-6.2.1-2016.11-x86_64_arm-linux-gnueabihf + SRC_AARCH32_GCC ?= http://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/arm-li… +else + AARCH32_GCC_VERSION ?= gcc-linaro-arm-linux-gnueabihf-4.9-2014.08_linux + SRC_AARCH32_GCC ?= http://releases.linaro.org/archive/14.08/components/toolchain/binaries/${AA… +endif AARCH64_PATH ?= $(TOOLCHAIN_ROOT)/aarch64 AARCH64_CROSS_COMPILE ?= $(AARCH64_PATH)/bin/aarch64-linux-gnu- -- 1.7.9.5

7 years, 8 months

A Quick Survey on a Patch Propagation Tool

by machiry aravind

Hi Developer and maintainers, We (researchers for UC Santa Barbara) are developing a tool that will help in propagating patches. Please, It would be great if you can fill a 2-question anonymous survey: https://goo.gl/forms/5cBSx4axKmc8BEtA3 Would you be interested in a tool, which identifies patches that could be imported with a minimal or rather no testing? E.g. Security patches, you can import security patches as they usually do not affect the functionality. This tool would use only old source file and the new source file!! No commit messages, no build setup, nothing!! Something like: git saferebase? We actually used the tool on the Linux Main Line repository and it did identify several (60%) patches which are safe to port or do not affect the functionality. This tool could be used to import patches from the main source branch to your branch without worrying about testing them. You can also use this tool as a patch monitor, which monitors all commits to a repository and inform you about patches that do not affect the functionality or otherwise safe patches. Note that: This tool is supposed to *help* an expert not to *replace* one. Thank You, Aravind

7 years, 9 months

A Quick Survey on a Patch Propagation Tool

by Aravind Machiry

Hi Developer and maintainers, We (researchers for UC Santa Barbara) are developing a tool that will help in propagating patches. Please, It would be great if you can fill a 2-question anonymous survey: https://goo.gl/forms/5cBSx4axKmc8BEtA3 Would you be interested in a tool, which identifies patches that could be imported with a minimal or rather no testing? E.g. Security patches, you can import security patches as they usually do not affect the functionality. This tool would use only old source file and the new source file!! *No commit messages, no build setup, nothing!!* Something like: git saferebase? This tool could be used to import patches from the main source branch to your branch without worrying about testing them. You can also use this tool as a patch monitor, which monitors all commits to a repository and inform you about patches that do not affect the functionality or otherwise safe patches. Thank You, Aravind

7 years, 9 months

[PATCH] Update link rules for User TA

by Pierre Peiffer

Let's use --start-group / --end-group to allow all libraries added by a user to use any symbols provided by optee-os lib without having to add that library again. For example, if one provides its own library libexample.a that use strcmp(), which is provided by libutils.a, and he want to compile its TA with libexample.a, he'll add libdirs += ... libnames += example in his TA Makefile But the linker will not find strcmp() symbol unless he adds utils lib explicitely: libnames += utils example even if it is already specified in ta_dev_kit.mk because the order matter, unless it uses -start-group / --end-group Signed-off-by: Pierre Peiffer <ppeiffer(a)invensense.com> --- ta/arch/arm/link.mk | 2 +- ta/mk/ta_dev_kit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ta/arch/arm/link.mk b/ta/arch/arm/link.mk index 304bccc..ccd6467 100644 --- a/ta/arch/arm/link.mk +++ b/ta/arch/arm/link.mk @@ -25,7 +25,7 @@ reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordlist 2,$(words $(1)),$( link-ldadd = $(LDADD) link-ldadd += $(addprefix -L,$(libdirs)) -link-ldadd += $(addprefix -l,$(call reverse,$(libnames))) +link-ldadd += --start-group $(addprefix -l,$(call reverse,$(libnames))) --end-group ldargs-$(binary).elf := $(link-ldflags) $(objs) $(link-ldadd) diff --git a/ta/mk/ta_dev_kit.mk b/ta/mk/ta_dev_kit.mk index fab5df0..aaa9fab 100644 --- a/ta/mk/ta_dev_kit.mk +++ b/ta/mk/ta_dev_kit.mk @@ -61,7 +61,7 @@ endif cppflags$(sm) += -I. -I$(ta-dev-kit-dir)/include libdirs += $(ta-dev-kit-dir)/lib -libnames += utils utee mpa utils zlib png utee +libnames += utils utee mpa zlib png libdeps += $(ta-dev-kit-dir)/lib/libutils.a libdeps += $(ta-dev-kit-dir)/lib/libmpa.a libdeps += $(ta-dev-kit-dir)/lib/libutee.a -- 2.7.4

7 years, 9 months

allocating memory for DMA

by Stuart Yoder

I am doing some experiments with a crypto device in the OP-TEE kernel. What is the recommended way to allocate physically contiguous memory for DMA? Will using malloc() in the kernel give me physically contiguous memory? ...based on what I see in documentation/optee_design.md it says that the heap is unpaged, which leads me to think that malloc gives contiguous memory, but wanted to confirm. Thanks, Stuart

7 years, 9 months

non-sec DDR configuration with split memory map

by Stuart Yoder

All, I am testing Volodymyr's dynamic shared memory patches, which depends on the non-sec DDR support that has been added in OP-TEE recently. I am testing this on a Juno platform which has a DDR split into 2 different regions: 0x0_80000000 2G 0x8_80000000 6G The platform_config.h allows you to define a DRAM0 base/size which then is used in the macro: register_nsec_ddr(DRAM0_BASE, DRAM0_SIZE); I tried defining the second DDR region in platform_config.h and a second call to register_nsec_ddr(), but that did not work. Has anyone succeeded in having the nsec DDR split into 2 regions? Would Jen's patch: core: assign non-sec DDR configuration from DT ...solve this issue? Right now the Juno does not use CFG_DT, and when I turn it on OP-TEE reports that it cannot find the device tree. Thanks, Stuart

7 years, 10 months

[PATCH] tee: add kernel internal client interface

by Jens Wiklander

Adds a kernel internal TEE client interface to be used by other drivers. Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/tee_core.c | 124 +++++++++++++++++++++++++++++++++++++++++++----- include/linux/tee_drv.h | 73 ++++++++++++++++++++++++++++ 2 files changed, 186 insertions(+), 11 deletions(-) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 58a5009eacc3..bcc39e263bdd 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -38,15 +38,13 @@ static DEFINE_SPINLOCK(driver_lock); static struct class *tee_class; static dev_t tee_devt; -static int tee_open(struct inode *inode, struct file *filp) +static struct tee_context *teedev_open(struct tee_device *teedev) { int rc; - struct tee_device *teedev; struct tee_context *ctx; - teedev = container_of(inode->i_cdev, struct tee_device, cdev); if (!tee_device_get(teedev)) - return -EINVAL; + return ERR_PTR(-EINVAL); ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) { @@ -56,22 +54,20 @@ static int tee_open(struct inode *inode, struct file *filp) ctx->teedev = teedev; INIT_LIST_HEAD(&ctx->list_shm); - filp->private_data = ctx; rc = teedev->desc->ops->open(ctx); if (rc) goto err; - return 0; + return ctx; err: kfree(ctx); tee_device_put(teedev); - return rc; + return ERR_PTR(rc); + } -static int tee_release(struct inode *inode, struct file *filp) +static void teedev_close_context(struct tee_context *ctx) { - struct tee_context *ctx = filp->private_data; - struct tee_device *teedev = ctx->teedev; struct tee_shm *shm; ctx->teedev->desc->ops->release(ctx); @@ -79,8 +75,25 @@ static int tee_release(struct inode *inode, struct file *filp) list_for_each_entry(shm, &ctx->list_shm, link) shm->ctx = NULL; mutex_unlock(&ctx->teedev->mutex); + tee_device_put(ctx->teedev); kfree(ctx); - tee_device_put(teedev); +} + +static int tee_open(struct inode *inode, struct file *filp) +{ + struct tee_context *ctx; + + ctx = teedev_open(container_of(inode->i_cdev, struct tee_device, cdev)); + if (IS_ERR(ctx)) + return PTR_ERR(ctx); + + filp->private_data = ctx; + return 0; +} + +static int tee_release(struct inode *inode, struct file *filp) +{ + teedev_close_context(filp->private_data); return 0; } @@ -862,6 +875,95 @@ void *tee_get_drvdata(struct tee_device *teedev) } EXPORT_SYMBOL_GPL(tee_get_drvdata); +struct match_dev_data { + struct tee_ioctl_version_data *vers; + const void *data; + int (*match)(struct tee_ioctl_version_data *, const void *); +}; + +static int match_dev(struct device *dev, const void *data) +{ + const struct match_dev_data *match_data = data; + struct tee_device *teedev = container_of(dev, struct tee_device, dev); + + teedev->desc->ops->get_version(teedev, match_data->vers); + return match_data->match(match_data->vers, match_data->data); +} + +struct tee_context * +tee_client_open_context(struct tee_context *start, + int (*match)(struct tee_ioctl_version_data *, + const void *), + const void *data, struct tee_ioctl_version_data *vers) +{ + struct device *dev = NULL; + struct device *put_dev = NULL; + struct tee_context *ctx = NULL; + struct tee_ioctl_version_data v; + struct match_dev_data match_data = { vers ? vers : &v, data, match }; + + if (start) + dev = &start->teedev->dev; + + do { + dev = class_find_device(tee_class, dev, &match_data, match_dev); + if (!dev) { + ctx = ERR_PTR(-ENOENT); + break; + } + + put_device(put_dev); + put_dev = dev; + + ctx = teedev_open(container_of(dev, struct tee_device, dev)); + } while (IS_ERR(ctx) && PTR_ERR(ctx) != -ENOMEM); + + put_device(put_dev); + return ctx; +} +EXPORT_SYMBOL_GPL(tee_client_open_context); + +void tee_client_close_context(struct tee_context *ctx) +{ + teedev_close_context(ctx); +} +EXPORT_SYMBOL_GPL(tee_client_close_context); + +void tee_client_get_version(struct tee_context *ctx, + struct tee_ioctl_version_data *vers) +{ + ctx->teedev->desc->ops->get_version(ctx->teedev, vers); +} +EXPORT_SYMBOL_GPL(tee_client_get_version); + +int tee_client_open_session(struct tee_context *ctx, + struct tee_ioctl_open_session_arg *arg, + struct tee_param *param) +{ + if (!ctx->teedev->desc->ops->open_session) + return -EINVAL; + return ctx->teedev->desc->ops->open_session(ctx, arg, param); +} +EXPORT_SYMBOL_GPL(tee_client_open_session); + +int tee_client_close_session(struct tee_context *ctx, u32 session) +{ + if (!ctx->teedev->desc->ops->close_session) + return -EINVAL; + return ctx->teedev->desc->ops->close_session(ctx, session); +} +EXPORT_SYMBOL_GPL(tee_client_close_session); + +int tee_client_invoke_func(struct tee_context *ctx, + struct tee_ioctl_invoke_arg *arg, + struct tee_param *param) +{ + if (!ctx->teedev->desc->ops->invoke_func) + return -EINVAL; + return ctx->teedev->desc->ops->invoke_func(ctx, arg, param); +} +EXPORT_SYMBOL_GPL(tee_client_invoke_func); + static int __init tee_init(void) { int rc; diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 0f175b8f6456..39440c7c7558 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -274,4 +274,77 @@ int tee_shm_get_id(struct tee_shm *shm); */ struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id); +/** + * tee_client_open_context() - Open a TEE context + * @start: if not NULL, continue search after this context + * @match: function to check TEE device + * @data: data for match function + * @vers: if not NULL, version data of TEE device of the context returned + * + * This function does an operation similar to open("/dev/teeX") in user space. + * A returned context must be released with tee_client_close_context(). + * + * Returns a TEE context of the first TEE device matched by the match() + * callback or an ERR_PTR. + */ +struct tee_context * +tee_client_open_context(struct tee_context *start, + int (*match)(struct tee_ioctl_version_data *, + const void *), + const void *data, struct tee_ioctl_version_data *vers); + +/** + * tee_client_close_context() - Close a TEE context + * @ctx: TEE context to close + * + * Note that all sessions previously opened with this context will be + * closed when this function is called. + */ +void tee_client_close_context(struct tee_context *ctx); + +/** + * tee_client_get_version() - Query version of TEE + * @ctx: TEE context to TEE to query + * @vers: Pointer to version data + */ +void tee_client_get_version(struct tee_context *ctx, + struct tee_ioctl_version_data *vers); + +/** + * tee_client_open_session() - Open a session to a Trusted Application + * @ctx: TEE context + * @arg: Open session arguments, see description of + * struct tee_ioctl_open_session_arg + * @param: Parameters passed to the Trusted Application + * + * Returns < 0 on error else see @arg->ret for result. If @arg->ret + * is TEEC_SUCCESS the session identifier is available in @arg->session. + */ +int tee_client_open_session(struct tee_context *ctx, + struct tee_ioctl_open_session_arg *arg, + struct tee_param *param); + +/** + * tee_client_close_session() - Close a session to a Trusted Application + * @ctx: TEE Context + * @session: Session id + * + * Return < 0 on error else 0, regardless the session will not be + * valid after this function has returned. + */ +int tee_client_close_session(struct tee_context *ctx, u32 session); + +/** + * tee_client_invoke_func() - Invoke a function in a Trusted Application + * @ctx: TEE Context + * @arg: Invoke arguments, see description of + * struct tee_ioctl_invoke_arg + * @param: Parameters passed to the Trusted Application + * + * Returns < 0 on error else see @arg->ret for result. + */ +int tee_client_invoke_func(struct tee_context *ctx, + struct tee_ioctl_invoke_arg *arg, + struct tee_param *param); + #endif /*__TEE_DRV_H*/ -- 2.7.4

7 years, 11 months

[PATCH] tee: optee: sync with new naming of interrupts

by Jens Wiklander

From: David Wang <david.wang(a)arm.com> In the latest changes of optee_os, the interrupts' names are changed to "native" and "foreign" interrupts. Signed-off-by: David Wang <david.wang(a)arm.com> Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/optee/optee_smc.h | 12 ++++++------ drivers/tee/optee/rpc.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/tee/optee/optee_smc.h b/drivers/tee/optee/optee_smc.h index 13b7c98cdf25..069c8e1429de 100644 --- a/drivers/tee/optee/optee_smc.h +++ b/drivers/tee/optee/optee_smc.h @@ -298,7 +298,7 @@ struct optee_smc_disable_shm_cache_result { OPTEE_SMC_FAST_CALL_VAL(OPTEE_SMC_FUNCID_ENABLE_SHM_CACHE) /* - * Resume from RPC (for example after processing an IRQ) + * Resume from RPC (for example after processing a foreign interrupt) * * Call register usage: * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC @@ -383,19 +383,19 @@ struct optee_smc_disable_shm_cache_result { OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FREE) /* - * Deliver an IRQ in normal world. + * Deliver foreign interrupt to normal world. * * "Call" register usage: - * a0 OPTEE_SMC_RETURN_RPC_IRQ + * a0 OPTEE_SMC_RETURN_RPC_FOREIGN_INTR * a1-7 Resume information, must be preserved * * "Return" register usage: * a0 SMC Function ID, OPTEE_SMC_CALL_RETURN_FROM_RPC. * a1-7 Preserved */ -#define OPTEE_SMC_RPC_FUNC_IRQ 4 -#define OPTEE_SMC_RETURN_RPC_IRQ \ - OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_IRQ) +#define OPTEE_SMC_RPC_FUNC_FOREIGN_INTR 4 +#define OPTEE_SMC_RETURN_RPC_FOREIGN_INTR \ + OPTEE_SMC_RPC_VAL(OPTEE_SMC_RPC_FUNC_FOREIGN_INTR) /* * Do an RPC request. The supplied struct optee_msg_arg tells which diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 9488ed1541bc..cef417f4f4d2 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -371,11 +371,11 @@ void optee_handle_rpc(struct tee_context *ctx, struct optee_rpc_param *param) shm = reg_pair_to_ptr(param->a1, param->a2); tee_shm_free(shm); break; - case OPTEE_SMC_RPC_FUNC_IRQ: + case OPTEE_SMC_RPC_FUNC_FOREIGN_INTR: /* - * An IRQ was raised while secure world was executing, - * since all IRQs are handled in Linux a dummy RPC is - * performed to let Linux take the IRQ through the normal + * A foreign interrupt was raised while secure world was + * executing, since they are handled in Linux a dummy RPC is + * performed to let Linux take the interrupt through the normal * vector. */ break; -- 2.7.4

7 years, 11 months

[PATCH] tee: indicate privileged dev in gen_caps

by Jens Wiklander

Mirrors the TEE_DESC_PRIVILEGED bit of struct tee_desc:flags into struct tee_ioctl_version_data:gen_caps as TEE_GEN_CAP_PRIVILEGED in tee_ioctl_version() Reviewed-by: Jerome Forissier <jerome.forissier(a)linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/tee_core.c | 5 +++++ include/uapi/linux/tee.h | 1 + 2 files changed, 6 insertions(+) diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 5c60bf4423e6..58a5009eacc3 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c @@ -90,8 +90,13 @@ static int tee_ioctl_version(struct tee_context *ctx, struct tee_ioctl_version_data vers; ctx->teedev->desc->ops->get_version(ctx->teedev, &vers); + + if (ctx->teedev->desc->flags & TEE_DESC_PRIVILEGED) + vers.gen_caps |= TEE_GEN_CAP_PRIVILEGED; + if (copy_to_user(uvers, &vers, sizeof(vers))) return -EFAULT; + return 0; } diff --git a/include/uapi/linux/tee.h b/include/uapi/linux/tee.h index 370d8845ab21..688782e90140 100644 --- a/include/uapi/linux/tee.h +++ b/include/uapi/linux/tee.h @@ -49,6 +49,7 @@ #define TEE_MAX_ARG_SIZE 1024 #define TEE_GEN_CAP_GP (1 << 0)/* GlobalPlatform compliant TEE */ +#define TEE_GEN_CAP_PRIVILEGED (1 << 1)/* Privileged device (for supplicant) */ /* * TEE Implementation ID -- 2.7.4

7 years, 11 months

[PATCH] tee: optee: interruptible RPC sleep

by Jens Wiklander

From: tiger-yu99 <tigeryu99(a)hotmail.com> Prior to this patch RPC sleep was uninterruptible since msleep() is uninterruptible. Change to use msleep_interruptible() instead. Signed-off-by: Tiger Yu <tigeryu99(a)hotmail.com> Reviewed-by: Joakim Bech <joakim.bech(a)linaro.org> Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- drivers/tee/optee/rpc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 8814eca06021..9488ed1541bc 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -140,11 +140,8 @@ static void handle_rpc_func_cmd_wait(struct optee_msg_arg *arg) msec_to_wait = arg->params[0].u.value.a; - /* set task's state to interruptible sleep */ - set_current_state(TASK_INTERRUPTIBLE); - - /* take a nap */ - msleep(msec_to_wait); + /* Go to interruptible sleep */ + msleep_interruptible(msec_to_wait); arg->ret = TEEC_SUCCESS; return; -- 2.7.4

7 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

Tee-dev