TEE: minor cleanup
Subsystems (2)
v3 cover TEE: minor cleanup
- Address some spelling errors and typos
- Support CMD_OPTEE_RPMB for SANDBOX configurations and add python tests
- Remove common.h inclusion for drivers/tee
- Add calls for closing tee session after every read/write operation.
CI build:
[1] https://dev.azure.com/igoropaniuk/u-boot/_build/results?buildId=28&view=results
Changes in v3:
- Added calls for closing tee session after every read/write operation
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
- Applied R-b and T-b tags
Igor Opaniuk (6):
tee: optee: fix description in Kconfig
tee: sandbox: fix spelling errors
cmd: optee_rpmb: close tee session
cmd: optee_rpmb: build cmd for sandbox
test: py: add optee_rpmb tests
tee: remove common.h inclusion
cmd/Kconfig | 4 +++- cmd/optee_rpmb.c | 23 +++++++++++++++++------ drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/Kconfig | 2 +- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 10 +++++----- drivers/tee/tee-uclass.c | 1 - test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 11 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 test/py/tests/test_optee_rpmb.py
Signature · 1 line
2.34.1
PATCH v3 1/6 tee: optee: fix description in Kconfig
Fix OPTEE_TA_AVB symbol description in Kconfig:
s/"write"rb"/"write_rb"/g
---
(no changes since v2)
Changes in v2:
- Applied R-b tags
drivers/tee/optee/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/tee/optee/Kconfig +1 -1
@@ -19,7 +19,7 @@ config OPTEE_TA_AVB default y help Enables support for the AVB Trusted Application (TA) in OP-TEE. - The TA can support the "avb" subcommands "read_rb", "write"rb" + The TA can support the "avb" subcommands "read_rb", "write_rb" and "is_unlocked". config OPTEE_TA_RPC_TEST
Signature · 1 line
2.34.1
PATCH v3 2/6 tee: sandbox: fix spelling errors
In reply to Igor OpaniukFix spelling errors in comments.
---
(no changes since v2)
Changes in v2:
- Applied R-b tags
drivers/tee/sandbox.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/tee/sandbox.c +4 -4
@@ -14,7 +14,7 @@#include "optee/optee_private.h" /* -* The sandbox tee driver tries to emulate a generic Trusted Exectution +* The sandbox tee driver tries to emulate a generic Trusted Execution * Environment (TEE) with the Trusted Applications (TA) OPTEE_TA_AVB and * OPTEE_TA_RPC_TEST available. */
@@ -23,7 +23,7 @@ static const u32 pstorage_max = 16;/** * struct ta_entry - TA entries * @uuid: UUID of an emulated TA -* @open_session Called when a session is openened to the TA +* @open_session Called when a session is opened to the TA * @invoke_func Called when a function in the TA is to be invoked * * This struct is used to register TAs in this sandbox emulation of a TEE.
@@ -140,8 +140,8 @@ static u32 pta_scp03_invoke_func(struct udevice *dev, u32 func, uint num_params, provisioned = true;/* -* Either way, we asume both operations succeeded and that -* the communication channel has now been stablished +* Either way, we assume both operations succeeded and that +* the communication channel has now been established */ return TEE_SUCCESS ;
Signature · 1 line
2.34.1
PATCH v3 3/6 cmd: optee_rpmb: close tee session
In reply to Igor OpaniukAdd calls for closing tee session after every read/write operation.
---
(no changes since v1)
cmd/optee_rpmb.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
cmd/optee_rpmb.c +17 -6
@@ -87,8 +87,10 @@ static int read_persistent_value(const char *name, rc =tee_shm_alloc (tee, name_size,TEE_SHM_ALLOC , &shm_name); -if (rc) -return -ENOMEM ; +if (rc) { + rc = -ENOMEM ; + goto close_session; + } rc =tee_shm_alloc (tee, buffer_size,TEE_SHM_ALLOC , &shm_buf);
@@ -125,6 +127,9 @@ out:tee_shm_free (shm_buf); free_name:tee_shm_free (shm_name); +close_session: +tee_close_session (tee, session); + tee =NULL ;return rc; }
@@ -139,17 +144,20 @@ static int write_persistent_value(const char *name,struct tee_param param[2 ];size_t name_size =strlen (name) +1 ; +if (!value_size) +return -EINVAL ; +if (!tee) {if (avb_ta_open_session ())return -ENODEV ; } -if (!value_size) -return -EINVAL ; rc =tee_shm_alloc (tee, name_size,TEE_SHM_ALLOC , &shm_name); -if (rc) -return -ENOMEM ; +if (rc) { + rc = -ENOMEM ; + goto close_session; + } rc =tee_shm_alloc (tee, value_size,TEE_SHM_ALLOC , &shm_buf);
@@ -178,6 +186,9 @@ out:tee_shm_free (shm_buf); free_name:tee_shm_free (shm_name); +close_session: +tee_close_session (tee, session); + tee =NULL ;return rc; }
Signature · 1 line
2.34.1
PATCH v3 4/6 cmd: optee_rpmb: build cmd for sandbox
In reply to Igor OpaniukSupport CMD_OPTEE_RPMB for SANDBOX configurations. Test:
$ ./u-boot -d arch/sandbox/dts/test.dtb ... => optee_rpmb write_pvalue test_variable test_value Wrote 11 bytes => optee_rpmb read_pvalue test_variable 11 Read 11 bytes, value = test_value
---
(no changes since v2)
Changes in v2:
- Applied R-b and T-b tags
cmd/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
cmd/Kconfig +3 -1
@@ -1370,7 +1370,9 @@ config CMD_CLONE config CMD_OPTEE_RPMB bool "Enable read/write support on RPMB via OPTEE" - depends on SUPPORT_EMMC_RPMB && OPTEE + depends on (SUPPORT_EMMC_RPMB && OPTEE) || SANDBOX_TEE + default y if SANDBOX_TEE + select OPTEE_TA_AVB if SANDBOX_TEE help Enable the commands for reading, writing persistent named values in the Replay Protection Memory Block partition in eMMC by
Signature · 1 line
2.34.1
PATCH v3 5/6 test: py: add optee_rpmb tests
In reply to Igor OpaniukAdd read/write tests for optee_rpmb cmd.
---
(no changes since v1)
test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 test/py/tests/test_optee_rpmb.py
test/py/tests/test_optee_rpmb.py new file +20 -0
@@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Tests for OP-TEE RPMB read/write support + +""" +This tests optee_rpmb cmd in U-Boot +""" + +import pytest +import u_boot_utils as util + [email protected]('cmd_optee_rpmb') +def test_optee_rpmb_read_write(u_boot_console): + """Test OP-TEE RPMB cmd read/write + """ + response = u_boot_console.run_command('optee_rpmb write_pvalue test_variable test_value') + assert response == 'Wrote 11 bytes' + + response = u_boot_console.run_command('optee_rpmb read_pvalue test_variable 11') + assert response == 'Read 11 bytes, value = test_value'
Signature · 1 line
2.34.1
PATCH v3 6/6 tee: remove common.h inclusion
In reply to Igor OpaniukThe usage of the common.h include file is deprecated [1], and has already been removed from several files.
Get rid of all inclusions in the "drivers/tee" directory, and replace it with required include files directly where needed.
[1] doc/develop/codingstyle.rst
---
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 1 - 7 files changed, 4 insertions(+), 7 deletions(-)
drivers/tee/broadcom/chimp_optee.c +2 -1
@@ -3,9 +3,10 @@* Copyright 2020 Broadcom. */ -#include <common.h> #include <tee.h> #include <broadcom/chimp.h> +#include <linux/errno.h> +#include <string.h> #ifdef CONFIG_CHIMP_OPTEE
drivers/tee/optee/core.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2018-2020 Linaro Limited */ -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <dm/device_compat.h>
drivers/tee/optee/i2c.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2020 Foundries.io Ltd */ -#include <common.h> #include <dm.h> #include <i2c.h> #include <tee.h>
drivers/tee/optee/rpmb.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2018 Linaro Limited */ -#include <common.h> #include <dm.h> #include <log.h> #include <tee.h>
drivers/tee/optee/supplicant.c +1 -1
@@ -3,10 +3,10 @@* Copyright (c) 2018, Linaro Limited */ -#include <common.h> #include <log.h> #include <malloc.h> #include <tee.h> +#include <linux/errno.h> #include <linux/types.h> #include "optee_msg.h"
drivers/tee/sandbox.c +1 -1
@@ -2,7 +2,7 @@/* * Copyright (C) 2018 Linaro Limited */ -#include <common.h> +#include <dm.h> #include <sandboxtee.h> #include <tee.h>
drivers/tee/tee-uclass.c +0 -1
@@ -5,7 +5,6 @@#define LOG_CATEGORY UCLASS_TEE -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <log.h>
Signature · 1 line
2.34.1
Re: [PATCH v3 6/6] tee: remove common.h inclusion
Quoted 6 lines · Igor Opaniuk
The usage of the
common.hinclude file is deprecated [1], and has already been removed from several files.
Get rid of all inclusions in the "drivers/tee" directory, and replace it with required include files directly where needed.
Quoted 7 lines
[1]
doc/develop/codingstyle.rstSigned-off-by Igor Opaniuk <[email protected]>---
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
Ci is happy now
Quoted 106 lines
drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 1 - 7 files changed, 4 insertions(+), 7 deletions(-)drivers/tee/broadcom/chimp_optee.c +2
-1@@ -3,9 +3,10 @@* Copyright 2020 Broadcom. */ -#include <common.h> #include <tee.h> #include <broadcom/chimp.h> +#include <linux/errno.h> +#include <string.h> #ifdef CONFIG_CHIMP_OPTEE drivers/tee/optee/core.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2018-2020 Linaro Limited */ -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <dm/device_compat.h> drivers/tee/optee/i2c.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2020 Foundries.io Ltd */ -#include <common.h> #include <dm.h> #include <i2c.h> #include <tee.h> drivers/tee/optee/rpmb.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2018 Linaro Limited */ -#include <common.h> #include <dm.h> #include <log.h> #include <tee.h> drivers/tee/optee/supplicant.c +1
-1@@ -3,10 +3,10 @@* Copyright (c) 2018, Linaro Limited */ -#include <common.h> #include <log.h> #include <malloc.h> #include <tee.h> +#include <linux/errno.h> #include <linux/types.h> #include "optee_msg.h" drivers/tee/sandbox.c +1
-1@@ -2,7 +2,7 @@/* * Copyright (C) 2018 Linaro Limited */ -#include <common.h> +#include <dm.h> #include <sandboxtee.h> #include <tee.h> drivers/tee/tee-uclass.c +0
-2@@ -5,7 +5,6 @@#define LOG_CATEGORY UCLASS_TEE -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <log.h> --2.34.1
Re: [PATCH v3 6/6] tee: remove common.h inclusion
In reply to Igor OpaniukQuoted 10 lines · Igor Opaniuk
The usage of the
common.hinclude file is deprecated [1], and has already been removed from several files.
Get rid of all inclusions in the "drivers/tee" directory, and replace it with required include files directly where needed.[1]
doc/develop/codingstyle.rstSigned-off-by Igor Opaniuk <[email protected]>---
Quoted 109 lines
Changes in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 2 +- drivers/tee/tee-uclass.c | 1 - 7 files changed, 4 insertions(+), 7 deletions(-)drivers/tee/broadcom/chimp_optee.c +2
-1@@ -3,9 +3,10 @@* Copyright 2020 Broadcom. */ -#include <common.h> #include <tee.h> #include <broadcom/chimp.h> +#include <linux/errno.h> +#include <string.h> #ifdef CONFIG_CHIMP_OPTEE drivers/tee/optee/core.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2018-2020 Linaro Limited */ -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <dm/device_compat.h> drivers/tee/optee/i2c.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2020 Foundries.io Ltd */ -#include <common.h> #include <dm.h> #include <i2c.h> #include <tee.h> drivers/tee/optee/rpmb.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2018 Linaro Limited */ -#include <common.h> #include <dm.h> #include <log.h> #include <tee.h> drivers/tee/optee/supplicant.c +1
-1@@ -3,10 +3,10 @@* Copyright (c) 2018, Linaro Limited */ -#include <common.h> #include <log.h> #include <malloc.h> #include <tee.h> +#include <linux/errno.h> #include <linux/types.h> #include "optee_msg.h" drivers/tee/sandbox.c +1
-1@@ -2,7 +2,7 @@/* * Copyright (C) 2018 Linaro Limited */ -#include <common.h> +#include <dm.h> #include <sandboxtee.h> #include <tee.h> drivers/tee/tee-uclass.c +0
-2@@ -5,7 +5,6 @@#define LOG_CATEGORY UCLASS_TEE -#include <common.h> #include <cpu_func.h> #include <dm.h> #include <log.h> --2.34.1
Ilias,
Quoted 39 lines · Igor Opaniuk
- Address some spelling errors and typos
- SupportCMD_OPTEE_RPMBfor SANDBOX configurations and add python tests
- Removecommon.hinclusion fordrivers/tee
- Add calls for closing tee session after every read/write operation.CI build:
[1]
https://dev.azure.com/igoropaniuk/u-boot/_build/results?buildId=28&view=resultsChanges in v3:
- Added calls for closing tee session after every read/write operationChanges in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
- Applied R-b and T-b tagsIgor Opaniuk (6):
tee: optee: fix description inKconfig
tee: sandbox: fix spelling errors
cmd:optee_rpmb: close tee session
cmd:optee_rpmb: build cmd for sandbox
test: py: addoptee_rpmbtests
tee: removecommon.hinclusioncmd/Kconfig | 4 +++- cmd/optee_rpmb.c | 23 +++++++++++++++++------ drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/Kconfig | 2 +- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 10 +++++----- drivers/tee/tee-uclass.c | 1 - test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 11 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 test/py/tests/test_optee_rpmb.py
Quoted 4 lines
--
2.34.1
Are there currently any comments/objections that can prevent these cosmetic changes from being applied? CI is happy now and all tests are passing successfully.
If there are any - just let me know, thanks
Regards,
Igor
Signature · 7 lines
Best regards - Atentamente - Meilleures salutations Igor Opaniuk mailto: [email protected] skype: igor.opanyuk https://www.linkedin.com/in/iopaniuk <http://ua.linkedin.com/in/iopaniuk>
Hi Igor,
Quoted 42 lines · Igor Opaniuk
Ilias,
Quoted 38 lines · Igor Opaniuk
- Address some spelling errors and typos
- SupportCMD_OPTEE_RPMBfor SANDBOX configurations and add python tests
- Removecommon.hinclusion fordrivers/tee
- Add calls for closing tee session after every read/write operation.CI build:
[1] https://dev.azure.com/igoropaniuk/u-boot/_build/results?buildId=28&view=resultsChanges in v3:
- Added calls for closing tee session after every read/write operationChanges in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
- Applied R-b and T-b tagsIgor Opaniuk (6):
tee: optee: fix description inKconfig
tee: sandbox: fix spelling errors
cmd:optee_rpmb: close tee session
cmd:optee_rpmb: build cmd for sandbox
test: py: addoptee_rpmbtests
tee: removecommon.hinclusioncmd/Kconfig | 4 +++- cmd/optee_rpmb.c | 23 +++++++++++++++++------ drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/Kconfig | 2 +- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 10 +++++----- drivers/tee/tee-uclass.c | 1 - test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 11 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 test/py/tests/test_optee_rpmb.py
Quoted 8 lines
Quoted 3 lines
--
2.34.1Are there currently any comments/objections that can prevent these cosmetic changes from being applied? CI is happy now and all tests are passing successfully.
If there are any - just let me know, thanks
IIRC I did run this version on the CI and everything looked fine. I'll send a PR to Tom with it -- apologies for the delay
Regards
/Ilias
Quoted 12 lines
Regards,
Igor--
Best regards - Atentamente - Meilleures salutationsIgor Opaniuk
mailto: [email protected]
skype: igor.opanyuk
https://www.linkedin.com/in/iopaniuk
Hi Igor,
I tried to apply this to master and send a PR, but unfortunately it needs rebasing. Can you rebase it and resend it?
Thanks
/Ilias
Quoted 71 lines · Ilias Apalodimas
Hi Igor,
Quoted 42 lines · Igor Opaniuk
Ilias,
Quoted 38 lines · Igor Opaniuk
- Address some spelling errors and typos
- SupportCMD_OPTEE_RPMBfor SANDBOX configurations and add python tests
- Removecommon.hinclusion fordrivers/tee
- Add calls for closing tee session after every read/write operation.CI build:
[1] https://dev.azure.com/igoropaniuk/u-boot/_build/results?buildId=28&view=resultsChanges in v3:
- Added calls for closing tee session after every read/write operationChanges in v2:
- Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'
- Applied R-b and T-b tagsIgor Opaniuk (6):
tee: optee: fix description inKconfig
tee: sandbox: fix spelling errors
cmd:optee_rpmb: close tee session
cmd:optee_rpmb: build cmd for sandbox
test: py: addoptee_rpmbtests
tee: removecommon.hinclusioncmd/Kconfig | 4 +++- cmd/optee_rpmb.c | 23 +++++++++++++++++------ drivers/tee/broadcom/chimp_optee.c | 3 ++- drivers/tee/optee/Kconfig | 2 +- drivers/tee/optee/core.c | 1 - drivers/tee/optee/i2c.c | 1 - drivers/tee/optee/rpmb.c | 1 - drivers/tee/optee/supplicant.c | 2 +- drivers/tee/sandbox.c | 10 +++++----- drivers/tee/tee-uclass.c | 1 - test/py/tests/test_optee_rpmb.py | 20 ++++++++++++++++++++ 11 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 test/py/tests/test_optee_rpmb.pyQuoted 8 lines
Quoted 3 lines
--
2.34.1Are there currently any comments/objections that can prevent these cosmetic changes from being applied? CI is happy now and all tests are passing successfully.
If there are any - just let me know, thanks
IIRC I did run this version on the CI and everything looked fine. I'll send a PR to Tom with it -- apologies for the delay
Regards
/IliasQuoted 12 lines
Regards,
Igor--
Best regards - Atentamente - Meilleures salutationsIgor Opaniuk
mailto: [email protected]
skype: igor.opanyuk
https://www.linkedin.com/in/iopaniuk