From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 27 May 2025 10:04:23 +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 1uJpIN-000mwV-06 for lore@lore.pengutronix.de; Tue, 27 May 2025 10:04:23 +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 1uJpIM-0000Ut-Cd for lore@pengutronix.de; Tue, 27 May 2025 10:04:22 +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:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VSxv4zm61mikv3jCEed4Pez9whN0K81DbEsc4g36uXM=; b=T0VdMthmvwGKFEUv1vS4FT5mTV sYzH5joPWWy6yU4eCUCjbeSheNu9EkfxL1X7sILYxz5bOoaQXBuwT5aLDoIMjbBSXAT4wMFWErZNm VRvaXC9xryaihNCJjuKDDDMlJbnMZAzZjHRxBSbE7y6a7NSE6jUsGXfA674zPuCrefgE3xh1rpibE wU/qOT3rbmH2n0Iq/DZe8lvolseEJD60fEg4JCcd3x+yh0itVendvNa9VrOpS55u0dz2XXN9M+QWm +YEHCsoBwO4yw+oNww7ZhzLoxYzfwcrLPhevxOatCW0LQ0nPkx+cV+furpIytf8gza3hMp3pg5G1R 6oRjfVxw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uJpHn-0000000ADAJ-3ziH; Tue, 27 May 2025 08:03:47 +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 1uJpHl-0000000AD9u-1UjZ for barebox@lists.infradead.org; Tue, 27 May 2025 08:03:46 +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 1uJpHi-0000Mi-T7; Tue, 27 May 2025 10:03:42 +0200 Received: from pty.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::c5]) 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 1uJpHi-000Nk0-2J; Tue, 27 May 2025 10:03:42 +0200 Received: from mtr by pty.whiteo.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1uJpHi-00CRyn-22; Tue, 27 May 2025 10:03:42 +0200 Date: Tue, 27 May 2025 10:03:42 +0200 From: Michael Tretter To: Marco Felsch Cc: BAREBOX Message-ID: References: <20250526-rk3588-optee-v1-0-5004995cbd03@pengutronix.de> <20250526-rk3588-optee-v1-8-5004995cbd03@pengutronix.de> <20250526163723.yajiylvj5lbext73@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20250526163723.yajiylvj5lbext73@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250527_010345_396508_B054E173 X-CRM114-Status: GOOD ( 36.28 ) 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=-6.5 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: Re: [PATCH 8/9] ARM: rockchip: pass device tree to TF-A 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) On Mon, 26 May 2025 18:37:23 +0200, Marco Felsch wrote: > On 25-05-26, Michael Tretter wrote: > > The upstream OP-TEE expects a device tree to be able to initialize the > > dynamic shared memory. Therefore, barebox should pass a device tree that > > contains memory nodes through the TF-A to OP-TEE. > > > > Unfortunately, the downstream TF-A fails to start if barebox passes its > > device tree and it is not possible to detect if the loaded TF-A is able > > to handle the device tree. Add a config option to pass the device tree > > if it is possible. > > > > Signed-off-by: Michael Tretter > > --- > > arch/arm/mach-rockchip/Kconfig | 13 +++++++++++++ > > arch/arm/mach-rockchip/atf.c | 15 ++++----------- > > pbl/Kconfig | 1 + > > 3 files changed, 18 insertions(+), 11 deletions(-) > > > > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > > index 98dfd11c182b9fee6e3c958653ad4fa8a7d98d84..257c13bcf4846e805a7803105c71edeff92c534d 100644 > > --- a/arch/arm/mach-rockchip/Kconfig > > +++ b/arch/arm/mach-rockchip/Kconfig > > @@ -141,6 +141,19 @@ config ARCH_ROCKCHIP_ATF > > useful for debugging early startup, but for all other cases, > > say y here. > > > > +config ARCH_ROCKCHIP_ATF_PASS_FDT > > + bool "Pass device tree to TF-A" > > + depends on ARCH_ROCKCHIP_ATF > > + help > > + Enable this option if you are using an upstream OP-TEE that uses the > > + device tree to initialize dynamic shared memory, which is passed > > + through the upstream TF-A. > > Would be nice to document this within the Documentation/ dir too. Ack. There are already some notes about the binaries in Documentation/boards/rockchip.rst. I'll add some documentation about the device tree size there. Michael > > Regards, > Marco > > > + > > + Disable the option if you are using a downstream TF-A since it > > + doesn't always cope with device trees. Supposedly this happens if the > > + device tree is too large, for example if CONFIG_OF_OVERLAY_LIVE is > > + enabled. > > + > > config ARCH_ROCKCHIP_OPTEE > > bool "Build rockchip OP-TEE binary into barebox" > > depends on ARCH_ROCKCHIP_ATF > > diff --git a/arch/arm/mach-rockchip/atf.c b/arch/arm/mach-rockchip/atf.c > > index cfa6df043b34c0f36919048237c7ecf33dfe0724..12cf13717b6972c2eafc5a044ae8d0b4de029c32 100644 > > --- a/arch/arm/mach-rockchip/atf.c > > +++ b/arch/arm/mach-rockchip/atf.c > > @@ -186,18 +186,11 @@ void __noreturn rk3588_barebox_entry(void *fdt) > > rk3588_lowlevel_init(); > > rockchip_store_bootrom_iram(IOMEM(RK3588_IRAM_BASE)); > > > > - /* > > - * The downstream TF-A doesn't cope with our device tree when > > - * CONFIG_OF_OVERLAY_LIVE is enabled, supposedly because it is > > - * too big for some reason. Otherwise it doesn't have any visible > > - * effect if we pass a device tree or not, except that the TF-A > > - * fills in the ethernet MAC address into the device tree. > > - * The upstream TF-A doesn't use the device tree at all. > > - * > > - * Pass NULL for now until we have a good reason to pass a real > > - * device tree. > > - */ > > +#ifdef CONFIG_ARCH_ROCKCHIP_ATF_PASS_FDT > > + rk3588_atf_load_bl31(fdt); > > +#else > > rk3588_atf_load_bl31(NULL); > > +#endif > > /* not reached when CONFIG_ARCH_ROCKCHIP_ATF */ > > } > > > > diff --git a/pbl/Kconfig b/pbl/Kconfig > > index 489b2001a855d62e11a2159311332b0e67f3a754..3dfc7de3e80da12a6313e84175275070274b9a5d 100644 > > --- a/pbl/Kconfig > > +++ b/pbl/Kconfig > > @@ -63,6 +63,7 @@ config PBL_CLOCKSOURCE > > config PBL_FDT_MIN_SIZE > > hex > > default 0x0 > > + default 0x60000 if ARCH_ROCKCHIP_ATF_PASS_FDT > > prompt "Minimum size of the FDT blob" > > help > > The TF-A or OP-TEE may modify the FDT or add nodes to the FDT. This > > > > -- > > 2.39.5 > > > > > > >