[PATCH v3 0/2] cmd: Add support for optee commands.

Add the basic 'hello world ta' command which increments the value passed. This provides easy test for establishing a session with OP-TEE TA and verify.
It includes following subcommands: optee hello optee hello <value>; value to increment via OP-TEE HELLO WORLD TA.
Changes in v2: - Added command "optee" and subdommand "hello". - Update the man-page in doc/usage/cmd/optee.rst Changes in v3: - Rename the config from OPTEE_HELLO_WORLD_TA to CMD_OPTEE. - Rename the file from optee_hello_world_ta.c to optee.c - Add the hextoul from dectoul.
Venkatesh Yadav Abbarapu (2): cmd: Add support for optee commands doc: man-page for optee commands
cmd/Kconfig | 6 +++ cmd/Makefile | 1 + cmd/optee.c | 93 +++++++++++++++++++++++++++++++++++++++++ doc/usage/cmd/optee.rst | 66 +++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 5 files changed, 167 insertions(+) create mode 100644 cmd/optee.c create mode 100644 doc/usage/cmd/optee.rst

Add the basic 'hello world ta' command which increment of the value passed. This provides easy test for establishing a session with OP-TEE TA and verify.
It includes following "hello world ta" subcommands: optee hello; default value '0' is passed and gets incremented. optee hello <value>; value to increment via OP-TEE HELLO WORLD TA.
To enable the OP-TEE side HELLO WORLD example please refer https://optee.readthedocs.io/en/latest/building/gits/optee_examples/optee_ex...
Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- cmd/Kconfig | 6 ++++ cmd/Makefile | 1 + cmd/optee.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 cmd/optee.c
diff --git a/cmd/Kconfig b/cmd/Kconfig index 1d7ddb4ed36..4b33468891e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1446,6 +1446,12 @@ config CMD_OPTEE_RPMB in the Replay Protection Memory Block partition in eMMC by using Persistent Objects in OPTEE
+config CMD_OPTEE + bool "Enable OP-TEE commands" + depends on OPTEE + help + OP-TEE commands support. + config CMD_MTD bool "mtd" depends on MTD diff --git a/cmd/Makefile b/cmd/Makefile index d1f369deec0..533d0f6a1be 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -118,6 +118,7 @@ obj-$(CONFIG_CMD_PAUSE) += pause.o obj-$(CONFIG_CMD_SLEEP) += sleep.o obj-$(CONFIG_CMD_MMC) += mmc.o obj-$(CONFIG_CMD_OPTEE_RPMB) += optee_rpmb.o +obj-$(CONFIG_CMD_OPTEE) += optee.o obj-$(CONFIG_CMD_MP) += mp.o obj-$(CONFIG_CMD_MTD) += mtd.o obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o diff --git a/cmd/optee.c b/cmd/optee.c new file mode 100644 index 00000000000..618a2f8490e --- /dev/null +++ b/cmd/optee.c @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2024, Advanced Micro Devices, Inc. + */ +#include <command.h> +#include <errno.h> +#include <tee.h> +#include <vsprintf.h> + +static struct udevice *tee; +static u32 session; + +#define TA_HELLO_WORLD_CMD_INC_VALUE 0 +/* This needs to match the UUID of the Hello World TA. */ +#define TA_HELLO_WORLD_UUID \ + { 0x8aaaf200, 0x2450, 0x11e4, \ + { 0xab, 0xe2, 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b} } + +static int hello_world_ta_open_session(void) +{ + const struct tee_optee_ta_uuid uuid = TA_HELLO_WORLD_UUID; + struct tee_open_session_arg arg; + int rc; + + tee = tee_find_device(tee, NULL, NULL, NULL); + if (!tee) + return -ENODEV; + + memset(&arg, 0, sizeof(arg)); + tee_optee_ta_uuid_to_octets(arg.uuid, &uuid); + rc = tee_open_session(tee, &arg, 0, NULL); + if (rc != 0) + session = arg.session; + + return rc; +} + +static int hello_world_ta(unsigned int value) +{ + struct tee_param param[2]; + struct tee_invoke_arg arg; + int status = -EACCES; + + printf("The Hello World TA is going to be called\n"); + + status = hello_world_ta_open_session(); + if (status) { + printf("hello_world_ta_open_session failed(%d)", status); + return status; + } + + arg.func = TA_HELLO_WORLD_CMD_INC_VALUE; + arg.session = session; + + param[0].attr = TEE_PARAM_ATTR_TYPE_VALUE_INOUT; + param[0].u.value.a = value; + + printf("TA value: 0x%x\n", (int)param[0].u.value.a); + + tee_invoke_func(tee, &arg, 1, param); + + printf("TA value: 0x%x\n", (int)param[0].u.value.a); + + return tee_close_session(tee, session); +} + +static int do_optee_hello_world_ta(struct cmd_tbl *cmdtp, int flag, int argc, + char * const argv[]) +{ + int ret; + int value = 0; + + if (strcmp(argv[1], NULL)) + value = hextoul(argv[1], NULL); + + ret = hello_world_ta(value); + if (ret) + return CMD_RET_FAILURE; + + return CMD_RET_SUCCESS; +} + +U_BOOT_LONGHELP(optee, + "- commands can be verified on OP-TEE\n\n" + "optee hello\n" + "optee hello <value>\n" + "\n" + "With:\n" + "\t<value>: integer value\n" + ); + +U_BOOT_CMD_WITH_SUBCMDS(optee, "OP-TEE commands", optee_help_text, + U_BOOT_SUBCMD_MKENT(hello, 2, 1, do_optee_hello_world_ta));

