* [PATCH v2 1/2] ARM: i.MX: scratch: add generic init for imx
2025-12-10 13:16 [PATCH v2 0/2] Add generic OP-TEE loading for i.MX6 Fabian Pflug
@ 2025-12-10 13:16 ` Fabian Pflug
2025-12-10 13:16 ` [PATCH v2 2/2] ARM: i.MX6: load optee in PBL before barebox proper Fabian Pflug
1 sibling, 0 replies; 3+ messages in thread
From: Fabian Pflug @ 2025-12-10 13:16 UTC (permalink / raw)
To: BAREBOX; +Cc: Marco Felsch, Fabian Pflug
The zero_init, memset and scratch assignment were the same, and will be
the same for i.MX6. Why not make it generic?
Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de>
---
arch/arm/mach-imx/Kconfig | 2 +-
arch/arm/mach-imx/scratch.c | 18 +++++++++---------
include/mach/imx/scratch.h | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 99b6c51333..208e6488bd 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -57,7 +57,7 @@ config ARCH_IMX_ROMAPI
config ARCH_IMX_SCRATCHMEM
def_bool y
- depends on ARCH_IMX8M || ARCH_IMX9
+ depends on ARCH_IMX6 || ARCH_IMX8M || ARCH_IMX9
config ARCH_IMX_TZASC
bool
diff --git a/arch/arm/mach-imx/scratch.c b/arch/arm/mach-imx/scratch.c
index 393d3a976f..f26038b029 100644
--- a/arch/arm/mach-imx/scratch.c
+++ b/arch/arm/mach-imx/scratch.c
@@ -24,25 +24,25 @@ static_assert(sizeof(struct imx_scratch_space) <= CONFIG_SCRATCH_SIZE);
static struct imx_scratch_space *scratch;
-void imx8m_init_scratch_space(int ddr_buswidth, bool zero_init)
+void imx_init_scratch_space(ulong endmem, bool zero_init)
{
- ulong endmem = MX8M_DDR_CSD1_BASE_ADDR +
- imx8m_barebox_earlymem_size(ddr_buswidth);
-
scratch = (void *)arm_mem_scratch(endmem);
if (zero_init)
memset(scratch, 0, sizeof(*scratch));
}
+void imx8m_init_scratch_space(int ddr_buswidth, bool zero_init)
+{
+ ulong endmem = MX8M_DDR_CSD1_BASE_ADDR +
+ imx8m_barebox_earlymem_size(ddr_buswidth);
+ imx_init_scratch_space(endmem, zero_init);
+}
+
void imx93_init_scratch_space(bool zero_init)
{
ulong endmem = MX9_DDR_CSD1_BASE_ADDR + imx9_ddrc_sdram_size();
-
- scratch = (void *)arm_mem_scratch(endmem);
-
- if (zero_init)
- memset(scratch, 0, sizeof(*scratch));
+ imx_init_scratch_space(endmem, zero_init);
}
void imx8m_scratch_save_bootrom_log(const u32 *rom_log)
diff --git a/include/mach/imx/scratch.h b/include/mach/imx/scratch.h
index a9745a9573..a86f5ca38a 100644
--- a/include/mach/imx/scratch.h
+++ b/include/mach/imx/scratch.h
@@ -3,6 +3,7 @@
#ifndef __MACH_IMX_SCRATCH_H
#define __MACH_IMX_SCRATCH_H
+void imx_init_scratch_space(ulong endmem, bool zero_init);
void imx8m_init_scratch_space(int ddr_buswidth, bool zero_init);
void imx93_init_scratch_space(bool zero_init);
--
2.47.3
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v2 2/2] ARM: i.MX6: load optee in PBL before barebox proper
2025-12-10 13:16 [PATCH v2 0/2] Add generic OP-TEE loading for i.MX6 Fabian Pflug
2025-12-10 13:16 ` [PATCH v2 1/2] ARM: i.MX: scratch: add generic init for imx Fabian Pflug
@ 2025-12-10 13:16 ` Fabian Pflug
1 sibling, 0 replies; 3+ messages in thread
From: Fabian Pflug @ 2025-12-10 13:16 UTC (permalink / raw)
To: BAREBOX; +Cc: Marco Felsch, Fabian Pflug
This patch uses the space in the scratch memory to hand over to OP-TEE
for device-tree overlays. If OP-TEE is configured with CFG_DT_ADDR=,
then it will write its devicetree-overlay into the address and it will
be picked up and applied by barebox.
This allows for generic OP-TEE loading for i.MX6 devices without changes
to the board or lowlevel code.
Signed-off-by: Fabian Pflug <f.pflug@pengutronix.de>
---
arch/arm/mach-imx/esdctl.c | 48 +++++++++++++++++++++++++++++++++++++++++++---
common/Kconfig | 1 +
firmware/Kconfig | 8 ++++++++
firmware/Makefile | 1 +
include/tee/optee.h | 9 ++++++++-
5 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c
index b9393fba4a..28747a1e6e 100644
--- a/arch/arm/mach-imx/esdctl.c
+++ b/arch/arm/mach-imx/esdctl.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <io.h>
#include <errno.h>
+#include <firmware.h>
#include <linux/sizes.h>
#include <init.h>
#include <of.h>
@@ -30,6 +31,7 @@
#include <mach/imx/imx7-regs.h>
#include <mach/imx/imx9-regs.h>
#include <mach/imx/scratch.h>
+#include <mach/imx/tzasc.h>
#include <tee/optee.h>
struct imx_esdctl_data {
@@ -976,18 +978,58 @@ void __noreturn imx53_barebox_entry(void *boarddata)
static void __noreturn
imx6_barebox_entry(unsigned long membase, void *boarddata)
{
- barebox_arm_entry(membase,
- imx6_mmdc_sdram_size(IOMEM(MX6_MMDC_P0_BASE_ADDR)),
- boarddata);
+ ulong memsize = imx6_mmdc_sdram_size(IOMEM(MX6_MMDC_P0_BASE_ADDR));
+
+ if (IS_ENABLED(CONFIG_FIRMWARE_IMX6_OPTEE) &&
+ IS_ENABLED(CONFIG_PBL_OPTEE) && imx6_can_access_tzasc()) {
+ void *fdto;
+ unsigned int fdto_size;
+ int tee_size;
+ void *tee;
+
+ get_builtin_firmware(imx6_optee_bin, &tee, &tee_size);
+
+ imx_init_scratch_space(membase + memsize, 1);
+ imx_scratch_get_optee_fdto(&fdto, &fdto_size);
+ if (!fdto_size) {
+ pr_warn("No space configured for OP-TEE devicetree\n");
+ fdto = NULL;
+ }
+
+ start_optee_early(fdto, tee);
+ if (fdto_size)
+ handoff_data_add(HANDOFF_DATA_BL32_DT_OVL, fdto,
+ fdto_size);
+ }
+
+ barebox_arm_entry(membase, memsize, boarddata);
}
void __noreturn imx6q_barebox_entry(void *boarddata)
{
+ if (IS_ENABLED(CONFIG_FIRMWARE_IMX6_OPTEE) &&
+ IS_ENABLED(CONFIG_PBL_OPTEE) && imx6_can_access_tzasc()) {
+ if (imx6q_tzc380_is_bypassed())
+ panic("TZC380 is bypassed, abort OP-TEE loading\n");
+
+ /* Add early non-secure TZASC region1 to pass DTO */
+ imx6q_tzc380_early_ns_region1();
+ }
+
imx6_barebox_entry(MX6_MMDC_PORT01_BASE_ADDR, boarddata);
}
void __noreturn imx6ul_barebox_entry(void *boarddata)
{
+ if (IS_ENABLED(CONFIG_FIRMWARE_IMX6_OPTEE) &&
+ IS_ENABLED(CONFIG_PBL_OPTEE) && imx6_can_access_tzasc()) {
+ if (imx6ul_tzc380_is_bypassed())
+ panic("TZC380 is bypassed, abort OP-TEE loading\n");
+
+ /* Add early non-secure TZASC region1 to pass DTO */
+ imx6ul_tzc380_early_ns_region1();
+ }
+
imx6_barebox_entry(MX6_MMDC_PORT0_BASE_ADDR, boarddata);
}
diff --git a/common/Kconfig b/common/Kconfig
index c42dc88ccf..20012cdc2c 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -322,6 +322,7 @@ config SCRATCH_FDTO_SIZE
hex
default 0x0
default 0x4000 if PBL_EARLY_FDT_LOAD
+ default 0x4000 if FIRMWARE_IMX6_OPTEE
prompt "Scratch FDTO size"
help
The size of possible FDT overlay areas used by BL3x binaries to store
diff --git a/firmware/Kconfig b/firmware/Kconfig
index a97a1e0dd3..aed4c0c8da 100644
--- a/firmware/Kconfig
+++ b/firmware/Kconfig
@@ -49,6 +49,14 @@ config FIRMWARE_IMX93_ATF
config FIRMWARE_AGILEX5_ATF
bool
+config FIRMWARE_IMX6_OPTEE
+ bool "install OP-TEE on i.MX6 boards"
+ depends on PBL_OPTEE
+ help
+ This enables OP-TEE loading and starting on i.MX6. Place the OP-TEE binary
+ in CONFIG_EXTRA_FIRMWARE_DIR/imx6-optee.bin. If this is enabled, then
+ the OP-TEE will automatically be loaded during boot.
+
config FIRMWARE_IMX8MM_OPTEE
bool "install OP-TEE on i.MX8MM boards"
depends on FIRMWARE_IMX8MM_ATF && PBL_OPTEE
diff --git a/firmware/Makefile b/firmware/Makefile
index 163055554d..fef7b837d1 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -22,6 +22,7 @@ pbl-firmware-$(CONFIG_FIRMWARE_IMX8MP_ATF) += imx8mp-bl31.bin$(if $(CONFIG_FIRMW
pbl-firmware-$(CONFIG_FIRMWARE_IMX8MQ_ATF) += imx8mq-bl31.bin
pbl-firmware-$(CONFIG_FIRMWARE_IMX93_ATF) += imx93-bl31.bin$(if $(CONFIG_FIRMWARE_IMX93_OPTEE),-optee,)
pbl-firmware-$(CONFIG_FIRMWARE_AGILEX5_ATF) += agilex5-bl31.bin
+pbl-firmware-$(CONFIG_FIRMWARE_IMX6_OPTEE) += imx6-optee.bin
fw-external-$(CONFIG_FIRMWARE_IMX8MM_OPTEE) += imx8mm-bl32.bin
fw-external-$(CONFIG_FIRMWARE_IMX8MN_OPTEE) += imx8mn-bl32.bin
fw-external-$(CONFIG_FIRMWARE_IMX8MP_OPTEE) += imx8mp-bl32.bin
diff --git a/include/tee/optee.h b/include/tee/optee.h
index a3f1917f63..db8a87b8b9 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -70,12 +70,19 @@ static inline bool optee_overlay_applied(void)
#ifdef __PBL__
-int start_optee_early(void* fdt, void* tee);
+int start_optee_early(void *fdt, void *tee);
int imx6q_start_optee_early(void *fdt, void *tee, void *data_location,
unsigned int data_location_size);
int imx6ul_start_optee_early(void *fdt, void *tee, void *data_location,
unsigned int data_location_size);
+#else
+
+static inline int start_optee_early(void *fdt, void *tee)
+{
+ return -ENOSYS;
+}
+
#endif /* __PBL__ */
struct device_node;
--
2.47.3
^ permalink raw reply [flat|nested] 3+ messages in thread