Optee rev #54

jforissier · 2017-11-20T17:54:32Z

No description provided.

Fixes the static checker warning in optee_release(). error: uninitialized symbol 'parg'. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

tee_drv.h references struct device, but does not include device.h nor platform_device.h. Therefore, if tee_drv.h is included by some file that does not pull device.h nor platform_device.h beforehand, we have a compile warning. Fix this by adding a forward declaration. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

dma_buf_ops are not supposed to change at runtime. All functions working with dma_buf_ops provided by <linux/dma-buf.h> work with const dma_buf_ops. So mark the non-const structs as const. File size before: text data bss dec hex filename 2026 112 0 2138 85a drivers/tee/tee_shm.o File size After adding 'const': text data bss dec hex filename 2138 0 0 2138 85a drivers/tee/tee_shm.o Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Add const to tee_desc structures as they are only passed as an argument to the function tee_device_alloc. This argument is of type const, so declare these structures as const too. Add const to tee_driver_ops structures as they are only stored in the ops field of a tee_desc structure. This field is of type const, so declare these structure types as const. Signed-off-by: Bhumika Goyal <bhumirks@gmail.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Prior to this patch RPC sleep was uninterruptible since msleep() is uninterruptible. Change to use msleep_interruptible() instead. Signed-off-by: Tiger Yu <tigeryu99@hotmail.com> Reviewed-by: Joakim Bech <joakim.bech@linaro.org> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

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@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

In the latest changes of optee_os, the interrupts' names are changed to "native" and "foreign" interrupts. Signed-off-by: David Wang <david.wang@arm.com> Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Adds a kernel internal TEE client interface to be used by other drivers. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

From the commit below, the mt8173-evb failed to boot to console due to changes in the mt8173 device tree files. commit c0d6fe2 Merge: b44a3d2 3e4dda7 Author: Linus Torvalds <torvalds@linux-foundation.org> Date: Tue Nov 10 15:06:26 2015 -0800 Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Until properly solved, let's just remove the section in the device tree blob that causes this. Signed-off-by: Joakim Bech <joakim.bech@linaro.org> Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

Enables use of PSCI for foundation-v8. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Uses GICv2 for foundation-v8. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Configures foundation-v8 with OP-TEE. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Configures Juno with OP-TEE. Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

