public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [PATCH v3 0/6] TEE: minor cleanup
@ 2024-03-04 17:44 Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 1/6] tee: optee: fix description in Kconfig Igor Opaniuk
                   ` (6 more replies)
  0 siblings, 7 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot
  Cc: Igor Opaniuk, AKASHI Takahiro, Abdellatif El Khlifi, Bin Meng,
	Etienne Carriere, Francis Laniel, Heinrich Schuchardt,
	Ilias Apalodimas, Jens Wiklander, Jorge Ramirez-Ortiz,
	Mattijs Korpershoek, Miquel Raynal, Patrice Chotard, Roger Knecht,
	Sean Edmond, Simon Glass, Tom Rini

- 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

-- 
2.34.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v3 1/6] tee: optee: fix description in Kconfig
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
@ 2024-03-04 17:44 ` Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 2/6] tee: sandbox: fix spelling errors Igor Opaniuk
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot
  Cc: Igor Opaniuk, Heinrich Schuchardt, Ilias Apalodimas,
	Jens Wiklander, Tom Rini

Fix OPTEE_TA_AVB symbol description in Kconfig:
s/"write"rb"/"write_rb"/g

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

(no changes since v2)

Changes in v2:
- Applied R-b tags

 drivers/tee/optee/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tee/optee/Kconfig b/drivers/tee/optee/Kconfig
index 9dc65b0501e..db0bcfa6f15 100644
--- a/drivers/tee/optee/Kconfig
+++ b/drivers/tee/optee/Kconfig
@@ -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
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 2/6] tee: sandbox: fix spelling errors
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 1/6] tee: optee: fix description in Kconfig Igor Opaniuk
@ 2024-03-04 17:44 ` Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 3/6] cmd: optee_rpmb: close tee session Igor Opaniuk
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot
  Cc: Igor Opaniuk, Heinrich Schuchardt, Ilias Apalodimas,
	Jens Wiklander, Jorge Ramirez-Ortiz, Simon Glass, Tom Rini

Fix spelling errors in comments.

Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

(no changes since v2)

Changes in v2:
- Applied R-b tags

 drivers/tee/sandbox.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index 86219a9bb1a..ec66401878c 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -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;
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 3/6] cmd: optee_rpmb: close tee session
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 1/6] tee: optee: fix description in Kconfig Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 2/6] tee: sandbox: fix spelling errors Igor Opaniuk
@ 2024-03-04 17:44 ` Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 4/6] cmd: optee_rpmb: build cmd for sandbox Igor Opaniuk
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot; +Cc: Igor Opaniuk, Tom Rini

Add calls for closing tee session after every read/write operation.

Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

(no changes since v1)

 cmd/optee_rpmb.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/cmd/optee_rpmb.c b/cmd/optee_rpmb.c
index e0e44bbed04..b3cafd92410 100644
--- a/cmd/optee_rpmb.c
+++ b/cmd/optee_rpmb.c
@@ -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;
 }
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 4/6] cmd: optee_rpmb: build cmd for sandbox
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
                   ` (2 preceding siblings ...)
  2024-03-04 17:44 ` [PATCH v3 3/6] cmd: optee_rpmb: close tee session Igor Opaniuk