On 12/16/24 10:29, Venkatesh Yadav Abbarapu wrote:
Add the basic 'hello world ta' command which increment of the value passed. This provides easy test for establishing a session with OP-TEE TA and verify.
It includes following "hello world ta" subcommands: optee hello; default value '0' is passed and gets incremented. optee hello <value>; value to increment via OP-TEE HELLO WORLD TA.
To enable the OP-TEE side HELLO WORLD example please refer https://optee.readthedocs.io/en/latest/building/gits/optee_examples/optee_ex...
Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com
cmd/Kconfig | 6 ++++ cmd/Makefile | 1 + cmd/optee.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+) create mode 100644 cmd/optee.c
diff --git a/cmd/Kconfig b/cmd/Kconfig index 1d7ddb4ed36..4b33468891e 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1446,6 +1446,12 @@ config CMD_OPTEE_RPMB in the Replay Protection Memory Block partition in eMMC by using Persistent Objects in OPTEE
+config CMD_OPTEE
- bool "Enable OP-TEE commands"
- depends on OPTEE
- help
OP-TEE commands support.
- config CMD_MTD bool "mtd" depends on MTD
diff --git a/cmd/Makefile b/cmd/Makefile index d1f369deec0..533d0f6a1be 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -118,6 +118,7 @@ obj-$(CONFIG_CMD_PAUSE) += pause.o obj-$(CONFIG_CMD_SLEEP) += sleep.o obj-$(CONFIG_CMD_MMC) += mmc.o obj-$(CONFIG_CMD_OPTEE_RPMB) += optee_rpmb.o +obj-$(CONFIG_CMD_OPTEE) += optee.o obj-$(CONFIG_CMD_MP) += mp.o obj-$(CONFIG_CMD_MTD) += mtd.o obj-$(CONFIG_CMD_MTDPARTS) += mtdparts.o diff --git a/cmd/optee.c b/cmd/optee.c new file mode 100644 index 00000000000..618a2f8490e --- /dev/null +++ b/cmd/optee.c @@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0 +/*
- (C) Copyright 2024, Advanced Micro Devices, Inc.
- */
+#include <command.h> +#include <errno.h> +#include <tee.h> +#include <vsprintf.h>
+static struct udevice *tee; +static u32 session;
Can you please also get rid of these? Just pass them via parameters.
+#define TA_HELLO_WORLD_CMD_INC_VALUE 0 +/* This needs to match the UUID of the Hello World TA. */ +#define TA_HELLO_WORLD_UUID \
- { 0x8aaaf200, 0x2450, 0x11e4, \
- { 0xab, 0xe2, 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b} }
+static int hello_world_ta_open_session(void) +{
- const struct tee_optee_ta_uuid uuid = TA_HELLO_WORLD_UUID;
- struct tee_open_session_arg arg;
- int rc;
- tee = tee_find_device(tee, NULL, NULL, NULL);
- if (!tee)
return -ENODEV;
- memset(&arg, 0, sizeof(arg));
- tee_optee_ta_uuid_to_octets(arg.uuid, &uuid);
- rc = tee_open_session(tee, &arg, 0, NULL);
- if (rc != 0)
session = arg.session;
- return rc;
+}
Maybe I would even consider to move content of this function directly to code below. It will make example more compact and you don't need to use that static variables.
M
+static int hello_world_ta(unsigned int value) +{
- struct tee_param param[2];
- struct tee_invoke_arg arg;
- int status = -EACCES;
- printf("The Hello World TA is going to be called\n");
- status = hello_world_ta_open_session();
- if (status) {
printf("hello_world_ta_open_session failed(%d)", status);
return status;
- }
- arg.func = TA_HELLO_WORLD_CMD_INC_VALUE;
- arg.session = session;
- param[0].attr = TEE_PARAM_ATTR_TYPE_VALUE_INOUT;
- param[0].u.value.a = value;
- printf("TA value: 0x%x\n", (int)param[0].u.value.a);
Don't you want to remove this line completely.
- tee_invoke_func(tee, &arg, 1, param);
- printf("TA value: 0x%x\n", (int)param[0].u.value.a);
And here just print directly origin "value" and then new one via one print.
- return tee_close_session(tee, session);
+}
+static int do_optee_hello_world_ta(struct cmd_tbl *cmdtp, int flag, int argc,
char * const argv[])
+{
- int ret;
- int value = 0;
swap these two or put them on the same line.
- if (strcmp(argv[1], NULL))
value = hextoul(argv[1], NULL);
- ret = hello_world_ta(value);
- if (ret)
return CMD_RET_FAILURE;
- return CMD_RET_SUCCESS;
+}
+U_BOOT_LONGHELP(optee,
"- commands can be verified on OP-TEE\n\n"
"optee hello\n"
"optee hello <value>\n"
"\n"
"With:\n"
"\t<value>: integer value\n"
);
+U_BOOT_CMD_WITH_SUBCMDS(optee, "OP-TEE commands", optee_help_text,
U_BOOT_SUBCMD_MKENT(hello, 2, 1, do_optee_hello_world_ta));
M