…dation-v8 **not for mainline** All the platforms that reserve memory for OP-TEE statically via the DT (i.e., not those that reserve it via UEFI or that patch the DT dynamically thanks to OP-TEE's CFG_DT option) have to mark it 'no-map' so that only the TEE driver may map it. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Prior to this patch the ARM_SMCCC_FAST_CALL constant was of an unsigned type causing unwanted sign extension. This patch explicitly selects an unsigned type for the constant. Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU Aarch64) Reported-by: Saksham Jain <sakjain92@gmail.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

This change allows userland to create a tee_shm object that refers to a dmabuf reference. Userland provides a dmabuf file descriptor as buffer reference. The created tee_shm object exported as a brand new dmabuf reference used to provide a clean fd to userland. Userland shall closed this new fd to release the tee_shm object resources. The initial dmabuf resources are tracked independently through original dmabuf file descriptor. Once the buffer is registered and until it is released, TEE driver keeps a refcount on the registered dmabuf structure. This change only support dmabuf references that relates to physically contiguous memory buffers. New tee_shm flag to identify tee_shm objects built from a registered dmabuf: TEE_SHM_EXT_DMA_BUF. Such tee_shm structures are flagged both TEE_SHM_DMA_BUF and TEE_SHM_EXT_DMA_BUF. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

… **not for mainline** All the platforms that reserve memory for OP-TEE statically via the DT (i.e., not those that reserve it via UEFI or that patch the DT dynamically thanks to OP-TEE's CFG_DT option) have to mark it 'no-map' so that only the TEE driver may map it. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Signed-off-by: Joakim Bech <joakim.bech@linaro.org> Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Adds TEE_IOCTL_PARAM_ATTR_META with can be used to indicate meta parameters when communicating with user space. These meta parameters can be used by supplicant support multiple parallel requests at a time. Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Adds support for asynchronous supplicant requests, meaning that the supplicant can process several requests in parallel or block in a request for some time. Acked-by: Etienne Carriere <etienne.carriere@linaro.org> Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (b2260 pager=y/n) Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Add Benchmark support Reviewed-by: Joakim Bech <joakim.bech@linaro.org> Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

<linux/tee_drv.h> is not used by the benchmark code and happens to introduce a compile warning if it is included without <linux/platform_device.h> (or, more exactly, <linux/device.h>). In file included from drivers/tee/optee/optee_bench.h:19:0, from drivers/tee/optee/bench.c:15: ./include/linux/tee_drv.h:127:16: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration struct device *dev, ^~~~~~ Fixes: 4867f93 ("OP-TEE Benchmark **not for mainline**") Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Joakim Bech <joakim.bech@linaro.org> Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

Dumped from: https://github.com/loboris/OrangePI-Kernel/tree/master/linux-3.4 0cc8d855adb457d1860d6e25cb93b6cc75d5a09d Author: Sunny <sunny@allwinnertech.com> for Allwinner. Changes made on original "secure heap" implementation: - minor coding style: fix includes, empty lines and overlong lines, indentation, comment layout. - Original path modified the ion uapi. We do not attempt to modify uapi/ion.h. "secure" (or "domain") heaps are under ID ION_HEAP_TYPE_CUSTOM + 1 (legacy 'secure heap type' value). Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

OP-TEE/SDP (Secure Data Path) memory pools are created through ION secure type heap" from Allwinner. This change renames "secure" into "unmapped" as, from Linux point of view, the heap constraint is manipulating unampped memory pools/buffers. "Unmapped" heap support is integrated in ION UAPI (actually this was the Allwinner initial proposal) and ION DT parsing support. Based in work from Sunny <sunny@allwinnertech.com> for Allwinner. Changes: - rename "secure_heap" into "unmapped_heap" - define ION_HEAP_TYPE_UNMAPPED in ION UAPI (sic!) - add structure "struct unmapped_buffer_priv" to hold allocated buffer private data (currently only the buffer physical address. - adapt to recent ION (i.e ion_phys_addr_t => phys_addr_t) - Support dummy heap configuration: one can hard code into the Linux kernel configuration the location of a "unmapped heap". It will be created during ION device inits: see CONFIG_ION_DUMMY_UNMAPPED_HEAP. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

Condition ION unmapped heap implementation to architectures that currently support it. ARM is one of these. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

Makes creation of shm pools more flexible by adding new more primitive functions to allocate a shm pool. This makes it easier to add driver specific shm pool management. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

Added new ioctl to allow users register own buffers as a shared memory. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> Signed-off-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>

These two function will be needed for shared memory registration in OP-TEE Signed-off-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>

Ion unmapped heap aims at not being mapped. This change prevents Ion from calling dma-mapping support on dma_buf_attach for buffers in an unmapped heap. This change is a bit intrusive in the Ion driver. Maybe there is another way to deal with the dma-mapping resources used for the unmapped heap. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

jbech-linaro · 2017-11-24T09:18:05Z

I think this looks good. Just one thing though, since this is a kernel patch, please don't forget to follow the kernel patch strategy that we have proposed (doc).
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

jforissier · 2017-11-24T09:37:30Z

@jbech-linaro right, thanks for the reminder ;)

If no one objects (@jenswi-linaro is that OK with you?), I'll squash and post to LKML.

jenswi-linaro · 2017-11-24T09:57:48Z

drivers/tee/optee/core.c

+		struct optee_smc_calls_revision_result result;
+	} res = {
+		.result = {
+			.reserved0 = 0


Since we're now actually using this member it should have a proper name.

I was worried about breaking backwards compatibility, but since (1) it is in-kernel code and (2) no one is supposed to use a reserved field, it sounds reasonable indeed.

jenswi-linaro · 2017-11-24T10:00:42Z

drivers/tee/optee/core.c

+
+	if ((u32)res.result.reserved0)
+		snprintf(id, sizeof(id), " (%08x)", (u32)res.result.reserved0);
+	pr_info("revision %lu.%lu%s", res.result.major, res.result.minor, id);


The stuff with id looks a bit more complicated than just:

if (res.result.reserved0) pr_info("revision %lu.%lu (%08x)", res.result.major, res.result.minor, (u32)res.result.reserved0); else pr_info("revision %lu.%lu", res.result.major, res.result.minor);

Yup will fix

jforissier · 2017-11-24T10:37:23Z

Update

jenswi-linaro · 2017-11-24T10:47:35Z

drivers/tee/optee/core.c

+		  &res.smccc);
+
+	if (res.result.build_id)
+		pr_info("revision %lu.%lu (%08x)", res.result.major,


With %08lx we wouldn't need to cast build_id.

jforissier · 2017-11-24T11:58:13Z

Comment addressed.

jenswi-linaro · 2017-11-24T12:48:22Z

Looks good.

jforissier · 2017-11-24T12:49:18Z

OK thanks Jens. I'll post to LKML.

In the OPTEE_SMC_CALL_GET_OS_REVISION request, the previously reserved parameter a2 is now documented as being an optional build identifier (such as an SCM revision or commit ID, for instance). A new structure optee_smc_call_get_os_revision_result is introduced to be used when querying the secure OS version, instead of re-using the struct defined for OPTEE_SMC_CALLS_REVISION. Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

When the driver initializes, report the following information about the OP-TEE OS: - major and minor version, - build identifier (if available). Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

jenswi-linaro and others added 30 commits August 21, 2017 13:35

tee: optee: fix uninitialized symbol 'parg'

8516c25

Fixes the static checker warning in optee_release(). error: uninitialized symbol 'parg'. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

tee: add kernel internal client interface

7efd6cd

Adds a kernel internal TEE client interface to be used by other drivers. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

arm64: dt: PSCI for foundation-v8 **not for mainline**

70a4220

Enables use of PSCI for foundation-v8. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

arm64: dt: use GICv2 for foundation-v8 **not for mainline**

365afd8

Uses GICv2 for foundation-v8. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

arm64: dt: OP-TEE for foundation-v8 **not for mainline**

4130908

Configures foundation-v8 with OP-TEE. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

arm64: dt: OP-TEE for Juno **not for mainline**

5ca01d0

Configures Juno with OP-TEE. Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

arm64: dt: Add OP-TEE firmware to mt8173 **not for mainline**

e38b591

Signed-off-by: Joakim Bech <joakim.bech@linaro.org> Reviewed-by: Pascal Brand <pascal.brand@linaro.org> Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

tee: add tee_param_is_memref() for driver use

962de97

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

OP-TEE Benchmark **not for mainline**

e8c8bf8

Add Benchmark support Reviewed-by: Joakim Bech <joakim.bech@linaro.org> Signed-off-by: Igor Opaniuk <igor.opaniuk@linaro.org>

staging/ion: condition unmapped heap to supported architectures

9a5d477

Condition ION unmapped heap implementation to architectures that currently support it. ARM is one of these. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

staging/ion: ARM64 supports ION_UNMAPPED_HEAP

b5d85ec

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

[NEW SHM]tee: flexible shared memory pool creation

76b0502

Makes creation of shm pools more flexible by adding new more primitive functions to allocate a shm pool. This makes it easier to add driver specific shm pool management. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

[NEW SHM]tee: add register user memory

db3638f

Added new ioctl to allow users register own buffers as a shared memory. Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> Signed-off-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>

[NEW SHM]tee: shm: add accessors for buffer size and page offset

3a0188b

These two function will be needed for shared memory registration in OP-TEE Signed-off-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>

jenswi-linaro reviewed Nov 24, 2017

View reviewed changes

jforissier added 2 commits November 24, 2017 14:00

tee: optee: report OP-TEE revision information

3a701ec

When the driver initializes, report the following information about the OP-TEE OS: - major and minor version, - build identifier (if available). Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>

jforissier force-pushed the optee-rev branch from 8b3a88c to 3a701ec Compare November 24, 2017 13:01

jforissier force-pushed the optee branch from 6e954e2 to 3ed4ce4 Compare April 13, 2018 07:45

jforissier force-pushed the optee branch from ece5ba2 to 75065d7 Compare September 6, 2018 12:20

jforissier force-pushed the optee branch from 0249e2d to 221a1ac Compare November 5, 2018 14:22

jforissier force-pushed the optee branch 3 times, most recently from 221a1ac to 0fd2deb Compare March 8, 2019 09:16

jforissier force-pushed the optee branch from 314e492 to 9823b25 Compare May 13, 2019 12:08

jforissier force-pushed the optee branch from 65fa3a3 to 1ad01d3 Compare February 4, 2020 09:08

jforissier force-pushed the optee branch from 5973cd5 to a1f8ac0 Compare October 16, 2020 13:40

jforissier force-pushed the optee branch from 8d2e568 to 51ec19c Compare May 21, 2021 07:44

jforissier force-pushed the optee branch from 51ec19c to e2c060f Compare June 28, 2021 11:38

jforissier force-pushed the optee branch from e2c060f to 0a74b86 Compare September 27, 2021 09:35

jforissier force-pushed the optee branch from f8e3503 to ea26c1a Compare January 10, 2022 16:00

jforissier force-pushed the optee branch from dbeb6ea to 665750f Compare April 4, 2022 08:19

jforissier force-pushed the optee branch from 665750f to 688e135 Compare May 18, 2022 09:48

jforissier force-pushed the optee branch from b9a1699 to b398822 Compare September 8, 2022 13:34

jforissier force-pushed the optee branch from bb38d3f to aed8040 Compare January 11, 2023 15:11

jforissier force-pushed the optee branch from fd85e21 to a24278e Compare November 6, 2023 13:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Optee rev #54

Optee rev #54

jforissier commented Nov 20, 2017

jbech-linaro commented Nov 24, 2017 •

edited

Loading

jforissier commented Nov 24, 2017

jenswi-linaro Nov 24, 2017

jforissier Nov 24, 2017

jenswi-linaro Nov 24, 2017

jforissier Nov 24, 2017

jforissier commented Nov 24, 2017

jenswi-linaro Nov 24, 2017

jforissier commented Nov 24, 2017

jenswi-linaro commented Nov 24, 2017

jforissier commented Nov 24, 2017

Optee rev #54

Are you sure you want to change the base?

Optee rev #54

Conversation

jforissier commented Nov 20, 2017

jbech-linaro commented Nov 24, 2017 • edited Loading

jforissier commented Nov 24, 2017

jenswi-linaro Nov 24, 2017

Choose a reason for hiding this comment

jforissier Nov 24, 2017

Choose a reason for hiding this comment

jenswi-linaro Nov 24, 2017

Choose a reason for hiding this comment

jforissier Nov 24, 2017

Choose a reason for hiding this comment

jforissier commented Nov 24, 2017

jenswi-linaro Nov 24, 2017

Choose a reason for hiding this comment

jforissier commented Nov 24, 2017

jenswi-linaro commented Nov 24, 2017

jforissier commented Nov 24, 2017

jbech-linaro commented Nov 24, 2017 •

edited

Loading