diff mbox series

[v5,2/5] spl: Introduce spl_board_prepare_for_optee() hook

Message ID 20210715191927.337676-3-mr.nuke.me@gmail.com
State Accepted
Commit a25d6b65c21b1298712c75604ff606025cb40267
Delegated to: Patrick Delaunay
Headers show
Series stm32mp: Enable OP-TEE and TZC support in SPL | expand

Commit Message

Alexandru Gagniuc July 15, 2021, 7:19 p.m. UTC 
OP-TEE requires some particular setup, which is not needed for linux
or other payloads. Add a hook for platform-specific code to perform
any OP-TEE related configuration and initialization.

A weak function is used because it is symmetrical to other
spl_board_prepare_for_*() implementations. A solution to avoid the use
of weak functions would trivially apply to all these implementations.
However, re-designing this is beyond the scope of this patch.

Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---
 common/spl/spl.c |  5 +++++
 include/spl.h    | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

Comments

Patrick Delaunay July 27, 2021, 9:13 a.m. UTC | #1 
Hi,

On 7/15/21 9:19 PM, Alexandru Gagniuc wrote:
> OP-TEE requires some particular setup, which is not needed for linux
> or other payloads. Add a hook for platform-specific code to perform
> any OP-TEE related configuration and initialization.
>
> A weak function is used because it is symmetrical to other
> spl_board_prepare_for_*() implementations. A solution to avoid the use
> of weak functions would trivially apply to all these implementations.
> However, re-designing this is beyond the scope of this patch.
>
> Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
> ---
>   common/spl/spl.c |  5 +++++
>   include/spl.h    | 14 ++++++++++++++
>   2 files changed, 19 insertions(+)




Applied to u-boot-stm/master, thanks!

Regards
Patrick
diff mbox series

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index eba77cace6..2919fa3e92 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -167,6 +167,10 @@  __weak void spl_board_prepare_for_linux(void)
 	/* Nothing to do! */
 }
 
+__weak void spl_board_prepare_for_optee(void *fdt)
+{
+}
+
 __weak void spl_board_prepare_for_boot(void)
 {
 	/* Nothing to do! */
@@ -747,6 +751,7 @@  void board_init_r(gd_t *dummy1, ulong dummy2)
 #if CONFIG_IS_ENABLED(OPTEE)
 	case IH_OS_TEE:
 		debug("Jumping to U-Boot via OP-TEE\n");
+		spl_board_prepare_for_optee(spl_image.fdt_addr);
 		spl_optee_entry(NULL, NULL, spl_image.fdt_addr,
 				(void *)spl_image.entry_point);
 		break;
diff --git a/include/spl.h b/include/spl.h
index cee9a42ddb..04ab2b6d7d 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -388,6 +388,20 @@  int spl_parse_image_header(struct spl_image_info *spl_image,
 			   const struct image_header *header);
 
 void spl_board_prepare_for_linux(void);
+
+/**
+ * spl_board_prepare_for_optee() - Prepare board for an OPTEE payload
+ *
+ * Prepares the board for booting an OP-TEE payload. Initialization is platform
+ * specific, and may include configuring the TrustZone memory, and other
+ * initialization steps required by OP-TEE.
+ * Note that @fdt is not used directly by OP-TEE. OP-TEE passes this @fdt to
+ * its normal world target. This target is not guaranteed to be u-boot, so @fdt
+ * changes that would normally be done by u-boot should be done in this step.
+ *
+ * @fdt: Devicetree that will be passed on, or NULL
+ */
+void spl_board_prepare_for_optee(void *fdt);
 void spl_board_prepare_for_boot(void);
 int spl_board_ubi_load_image(u32 boot_device);
 int spl_board_boot_device(u32 boot_device);