Provide a man-page for the optee command.
Signed-off-by: Venkatesh Yadav Abbarapu venkatesh.abbarapu@amd.com --- doc/usage/cmd/optee.rst | 66 +++++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 67 insertions(+) create mode 100644 doc/usage/cmd/optee.rst
diff --git a/doc/usage/cmd/optee.rst b/doc/usage/cmd/optee.rst new file mode 100644 index 00000000000..53e36853742 --- /dev/null +++ b/doc/usage/cmd/optee.rst @@ -0,0 +1,66 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +.. index:: + single: optee (command) + +optee command +============= + +Synopsis +-------- + +:: + + optee hello + optee hello <value> + +Description +----------- + +This is a very simple optee hello command which is going to +increment an integer value. + +value + value to be passed which is going to increment + +To enable the OP-TEE OS side HELLO WORLD example please refer +https://optee.readthedocs.io/en/latest/building/gits/optee_examples/optee_ex... + +Examples +-------- + +:: + + ==> optee hello + The Hello World TA is going to be called + D/TA: TA_CreateEntryPoint:39 has been called + I/TA: Hello World! + TA value: 0x0 + D/TA: inc_value:105 has been called + I/TA: Got value: 0 from NW + I/TA: Increase value to: 1 + TA value: 0x1 + I/TA: Goodbye! + D/TA: TA_DestroyEntryPoint:50 has been called + + ===> optee hello 74 + The Hello World TA is going to be called + D/TA: TA_CreateEntryPoint:39 has been called + I/TA: Hello World! + TA value: 0x74 + D/TA: inc_value:105 has been called + I/TA: Got value: 116 from NW + I/TA: Increase value to: 117 + TA value: 0x75 + I/TA: Goodbye! + D/TA: TA_DestroyEntryPoint:50 has been called + +Configuration +------------- + +The optee command is enabled by CONFIG_OPTEE=y and CONFIG_CMD_OPTEE=y. + +Return value +------------ + +The return value $? is 0 (true) if the command succeeds, 1 (false) otherwise. diff --git a/doc/usage/index.rst b/doc/usage/index.rst index cb7a23f1170..4dd00f002cd 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -92,6 +92,7 @@ Shell commands cmd/msr cmd/mtest cmd/mtrr + cmd/optee cmd/panic cmd/part cmd/pause
participants (2)
-
Michal Simek
-
Venkatesh Yadav Abbarapu