Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fecf08c authored Nov 29, 2017 by Volodymyr Babchuk Committed by Victor Chong Feb 21, 2018

BACKPORT: tee: optee: store OP-TEE capabilities in private data



Those capabilities will be used in subsequent patches.

Change-Id: I296269714687d346c7beaf30fa400d74c81e717a
Signed-off-by: Volodymyr Babchuk <vlad.babchuk@gmail.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit d885cc5e0759fc19badadddb60a64344b551469b)
Signed-off-by: Victor Chong <victor.chong@linaro.org>

parent ca453513

drivers/tee/optee/core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -542,6 +542,7 @@ static struct optee optee_probe(struct device_node np)
		}

		optee->invoke_fn = invoke_fn;
		optee->sec_caps = sec_caps;

		teedev = tee_device_alloc(&optee_desc, NULL, pool, optee);
		if (IS_ERR(teedev)) {

drivers/tee/optee/optee_private.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,8 @@ struct optee_supp {
		* @supp: supplicant synchronization struct for RPC to supplicant
		* @pool: shared memory pool
		* @memremaped_shm virtual address of memory in shared memory pool
		* @sec_caps: secure world capabilities defined by
		* OPTEE_SMC_SEC_CAP_* in optee_smc.h
		*/
		struct optee {
		struct tee_device *supp_teedev;
		@@ -94,6 +96,7 @@ struct optee {
		struct optee_supp supp;
		struct tee_shm_pool *pool;
		void *memremaped_shm;
		u32 sec_caps;
		};

		struct optee_session {