From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 27 Jun 2025 17:10:00 +0200 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 1uVAiG-00Beqc-0A for lore@lore.pengutronix.de; Fri, 27 Jun 2025 17:10:00 +0200 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 1uVAiE-0004o9-AZ for lore@pengutronix.de; Fri, 27 Jun 2025 17:09:59 +0200 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:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Btz5e99erExqrslDb2/3rdikNrl5PYWgZjsZt1rxufs=; b=qKTyiwwIEacr2TLBi9hj7kz95P tl4jkocfRXjPPAafLgIsGwrc4paWkQugfmuywVjXAnX/GQlv5MC+Vj8sxKznfloQBPHV5hrvjMczj MmLohVh49DrTS0gSinzANWeHwBWnWg4T4HDNxIcSGFbaaC6ysOn1Ye/EzFxexJatT5aZJXPsvAubE AuQYzKEaXUSZnf3HqmgMCPnXXz3IRxgolHmyf/YKv+/YtHk2Sk8BDfTRGP0bQpiu0jVxC2OKDMw+Q 0uNfZty+BJrHDGEO7HBGxwInoYwTbcexFgFkuwD2WA6CpV40bEdWz2N1eyixLEfGqaHNgA05Eisyc em0y88dg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uVAhh-0000000F0xQ-2Yay; Fri, 27 Jun 2025 15:09:25 +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 1uVAAu-0000000Evk3-08GF for barebox@lists.infradead.org; Fri, 27 Jun 2025 14:35:34 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1uVAAs-0008Nd-UY; Fri, 27 Jun 2025 16:35:30 +0200 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1uVAAs-005dIo-2Q; Fri, 27 Jun 2025 16:35:30 +0200 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1uV9kG-004uPv-2V; Fri, 27 Jun 2025 16:08:00 +0200 From: Sascha Hauer Date: Fri, 27 Jun 2025 16:07:58 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250627-arm-optee-early-helper-v1-12-4b098e8ac7cd@pengutronix.de> References: <20250627-arm-optee-early-helper-v1-0-4b098e8ac7cd@pengutronix.de> In-Reply-To: <20250627-arm-optee-early-helper-v1-0-4b098e8ac7cd@pengutronix.de> To: BAREBOX X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1751033280; l=3688; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=ChIW/QAQKx6KrTtHP7knlxmekVQrjLELYdf92hkDcU8=; b=dXKlmeL5KvwCbTAbgj20brqjjRgAjDhd5lgQ+NS2iyZk2fOQAmhj+s/W5ZTqlyiGgd77bwaKK GHB+WbQr849CZ6yLbeY8lnYnfaddcz8BI12oJ4vN2urEiN6KkO8eMP8 X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250627_073533_146933_94ACCF1F X-CRM114-Status: GOOD ( 16.32 ) 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=-5.3 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 12/14] ARM: i.MX: Webasto ccbv2: fix barebox chainloading with OP-TEE enabled 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) When barebox starts we have to guess if we have to start OP-TEE or not. The current detection works by checking if the first stage passed us a device tree pointer. This is not robust and might have security issues [1], so replace that with the check with imx6_can_access_tzasc(). If we can access the TZASC then we are the first stage and configure it and start OP-TEE, otherwise assume that we are chainloaded and continue without starting OP-TEE. Chainloading barebox with OP-TEE enabled contained several bugs, so it never actually worked. This patch fixes them. Signed-off-by: Sascha Hauer --- arch/arm/boards/webasto-ccbv2/lowlevel.c | 24 +++++++++--------------- arch/arm/mach-imx/Kconfig | 1 + 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/arch/arm/boards/webasto-ccbv2/lowlevel.c b/arch/arm/boards/webasto-ccbv2/lowlevel.c index 7a198bd801d41e61e6ab4b3c284948154b61d1ca..c25f8a9cb3ce58742576aa05193f1cf730e2e2c7 100644 --- a/arch/arm/boards/webasto-ccbv2/lowlevel.c +++ b/arch/arm/boards/webasto-ccbv2/lowlevel.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "ccbv2.h" @@ -31,28 +32,21 @@ static void configure_uart(void) } -static void noinline start_ccbv2(u32 r0, unsigned long mem_size, char *fdt) +static void noinline start_ccbv2(unsigned long mem_size, char *fdt) { int tee_size; void *tee; - /* Enable normal/secure r/w for TZC380 region0 */ - writel(0xf0000000, 0x021D0108); - configure_uart(); /* - * Chainloading barebox will pass a device tree within the RAM in r0, - * skip OP-TEE early loading in this case + * Skip loading barebox when we are chainloaded. We can detect that by detecting + * if we can access the TZASC. */ - if(IS_ENABLED(CONFIG_FIRMWARE_CCBV2_OPTEE) - && !(r0 > MX6_MMDC_P0_BASE_ADDR - && r0 < MX6_MMDC_P0_BASE_ADDR + mem_size)) { + if (IS_ENABLED(CONFIG_FIRMWARE_TQMA6UL_OPTEE) && imx6_can_access_tzasc()) { get_builtin_firmware(ccbv2_optee_bin, &tee, &tee_size); - memset((void *)OPTEE_OVERLAY_LOCATION, 0, 0x1000); - - start_optee_early(NULL, tee); + imx6ul_start_optee_early(NULL, tee, (void *)OPTEE_OVERLAY_LOCATION, 0x1000); } imx6ul_barebox_entry(fdt); @@ -70,7 +64,7 @@ ENTRY_FUNCTION(start_imx6ul_ccbv2_256m, r0, r1, r2) setup_c(); barrier(); - start_ccbv2(r0, SZ_256M, __dtb_z_imx6ul_webasto_ccbv2_start); + start_ccbv2(SZ_256M, __dtb_z_imx6ul_webasto_ccbv2_start); } ENTRY_FUNCTION(start_imx6ul_ccbv2_512m, r0, r1, r2) @@ -83,7 +77,7 @@ ENTRY_FUNCTION(start_imx6ul_ccbv2_512m, r0, r1, r2) setup_c(); barrier(); - start_ccbv2(r0, SZ_512M, __dtb_z_imx6ul_webasto_ccbv2_start); + start_ccbv2(SZ_512M, __dtb_z_imx6ul_webasto_ccbv2_start); } extern char __dtb_z_imx6ul_webasto_marvel_start[]; @@ -97,5 +91,5 @@ ENTRY_FUNCTION(start_imx6ul_marvel, r0, r1, r2) setup_c(); barrier(); - start_ccbv2(r0, SZ_512M, __dtb_z_imx6ul_webasto_marvel_start); + start_ccbv2(SZ_512M, __dtb_z_imx6ul_webasto_marvel_start); } diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 1bf28b473af2b517a784c11d33f745ad74750583..b8486b1fa18944dbb91aab02fc717dd1d228ee09 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -504,6 +504,7 @@ config MACH_VARISCITE_MX6 config MACH_WEBASTO_CCBV2 bool "Webasto Common Communication Board V2" select ARCH_IMX6UL + select CONFIG_ARM_EXCEPTIONS_PBL if FIRMWARE_CCBV2_OPTEE config MACH_GK802 bool "Zealz GK802 Mini PC" -- 2.39.5