From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 10 Dec 2025 14:17:14 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vTK4A-009vQG-1u for lore@lore.pengutronix.de; Wed, 10 Dec 2025 14:17:14 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vTK49-0003xL-NS for lore@pengutronix.de; Wed, 10 Dec 2025 14:17:14 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GXQTJ2hkXuJFuhjDW0ITmxKk2UzBKnhJvwWjZCalVEs=; b=SATsSPWQQ1fFJcJM3jG/y/mvam MLqyVgL/n978wq4IyfbNLSYFa0thYSyFT8J99GX5puTujAfF88huwjWGf64gVWIFxdJcxvcwq5o4Z 6gmmezcL1DwZj9qAJtnnPFxxME+M0kVd1LHbwZPLvNNL3XpLhaBaBW6TL9v0HqqP9lsfRO3tocHH4 rGBZXVIAiOWfogDLvary0TBYAgGdOl79/mN3K5anDNFiN18OYGh8teSvfbmIrSEgfunzWb4/SVPnZ u3KgTOwoJEMFOKfbZiDYLcHvTViva4CB4rdUTmWjNG2zbQ/5T5HNGRT9Kg45WnU9T+qhtJm3t+J2C Pb6Tgmsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vTK3a-0000000FTMk-2mRh; Wed, 10 Dec 2025 13:16:38 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vTK3X-0000000FTLU-00pQ for barebox@lists.infradead.org; Wed, 10 Dec 2025 13:16:37 +0000 Received: from dude06.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::5c]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vTK3U-0003mZ-Pt; Wed, 10 Dec 2025 14:16:32 +0100 From: Fabian Pflug Date: Wed, 10 Dec 2025 14:16:15 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251210-v2025-11-0-topic-optee-imx6-start-v2-2-5328020f7f80@pengutronix.de> References: <20251210-v2025-11-0-topic-optee-imx6-start-v2-0-5328020f7f80@pengutronix.de> In-Reply-To: <20251210-v2025-11-0-topic-optee-imx6-start-v2-0-5328020f7f80@pengutronix.de> To: BAREBOX Cc: Marco Felsch , Fabian Pflug X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251210_051635_046233_A14E218F X-CRM114-Status: GOOD ( 16.09 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2 2/2] ARM: i.MX6: load optee in PBL before barebox proper X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) 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 --- 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 #include #include +#include #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#include #include 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