@ 2024-03-04 17:44 ` Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 5/6] test: py: add optee_rpmb tests Igor Opaniuk
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot
  Cc: Igor Opaniuk, Mattijs Korpershoek, AKASHI Takahiro,
	Abdellatif El Khlifi, Bin Meng, Francis Laniel,
	Heinrich Schuchardt, Miquel Raynal, Roger Knecht, Sean Edmond,
	Simon Glass, Tom Rini

Support 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

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

(no changes since v2)

Changes in v2:
- Applied R-b and T-b tags

 cmd/Kconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index a86b5705174..8ad8c0c542c 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -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
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 5/6] test: py: add optee_rpmb tests
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
                   ` (3 preceding siblings ...)
  2024-03-04 17:44 ` [PATCH v3 4/6] cmd: optee_rpmb: build cmd for sandbox Igor Opaniuk
@ 2024-03-04 17:44 ` Igor Opaniuk
  2024-03-04 17:44 ` [PATCH v3 6/6] tee: remove common.h inclusion Igor Opaniuk
  2024-03-27 12:13 ` [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
  6 siblings, 0 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot; +Cc: Igor Opaniuk, Tom Rini

Add read/write tests for optee_rpmb cmd.

Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

(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

diff --git a/test/py/tests/test_optee_rpmb.py b/test/py/tests/test_optee_rpmb.py
new file mode 100644
index 00000000000..8a081b5c494
--- /dev/null
+++ b/test/py/tests/test_optee_rpmb.py
@@ -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
+
+@pytest.mark.buildconfigspec('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'
\ No newline at end of file
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 6/6] tee: remove common.h inclusion
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
                   ` (4 preceding siblings ...)
  2024-03-04 17:44 ` [PATCH v3 5/6] test: py: add optee_rpmb tests Igor Opaniuk
@ 2024-03-04 17:44 ` Igor Opaniuk
  2024-03-08 13:27   ` Ilias Apalodimas
  2024-03-08 18:08   ` Sam Protsenko
  2024-03-27 12:13 ` [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
  6 siblings, 2 replies; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-04 17:44 UTC (permalink / raw)
  To: u-boot
  Cc: Igor Opaniuk, Etienne Carriere, Heinrich Schuchardt,
	Ilias Apalodimas, Jens Wiklander, Jorge Ramirez-Ortiz,
	Patrice Chotard, Simon Glass, Tom Rini

The 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

Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
---

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(-)

diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
index 37f9b094f76..bd146ef2899 100644
--- a/drivers/tee/broadcom/chimp_optee.c
+++ b/drivers/tee/broadcom/chimp_optee.c
@@ -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
 
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index 47f845cffe3..5fc0505c788 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -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>
diff --git a/drivers/tee/optee/i2c.c b/drivers/tee/optee/i2c.c
index ef4e10f9912..e3fb99897c5 100644
--- a/drivers/tee/optee/i2c.c
+++ b/drivers/tee/optee/i2c.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2020 Foundries.io Ltd
  */
 
-#include <common.h>
 #include <dm.h>
 #include <i2c.h>
 #include <tee.h>
diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
index 5bc13757ea8..bacced6af6c 100644
--- a/drivers/tee/optee/rpmb.c
+++ b/drivers/tee/optee/rpmb.c
@@ -3,7 +3,6 @@
  * Copyright (c) 2018 Linaro Limited
  */
 
-#include <common.h>
 #include <dm.h>
 #include <log.h>
 #include <tee.h>
diff --git a/drivers/tee/optee/supplicant.c b/drivers/tee/optee/supplicant.c
index f9dd874b594..8a426f53ba8 100644
--- a/drivers/tee/optee/supplicant.c
+++ b/drivers/tee/optee/supplicant.c
@@ -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"
diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
index ec66401878c..8ad7c09efdd 100644
--- a/drivers/tee/sandbox.c
+++ b/drivers/tee/sandbox.c
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2018 Linaro Limited
  */
-#include <common.h>
+
 #include <dm.h>
 #include <sandboxtee.h>
 #include <tee.h>
diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
index 52412a4098e..0194d732193 100644
--- a/drivers/tee/tee-uclass.c
+++ b/drivers/tee/tee-uclass.c
@@ -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


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 6/6] tee: remove common.h inclusion
  2024-03-04 17:44 ` [PATCH v3 6/6] tee: remove common.h inclusion Igor Opaniuk
@ 2024-03-08 13:27   ` Ilias Apalodimas
  2024-03-08 18:08   ` Sam Protsenko
  1 sibling, 0 replies; 12+ messages in thread
From: Ilias Apalodimas @ 2024-03-08 13:27 UTC (permalink / raw)
  To: Igor Opaniuk
  Cc: u-boot, Etienne Carriere, Heinrich Schuchardt, Jens Wiklander,
	Jorge Ramirez-Ortiz, Patrice Chotard, Simon Glass, Tom Rini

On Mon, 4 Mar 2024 at 19:45, Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> The 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
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
> ---
>
> Changes in v2:
> - Fixed chimp_optee.c:37:9: error: implicit declaration of function 'memset'

Ci is happy now
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>


>
>  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(-)
>
> diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
> index 37f9b094f76..bd146ef2899 100644
> --- a/drivers/tee/broadcom/chimp_optee.c
> +++ b/drivers/tee/broadcom/chimp_optee.c
> @@ -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
>
> diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
> index 47f845cffe3..5fc0505c788 100644
> --- a/drivers/tee/optee/core.c
> +++ b/drivers/tee/optee/core.c
> @@ -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>
> diff --git a/drivers/tee/optee/i2c.c b/drivers/tee/optee/i2c.c
> index ef4e10f9912..e3fb99897c5 100644
> --- a/drivers/tee/optee/i2c.c
> +++ b/drivers/tee/optee/i2c.c
> @@ -3,7 +3,6 @@
>   * Copyright (c) 2020 Foundries.io Ltd
>   */
>
> -#include <common.h>
>  #include <dm.h>
>  #include <i2c.h>
>  #include <tee.h>
> diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
> index 5bc13757ea8..bacced6af6c 100644
> --- a/drivers/tee/optee/rpmb.c
> +++ b/drivers/tee/optee/rpmb.c
> @@ -3,7 +3,6 @@
>   * Copyright (c) 2018 Linaro Limited
>   */
>
> -#include <common.h>
>  #include <dm.h>
>  #include <log.h>
>  #include <tee.h>
> diff --git a/drivers/tee/optee/supplicant.c b/drivers/tee/optee/supplicant.c
> index f9dd874b594..8a426f53ba8 100644
> --- a/drivers/tee/optee/supplicant.c
> +++ b/drivers/tee/optee/supplicant.c
> @@ -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"
> diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
> index ec66401878c..8ad7c09efdd 100644
> --- a/drivers/tee/sandbox.c
> +++ b/drivers/tee/sandbox.c
> @@ -2,7 +2,7 @@
>  /*
>   * Copyright (C) 2018 Linaro Limited
>   */
> -#include <common.h>
> +
>  #include <dm.h>
>  #include <sandboxtee.h>
>  #include <tee.h>
> diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
> index 52412a4098e..0194d732193 100644
> --- a/drivers/tee/tee-uclass.c
> +++ b/drivers/tee/tee-uclass.c
> @@ -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
>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 6/6] tee: remove common.h inclusion
  2024-03-04 17:44 ` [PATCH v3 6/6] tee: remove common.h inclusion Igor Opaniuk
  2024-03-08 13:27   ` Ilias Apalodimas
@ 2024-03-08 18:08   ` Sam Protsenko
  1 sibling, 0 replies; 12+ messages in thread
From: Sam Protsenko @ 2024-03-08 18:08 UTC (permalink / raw)
  To: Igor Opaniuk
  Cc: u-boot, Etienne Carriere, Heinrich Schuchardt, Ilias Apalodimas,
	Jens Wiklander, Jorge Ramirez-Ortiz, Patrice Chotard, Simon Glass,
	Tom Rini

On Mon, Mar 4, 2024 at 11:46 AM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> The 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
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@gmail.com>
> ---

Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>

>
> 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(-)
>
> diff --git a/drivers/tee/broadcom/chimp_optee.c b/drivers/tee/broadcom/chimp_optee.c
> index 37f9b094f76..bd146ef2899 100644
> --- a/drivers/tee/broadcom/chimp_optee.c
> +++ b/drivers/tee/broadcom/chimp_optee.c
> @@ -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
>
> diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
> index 47f845cffe3..5fc0505c788 100644
> --- a/drivers/tee/optee/core.c
> +++ b/drivers/tee/optee/core.c
> @@ -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>
> diff --git a/drivers/tee/optee/i2c.c b/drivers/tee/optee/i2c.c
> index ef4e10f9912..e3fb99897c5 100644
> --- a/drivers/tee/optee/i2c.c
> +++ b/drivers/tee/optee/i2c.c
> @@ -3,7 +3,6 @@
>   * Copyright (c) 2020 Foundries.io Ltd
>   */
>
> -#include <common.h>
>  #include <dm.h>
>  #include <i2c.h>
>  #include <tee.h>
> diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c
> index 5bc13757ea8..bacced6af6c 100644
> --- a/drivers/tee/optee/rpmb.c
> +++ b/drivers/tee/optee/rpmb.c
> @@ -3,7 +3,6 @@
>   * Copyright (c) 2018 Linaro Limited
>   */
>
> -#include <common.h>
>  #include <dm.h>
>  #include <log.h>
>  #include <tee.h>
> diff --git a/drivers/tee/optee/supplicant.c b/drivers/tee/optee/supplicant.c
> index f9dd874b594..8a426f53ba8 100644
> --- a/drivers/tee/optee/supplicant.c
> +++ b/drivers/tee/optee/supplicant.c
> @@ -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"
> diff --git a/drivers/tee/sandbox.c b/drivers/tee/sandbox.c
> index ec66401878c..8ad7c09efdd 100644
> --- a/drivers/tee/sandbox.c
> +++ b/drivers/tee/sandbox.c
> @@ -2,7 +2,7 @@
>  /*
>   * Copyright (C) 2018 Linaro Limited
>   */
> -#include <common.h>
> +
>  #include <dm.h>
>  #include <sandboxtee.h>
>  #include <tee.h>
> diff --git a/drivers/tee/tee-uclass.c b/drivers/tee/tee-uclass.c
> index 52412a4098e..0194d732193 100644
> --- a/drivers/tee/tee-uclass.c
> +++ b/drivers/tee/tee-uclass.c
> @@ -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
>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 0/6] TEE: minor cleanup
  2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
                   ` (5 preceding siblings ...)
  2024-03-04 17:44 ` [PATCH v3 6/6] tee: remove common.h inclusion Igor Opaniuk
@ 2024-03-27 12:13 ` Igor Opaniuk
  2024-03-27 14:17   ` Ilias Apalodimas
  6 siblings, 1 reply; 12+ messages in thread
From: Igor Opaniuk @ 2024-03-27 12:13 UTC (permalink / raw)
  To: Ilias Apalodimas
  Cc: AKASHI Takahiro, Abdellatif El Khlifi, Bin Meng, Etienne Carriere,
	Francis Laniel, Heinrich Schuchardt, Jens Wiklander,
	Jorge Ramirez-Ortiz, Mattijs Korpershoek, Miquel Raynal,
	Patrice Chotard, Roger Knecht, Sean Edmond, Simon Glass, Tom Rini,
	u-boot

Ilias,

On Mon, Mar 4, 2024 at 6:45 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:

> - 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
>
> --
> 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

-- 
Best regards - Atentamente - Meilleures salutations

Igor Opaniuk

mailto: igor.opaniuk@gmail.com
skype: igor.opanyuk
https://www.linkedin.com/in/iopaniuk <http://ua.linkedin.com/in/iopaniuk>

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 0/6] TEE: minor cleanup
  2024-03-27 12:13 ` [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
@ 2024-03-27 14:17   ` Ilias Apalodimas
  2024-04-04  7:22     ` Ilias Apalodimas
  0 siblings, 1 reply; 12+ messages in thread
From: Ilias Apalodimas @ 2024-03-27 14:17 UTC (permalink / raw)
  To: Igor Opaniuk
  Cc: AKASHI Takahiro, Abdellatif El Khlifi, Bin Meng, Etienne Carriere,
	Francis Laniel, Heinrich Schuchardt, Jens Wiklander,
	Jorge Ramirez-Ortiz, Mattijs Korpershoek, Miquel Raynal,
	Patrice Chotard, Roger Knecht, Sean Edmond, Simon Glass, Tom Rini,
	u-boot

Hi Igor,

On Wed, 27 Mar 2024 at 14:13, Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> Ilias,
>
> On Mon, Mar 4, 2024 at 6:45 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>>
>> - 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
>>
>> --
>> 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

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
>
> Regards,
> Igor
>
> --
> Best regards - Atentamente - Meilleures salutations
>
> Igor Opaniuk
>
> mailto: igor.opaniuk@gmail.com
> skype: igor.opanyuk
> https://www.linkedin.com/in/iopaniuk

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 0/6] TEE: minor cleanup
  2024-03-27 14:17   ` Ilias Apalodimas
