lkml.org 
[lkml]   [2021]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v5 5/5] optee: add FF-A support
On Tue, Aug 31, 2021 at 09:24:12AM +0200, Jens Wiklander wrote:
> Adds support for using FF-A [1] as transport to the OP-TEE driver.
>
> Introduces struct optee_msg_param_fmem which carries all information
> needed when OP-TEE is calling FFA_MEM_RETRIEVE_REQ to get the shared
> memory reference mapped by the hypervisor in S-EL2. Register usage is
> also updated to include the information needed.
>
> The FF-A part of this driver is enabled if CONFIG_ARM_FFA_TRANSPORT is
> enabled.
>
> [1] https://developer.arm.com/documentation/den0077/latest
> Acked-by: Sumit Garg <sumit.garg@linaro.org>
> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> ---
> drivers/tee/optee/Makefile | 3 +-
> drivers/tee/optee/call.c | 13 +-
> drivers/tee/optee/core.c | 16 +-
> drivers/tee/optee/ffa_abi.c | 907 ++++++++++++++++++++++++++++++
> drivers/tee/optee/optee_ffa.h | 153 +++++
> drivers/tee/optee/optee_msg.h | 27 +-
> drivers/tee/optee/optee_private.h | 43 +-
> 7 files changed, 1148 insertions(+), 14 deletions(-)
> create mode 100644 drivers/tee/optee/ffa_abi.c
> create mode 100644 drivers/tee/optee/optee_ffa.h
>
> diff --git a/drivers/tee/optee/Makefile b/drivers/tee/optee/Makefile
> index d4e4776d2dec..dbfd83d3c4ae 100644
> --- a/drivers/tee/optee/Makefile
> +++ b/drivers/tee/optee/Makefile
> @@ -7,7 +7,8 @@ optee-objs += supp.o
> optee-objs += device.o
>
> optee-smc-abi-y = smc_abi.o
> -optee-objs += $(optee-smc-abi-y)
> +optee-ffa-abi-$(CONFIG_ARM_FFA_TRANSPORT) = ffa_abi.o
> +optee-objs += $(optee-smc-abi-y) $(optee-ffa-abi-y)
>

This may not work when CONFIG_ARM_FFA_TRANSPORT=m, I don't have cleaner
solution apart from having if else.


[...]

> diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h
> index ca0213e330b5..2593742364da 100644
> --- a/drivers/tee/optee/optee_private.h
> +++ b/drivers/tee/optee/optee_private.h

[...]

> @@ -116,11 +127,13 @@ struct optee_ops {
> * world
> * @teedev: client device
> * @smc: specific to SMC ABI
> + * @ffa: specific to FF-A ABI
> * @call_queue: queue of threads waiting to call @invoke_fn
> * @wait_queue: queue of threads from secure world waiting for a
> * secure world sync object
> * @supp: supplicant synchronization struct for RPC to supplicant
> * @pool: shared memory pool
> + * @rpc_arg_count: If > 0 number of RPC parameters to make room for
> * @scan_bus_done flag if device registation was already done.
> * @scan_bus_wq workqueue to scan optee bus and register optee drivers
> * @scan_bus_work workq to scan optee bus and register optee drivers
> @@ -129,11 +142,17 @@ struct optee {
> struct tee_device *supp_teedev;
> struct tee_device *teedev;
> const struct optee_ops *ops;
> - struct optee_smc smc;
> + union {
> + struct optee_smc smc;
> +#ifdef CONFIG_ARM_FFA_TRANSPORT

I don't see a point in saving this especially that the definition is
available always. Also helps the case when FFA is module.

> + struct optee_ffa ffa;
> +#endif
> + };
> struct optee_call_queue call_queue;
> struct optee_wait_queue wait_queue;
> struct optee_supp supp;
> struct tee_shm_pool *pool;
> + unsigned int rpc_arg_count;
> bool scan_bus_done;
> struct workqueue_struct *scan_bus_wq;
> struct work_struct scan_bus_work;
> @@ -266,4 +285,12 @@ static inline void reg_pair_from_64(u32 *reg0, u32 *reg1, u64 val)
> int optee_smc_abi_register(void);
> void optee_smc_abi_unregister(void);
>
> +#ifdef CONFIG_ARM_FFA_TRANSPORT

To support CONFIG_ARM_FFA_TRANSPORT=m this must be,

#if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)

--
Regards,
Sudeep

\
 
 \ /
  Last update: 2021-10-01 11:36    [W:0.059 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site