Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optee rev #54

Open
wants to merge 45 commits into
base: optee
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8516c25
tee: optee: fix uninitialized symbol 'parg'
jenswi-linaro May 15, 2017
0c6b38b
tee: add forward declaration for struct device
jforissier May 31, 2017
0383cf4
tee: tee_shm: Constify dma_buf_ops structures.
ArvindYadavCs Jul 1, 2017
a00c819
tee: optee: add const to tee_driver_ops and tee_desc structures
goyalbhumika Jun 29, 2017
625dacb
tee: optee: interruptible RPC sleep
tiger-yu99 May 5, 2017
87cc807
tee: indicate privileged dev in gen_caps
jenswi-linaro Feb 16, 2017
864563c
tee: optee: sync with new naming of interrupts
Feb 16, 2017
7efd6cd
tee: add kernel internal client interface
jenswi-linaro Nov 19, 2015
b599994
arm64: dt: Remove timer from mt8173 **not for mainline**
jbech-linaro Apr 1, 2016
70a4220
arm64: dt: PSCI for foundation-v8 **not for mainline**
jenswi-linaro Aug 17, 2016
365afd8
arm64: dt: use GICv2 for foundation-v8 **not for mainline**
jenswi-linaro Aug 17, 2016
4130908
arm64: dt: OP-TEE for foundation-v8 **not for mainline**
jenswi-linaro Aug 17, 2016
5ca01d0
arm64: dt: OP-TEE for Juno **not for mainline**
jenswi-linaro Mar 29, 2016
a92b7fa
arm64: dt: Add no-map to the reserved-memory node for OP-TEE for foun…
jenswi-linaro Dec 2, 2016
3186541
include/linux/arm-smccc.h: avoid sign extension problem
jenswi-linaro May 24, 2016
bbfaaeb
tee: new ioctl to a register tee_shm from a dmabuf file descriptor
etienne-lms Oct 27, 2016
3b7c6c4
arm64: dt: Add no-map to the reserved-memory node for OP-TEE for juno…
jenswi-linaro Jan 3, 2017
e38b591
arm64: dt: Add OP-TEE firmware to mt8173 **not for mainline**
jbech-linaro Mar 24, 2016
962de97
tee: add tee_param_is_memref() for driver use
jenswi-linaro Dec 23, 2016
4cc5bc1
tee: add TEE_IOCTL_PARAM_ATTR_META
jenswi-linaro Dec 23, 2016
abe2d0c
optee: support asynchronous supplicant requests
jenswi-linaro Dec 23, 2016
e8c8bf8
OP-TEE Benchmark **not for mainline**
Oct 25, 2016
ed6ea82
tee: optee: optee_bench.h: remove useless include **not for mainline**
jforissier May 31, 2017
cef44f4
staging/ion: add Allwinner ION "secure" heap
etienne-lms Aug 14, 2017
60fd760
ion: "unmapped" heap for secure data path
etienne-lms Aug 14, 2017
9a5d477
staging/ion: condition unmapped heap to supported architectures
etienne-lms Sep 8, 2017
b5d85ec
staging/ion: ARM64 supports ION_UNMAPPED_HEAP
etienne-lms Sep 14, 2017
76b0502
[NEW SHM]tee: flexible shared memory pool creation
jenswi-linaro Jul 19, 2017
db3638f
[NEW SHM]tee: add register user memory
jenswi-linaro Oct 20, 2016
3a0188b
[NEW SHM]tee: shm: add accessors for buffer size and page offset
lorc Nov 29, 2016
18156eb
[NEW SHM]tee: shm: add page accessor functions
lorc Apr 5, 2017
68f26e3
[NEW SHM]tee: optee: Update protocol definitions
lorc Jul 20, 2017
0e11802
[NEW SHM]tee: optee: add page list manipulation functions
lorc Jul 20, 2017
91fa8f2
[NEW SHM]tee: optee: add shared buffer registration functions
lorc Jul 21, 2017
8d3d56e
[NEW SHM]tee: optee: add registered shared parameters handling
lorc Jul 21, 2017
76aa312
[NEW SHM]tee: optee: add registered buffers handling into RPC calls
lorc Jul 21, 2017
a7ea6e4
[NEW SHM]tee: optee: store OP-TEE capabilities in private data
lorc Jul 21, 2017
df88368
[NEW SHM]tee: optee: add optee-specific shared pool implementation
lorc Jul 21, 2017
3ca9562
[NEW SHM]tee: optee: enable dynamic SHM support
lorc Jul 21, 2017
8862a5d
[NEW SHM]tee: use reference counting for tee_context
lorc Jul 24, 2017
c7f82a0
[NEW SHM]tee: shm: inline tee_shm getter functions
lorc Aug 25, 2017
7e7a654
optee: remove registered shm argument size check
lorc Oct 9, 2017
6e954e2
staging:ion: add a no-map property to ion dmabuf attachment
etienne-lms Oct 9, 2017
eae92bd
tee: optee: GET_OS_REVISION: document a2 as a build identifier
jforissier Nov 20, 2017
3a701ec
tee: optee: report OP-TEE revision information
jforissier Nov 20, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tee: indicate privileged dev in gen_caps
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 <[email protected]>
Signed-off-by: Jens Wiklander <[email protected]>
jenswi-linaro committed Aug 21, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 87cc807a799935696b7aa7d5a77ce8e24cbbfe06
5 changes: 5 additions & 0 deletions drivers/tee/tee_core.c
Original file line number Diff line number Diff line change
@@ -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;
}

1 change: 1 addition & 0 deletions include/uapi/linux/tee.h
Original file line number Diff line number Diff line change
@@ -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