@ 2024-04-04  7:22     ` Ilias Apalodimas
  0 siblings, 0 replies; 12+ messages in thread
From: Ilias Apalodimas @ 2024-04-04  7:22 UTC (permalink / raw)
  To: Igor Opaniuk
  Cc: AKASHI Takahiro, Abdellatif El Khlifi, Bin Meng, Etienne Carriere,
	Francis Laniel, Heinrich Schuchardt, Jens Wiklander,
	Jorge Ramirez-Ortiz, Mattijs Korpershoek, Miquel Raynal,
	Patrice Chotard, Roger Knecht, Sean Edmond, Simon Glass, Tom Rini,
	u-boot

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
On Wed, Mar 27, 2024 at 04:17:09PM +0200, Ilias Apalodimas wrote:
> Hi Igor,
>
> On Wed, 27 Mar 2024 at 14:13, Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
> >
> > Ilias,
> >
> > On Mon, Mar 4, 2024 at 6:45 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
> >>
> >> - 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
> >>
> >> --
> >> 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
>
> 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
> >
> > Regards,
> > Igor
> >
> > --
> > Best regards - Atentamente - Meilleures salutations
> >
> > Igor Opaniuk
> >
> > mailto: igor.opaniuk@gmail.com
> > skype: igor.opanyuk
> > https://www.linkedin.com/in/iopaniuk

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-04-04  7:22 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-04 17:44 [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 1/6] tee: optee: fix description in Kconfig Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 2/6] tee: sandbox: fix spelling errors Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 3/6] cmd: optee_rpmb: close tee session Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 4/6] cmd: optee_rpmb: build cmd for sandbox Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 5/6] test: py: add optee_rpmb tests Igor Opaniuk
2024-03-04 17:44 ` [PATCH v3 6/6] tee: remove common.h inclusion Igor Opaniuk
2024-03-08 13:27   ` Ilias Apalodimas
2024-03-08 18:08   ` Sam Protsenko
2024-03-27 12:13 ` [PATCH v3 0/6] TEE: minor cleanup Igor Opaniuk
2024-03-27 14:17   ` Ilias Apalodimas
2024-04-04  7:22     ` Ilias Apalodimas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox