| Message ID | 20220928074725.2228353-1-etienne.carriere@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tee: optee: discover services dependent on tee-supplicant | expand |
Hello,
For info, this patch currently applies on branch 'next'.
It depends on commit 94ccfb78a4d6 ("drivers: tee: optee: discover
OP-TEE services") not yet merged in 'master'.
br,
etienne
On Wed, 28 Sept 2022 at 09:48, Etienne Carriere
<etienne.carriere@linaro.org> wrote:
>
> This change makes OP-TEE to enumerate both standalone services and
> the services depending on tee-supplicant support in U-Boot. This
> change also drivers for this later to be bind. It is assumed that
> one implementing an OP-TEE device driver has all expected tee-supplicant
> services support in U-Boot.
>
> Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
> ---
> drivers/tee/optee/core.c | 32 +++++++++++++++++++++++---------
> 1 file changed, 23 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
> index 9240277579..7da35f2eda 100644
> --- a/drivers/tee/optee/core.c
> +++ b/drivers/tee/optee/core.c
> @@ -102,13 +102,14 @@ static int bind_service_list(struct udevice *dev, struct tee_shm *service_list,
> return 0;
> }
>
> -static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm_size, u32 tee_sess)
> +static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm_size, u32 tee_sess,
> + unsigned int pta_cmd)
> {
> struct tee_invoke_arg arg = { };
> struct tee_param param = { };
> int ret = 0;
>
> - arg.func = PTA_CMD_GET_DEVICES;
> + arg.func = pta_cmd;
> arg.session = tee_sess;
>
> /* Fill invoke cmd params */
> @@ -118,7 +119,7 @@ static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm
>
> ret = tee_invoke_func(dev, &arg, 1, ¶m);
> if (ret || (arg.ret && arg.ret != TEE_ERROR_SHORT_BUFFER)) {
> - dev_err(dev, "PTA_CMD_GET_DEVICES invoke function err: 0x%x\n", arg.ret);
> + dev_err(dev, "Enumeration command 0x%x failed: 0x%x\n", pta_cmd, arg.ret);
> return -EINVAL;
> }
>
> @@ -127,12 +128,13 @@ static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm
> return 0;
> }
>
> -static int enum_services(struct udevice *dev, struct tee_shm **shm, size_t *count, u32 tee_sess)
> +static int enum_services(struct udevice *dev, struct tee_shm **shm, size_t *count, u32 tee_sess,
> + unsigned int pta_cmd)
> {
> size_t shm_size = 0;
> int ret;
>
> - ret = __enum_services(dev, NULL, &shm_size, tee_sess);
> + ret = __enum_services(dev, NULL, &shm_size, tee_sess, pta_cmd);
> if (ret)
> return ret;
>
> @@ -142,7 +144,7 @@ static int enum_services(struct udevice *dev, struct tee_shm **shm, size_t *coun
> return ret;
> }
>
> - ret = __enum_services(dev, *shm, &shm_size, tee_sess);
> + ret = __enum_services(dev, *shm, &shm_size, tee_sess, pta_cmd);
> if (!ret)
> *count = shm_size / sizeof(struct tee_optee_ta_uuid);
>
> @@ -174,20 +176,32 @@ static int bind_service_drivers(struct udevice *dev)
> struct tee_shm *service_list = NULL;
> size_t service_count;
> u32 tee_sess;
> - int ret;
> + int ret, ret2;
>
> ret = open_enum_session(dev, &tee_sess);
> if (ret)
> return ret;
>
> - ret = enum_services(dev, &service_list, &service_count, tee_sess);
> + ret = enum_services(dev, &service_list, &service_count, tee_sess,
> + PTA_CMD_GET_DEVICES);
> if (!ret)
> ret = bind_service_list(dev, service_list, service_count);
>
> tee_shm_free(service_list);
> +
> + ret2 = enum_services(dev, &service_list, &service_count, tee_sess,
> + PTA_CMD_GET_DEVICES_SUPP);
> + if (!ret2)
> + ret2 = bind_service_list(dev, service_list, service_count);
> +
> + tee_shm_free(service_list);
> +
> tee_close_session(dev, tee_sess);
>
> - return ret;
> + if (ret)
> + return ret;
> +
> + return ret2;
> }
>
> /**
> --
> 2.25.1
>
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 9240277579..7da35f2eda 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -102,13 +102,14 @@ static int bind_service_list(struct udevice *dev, struct tee_shm *service_list, return 0; } -static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm_size, u32 tee_sess) +static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm_size, u32 tee_sess, + unsigned int pta_cmd) { struct tee_invoke_arg arg = { }; struct tee_param param = { }; int ret = 0; - arg.func = PTA_CMD_GET_DEVICES; + arg.func = pta_cmd; arg.session = tee_sess; /* Fill invoke cmd params */ @@ -118,7 +119,7 @@ static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm ret = tee_invoke_func(dev, &arg, 1, ¶m); if (ret || (arg.ret && arg.ret != TEE_ERROR_SHORT_BUFFER)) { - dev_err(dev, "PTA_CMD_GET_DEVICES invoke function err: 0x%x\n", arg.ret); + dev_err(dev, "Enumeration command 0x%x failed: 0x%x\n", pta_cmd, arg.ret); return -EINVAL; } @@ -127,12 +128,13 @@ static int __enum_services(struct udevice *dev, struct tee_shm *shm, size_t *shm return 0; } -static int enum_services(struct udevice *dev, struct tee_shm **shm, size_t *count, u32 tee_sess) +static int enum_services(struct udevice *dev, struct tee_shm **shm, size_t *count, u32 tee_sess, + unsigned int pta_cmd) { size_t shm_size = 0; int ret; - ret = __enum_services(dev, NULL, &shm_size, tee_sess); + ret = __enum_services(dev, NULL, &shm_size, tee_sess, pta_cmd); if (ret) return ret; @@ -142,7 +144,7 @@ static int enum_services(struct udevice *dev, struct tee_shm **shm, size_t *coun return ret; } - ret = __enum_services(dev, *shm, &shm_size, tee_sess); + ret = __enum_services(dev, *shm, &shm_size, tee_sess, pta_cmd); if (!ret) *count = shm_size / sizeof(struct tee_optee_ta_uuid); @@ -174,20 +176,32 @@ static int bind_service_drivers(struct udevice *dev) struct tee_shm *service_list = NULL; size_t service_count; u32 tee_sess; - int ret; + int ret, ret2; ret = open_enum_session(dev, &tee_sess); if (ret) return ret; - ret = enum_services(dev, &service_list, &service_count, tee_sess); + ret = enum_services(dev, &service_list, &service_count, tee_sess, + PTA_CMD_GET_DEVICES); if (!ret) ret = bind_service_list(dev, service_list, service_count); tee_shm_free(service_list); + + ret2 = enum_services(dev, &service_list, &service_count, tee_sess, + PTA_CMD_GET_DEVICES_SUPP); + if (!ret2) + ret2 = bind_service_list(dev, service_list, service_count); + + tee_shm_free(service_list); + tee_close_session(dev, tee_sess); - return ret; + if (ret) + return ret; + + return ret2; } /**
This change makes OP-TEE to enumerate both standalone services and the services depending on tee-supplicant support in U-Boot. This change also drivers for this later to be bind. It is assumed that one implementing an OP-TEE device driver has all expected tee-supplicant services support in U-Boot. Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org> --- drivers/tee/optee/core.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-)