Skip to contentSkip to conversation

Integrate OP-TEE into the RISC-V boot flow

RFC PATCH In review Yu-Chien Peter Lin 2 participants 5 messages Jan 11, 2025 – Feb 3, 2025 RISC-V

lore
Share & tools
lore
#0 lore raw

cover Integrate OP-TEE into the RISC-V boot flow

This patch series adds support for integrating OP-TEE OS into the RISC-V boot flow. It allows specifying the load address of the OP-TEE binary and updates binman to include the OP-TEE OS image.

Yu-Chien Peter Lin (2):
riscv: Add CONFIG_SPL_OPTEE_LOAD_ADDR
riscv: dts: binman.dtsi: Include OP-TEE OS image

 arch/riscv/Kconfig         |  6 ++++++
 arch/riscv/dts/binman.dtsi | 26 ++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)
Signature · 1 line
2.39.3
#1 lore raw

RFC PATCH 1/2 riscv: Add CONFIG_SPL_OPTEE_LOAD_ADDR

Allow specifying load address of OP-TEE binary. It is recommended that the specified address aligns with the base address of an PMP-protected NAPOT region and matches the CFG_TDDRAM_START configuration in OP-TEE.

---
 arch/riscv/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
arch/riscv/Kconfig +6 -0
index a160d24fb03..9a9458026d3 100644
@@ -582,4 +582,10 @@ config SPL_LOAD_FIT_OPENSBI_OS_BOOT
 	  This is a shortcut boot flow, from u-boot SPL -> OpenSBI -> u-boot proper
 	  -> linux to u-boot SPL -> OpenSBI -> linux.
 
+config SPL_OPTEE_LOAD_ADDR
+	hex "OP-TEE Trusted OS image load address"
+	depends on OPTEE
+	help
+	  Load address of the OP-TEE binary.
+
 endmenu
Signature · 1 line
2.39.3
Reviewed-by on v1 1/2
#2 lore raw

Re: [RFC PATCH 1/2] riscv: Add CONFIG_SPL_OPTEE_LOAD_ADDR

Quoted 9 lines · Yu-Chien Peter Lin

Allow specifying load address of OP-TEE binary. It is recommended that the specified address aligns with the base address of an PMP-protected NAPOT region and matches the CFG_TDDRAM_START configuration in OP-TEE.

---
 arch/riscv/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
#3 lore raw

RFC PATCH 2/2 riscv: dts: binman.dtsi: Include OP-TEE OS image

In reply to Yu-Chien Peter Lin

The following diagram illustrates the boot flow for OP-TEE OS initialization on RISC-V.

    (1)-----------+
     | U-Boot SPL |
     +------------+
         |
         v
    (2)-------------------------------------------------------------+
     | OpenSBI (fw_dynamic.bin)                                     |
     |                (4)------------------------+                  |
     |                 | optee dispatcher driver |                  |
     +-----------------+-------^---------|-------+------------------+
M-mode   |                     |         |
---------+--[trusted domain]---+----.----+--[untrusted domain]-------
S-mode   |  (coldboot domain)  |    |    |
         v                     |    |    v
    (3)---------------------------+ |(5)----------------------------+
     | OP-TEE OS (tee.bin)        | | | U-Boot (u-boot-nodtb.bin)   |
     +----------------------------+ | +-----------------------------+
                                    |    |
                                    |    v
                                    |(6)----------------------------+
                                    | | Linux                       |
                                    | +-----------------------------+

This patch enables the inclusion of the OP-TEE binary within the U-Boot ITB, allowing it to be loaded to a platform defined address by U-Boot SPL.

---
 arch/riscv/dts/binman.dtsi | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)
arch/riscv/dts/binman.dtsi +24 -2
index 9271de0ddfc..0405faca574 100644
@@ -53,6 +53,19 @@
 					};
 				};
 #endif
+#ifdef CONFIG_OPTEE
+				tee {
+					description = "OP-TEE";
+					type = "tee";
+					arch = "riscv";
+					compression = "none";
+					os = "tee";
+					load = /bits/ 64 <CONFIG_SPL_OPTEE_LOAD_ADDR>;
+					tee_blob: tee-os {
+						filename = "tee.bin";
+					};
+				};
+#endif
 
 				opensbi {
 					description = "OpenSBI fw_dynamic Firmware";
@@ -88,11 +101,20 @@
 #endif
 					description = "NAME";
 					firmware = "opensbi";
-#ifndef CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT
-					loadables = "uboot";
+#ifdef CONFIG_OPTEE
+#ifdef CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT
+					loadables = "linux", "tee";
 #else
+					loadables = "uboot", "tee";
+#endif
+#else /* !CONFIG_OPTEEE */
+#ifdef CONFIG_SPL_LOAD_FIT_OPENSBI_OS_BOOT
 					loadables = "linux";
+#else
+					loadables = "uboot";
 #endif
+#endif /* CONFIG_OPTEE */
+
 #ifndef CONFIG_OF_BOARD
 					fdt = "fdt-SEQ";
 #endif
Signature · 1 line
2.39.3
Reviewed-by on v1 2/2
#4 lore raw

Re: [RFC PATCH 2/2] riscv: dts: binman.dtsi: Include OP-TEE OS image

Quoted 26 lines · Yu-Chien Peter Lin

The following diagram illustrates the boot flow for OP-TEE OS initialization on RISC-V.

    (1)-----------+
     | U-Boot SPL |
     +------------+
         |
         v
    (2)-------------------------------------------------------------+
     | OpenSBI (fw_dynamic.bin)                                     |
     |                (4)------------------------+                  |
     |                 | optee dispatcher driver |                  |
     +-----------------+-------^---------|-------+------------------+
M-mode   |                     |         |
---------+--[trusted domain]---+----.----+--[untrusted domain]-------
S-mode   |  (coldboot domain)  |    |    |
         v                     |    |    v
    (3)---------------------------+ |(5)----------------------------+
     | OP-TEE OS (tee.bin)        | | | U-Boot (u-boot-nodtb.bin)   |
     +----------------------------+ | +-----------------------------+
                                    |    |
                                    |    v
                                    |(6)----------------------------+
                                    | | Linux                       |
                                    | +-----------------------------+
Quoted 8 lines

This patch enables the inclusion of the OP-TEE binary within the U-Boot ITB, allowing it to be loaded to a platform defined address by U-Boot SPL.

---
 arch/riscv/dts/binman.dtsi | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)