From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 11 Jan 2024 13:15:30 +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 1rNty6-00Cxab-0d for lore@lore.pengutronix.de; Thu, 11 Jan 2024 13:15:30 +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 1rNty5-00005d-Gk for lore@pengutronix.de; Thu, 11 Jan 2024 13:15:30 +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: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=Sln37pGzY4NRZ8Z9yluv8dWf2BT1D2/BzmxH+ezDvG0=; b=DJcrIZuD/ZHZRC1EK2hoq0g3Ym XXRyjx8RNDLa19mIgd/8PsXCX3sHdzF9kfkgg3wFOMj2Mj1QtCBzBSfGFP6SKZcJbUHij65BuPjQD GCtgjfyV0m38HE88GaN9ZdJ6NNMX1UbI3i6tF6kAyj5ZOuIt8HZZ5AbgsZJDzW0NwofFKqYk89v32 4VHpVn+nXrtWW1v9JrbgOftnVFZbL8BePMe50ehSGmYvXvYtymsPACKCzkPwSDYx1ItcrVEqk/UEY yxCUOxQQ/dVCPlKxOY4j2MAEy8pwQhjTttjWbqWVWd/G1SeOk66t4PyVisMglHYWXr6E+uThtJm8f AK1R+g6Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rNtx7-00Hayz-1Q; Thu, 11 Jan 2024 12:14:29 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rNtx4-00HayD-0e for barebox@lists.infradead.org; Thu, 11 Jan 2024 12:14:27 +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 1rNtx1-0008Ii-Lt; Thu, 11 Jan 2024 13:14:23 +0100 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rNtx1-001vIz-9b; Thu, 11 Jan 2024 13:14:23 +0100 Received: from mfe by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1rNtx1-00BMMg-7M; Thu, 11 Jan 2024 13:14:23 +0100 Date: Thu, 11 Jan 2024 13:14:23 +0100 From: Marco Felsch To: Ahmad Fatoum Cc: barebox@lists.infradead.org Message-ID: <20240111121423.s5rul7u4v7yrv3ed@pengutronix.de> References: <20240111114841.2676939-1-m.felsch@pengutronix.de> <20240111114841.2676939-13-m.felsch@pengutronix.de> <8ee79958-7c0c-4691-9a4a-ce65b2be9921@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8ee79958-7c0c-4691-9a4a-ce65b2be9921@pengutronix.de> User-Agent: NeoMutt/20180716 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240111_041426_234531_CD0E9A95 X-CRM114-Status: GOOD ( 22.56 ) 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.2 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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH 12/18] ARM64: mmu: add dynamic optee memory mapping support 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 24-01-11, Ahmad Fatoum wrote: > On 11.01.24 12:48, Marco Felsch wrote: > > Use the dynamic optee memory base address for the early mapping if > > possible and fallback to the static mapping if the query failed. > > > > Signed-off-by: Marco Felsch > > This patch fails to apply on next. Argh.. I used the most recent version which is 2023.12.0 for this development. Shall I rebase it on next or on master? Regards, Marco > > > --- > > arch/arm/cpu/mmu_64.c | 14 ++++++++++++-- > > arch/arm/mach-imx/esdctl.c | 4 ++++ > > common/Makefile | 2 +- > > 3 files changed, 17 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c > > index c6ea63e655ad..69fd2218c1fc 100644 > > --- a/arch/arm/cpu/mmu_64.c > > +++ b/arch/arm/cpu/mmu_64.c > > @@ -20,6 +20,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "mmu_64.h" > > > > @@ -297,6 +298,7 @@ void dma_flush_range(void *ptr, size_t size) > > void mmu_early_enable(unsigned long membase, unsigned long memsize) > > { > > int el; > > + u64 optee_membase; > > unsigned long ttb = arm_mem_ttb(membase + memsize); > > > > pr_debug("enabling MMU, ttb @ 0x%08lx\n", ttb); > > @@ -309,8 +311,16 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize) > > memset((void *)ttb, 0, GRANULE_SIZE); > > > > early_remap_range(0, 1UL << (BITS_PER_VA - 1), MAP_UNCACHED); > > - early_remap_range(membase, memsize - OPTEE_SIZE, MAP_CACHED); > > - early_remap_range(membase + memsize - OPTEE_SIZE, OPTEE_SIZE, MAP_FAULT); > > + > > + if (optee_get_membase(&optee_membase)) { > > + /* Fallback and place OP-TEE at the memory end region */ > > + early_remap_range(membase, memsize - OPTEE_SIZE, MAP_CACHED); > > + early_remap_range(membase + memsize - OPTEE_SIZE, OPTEE_SIZE, MAP_FAULT); > > + } else { > > + early_remap_range(membase, memsize, MAP_CACHED); > > + early_remap_range(optee_membase, OPTEE_SIZE, MAP_FAULT); > > + } > > + > > early_remap_range(PAGE_ALIGN_DOWN((uintptr_t)_stext), PAGE_ALIGN(_etext - _stext), MAP_CACHED); > > > > mmu_enable(); > > diff --git a/arch/arm/mach-imx/esdctl.c b/arch/arm/mach-imx/esdctl.c > > index ac35a2de66f1..47c43d75ec75 100644 > > --- a/arch/arm/mach-imx/esdctl.c > > +++ b/arch/arm/mach-imx/esdctl.c > > @@ -29,6 +29,8 @@ > > #include > > #include > > #include > > +#include > > +#include > > > > struct imx_esdctl_data { > > unsigned long base0; > > @@ -1004,6 +1006,8 @@ resource_size_t imx8m_barebox_earlymem_size(unsigned buswidth) > > > > static void __noreturn imx8m_barebox_entry(void *boarddata, unsigned buswidth) > > { > > + imx8m_init_scratch_space(buswidth, false); > > + optee_set_membase(imx8m_scratch_get_optee_hdr()); > > barebox_arm_entry(MX8M_DDR_CSD1_BASE_ADDR, > > imx8m_barebox_earlymem_size(buswidth), boarddata); > > } > > diff --git a/common/Makefile b/common/Makefile > > index 7fb864f61480..c31cbab9e48f 100644 > > --- a/common/Makefile > > +++ b/common/Makefile > > @@ -80,7 +80,7 @@ obj-$(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) += imx-bbu-nand-fcb.o > > obj-$(CONFIG_BOOT) += boot.o > > obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o > > obj-$(CONFIG_USBGADGET_START) += usbgadget.o > > -pbl-$(CONFIG_PBL_OPTEE) += optee.o > > +obj-pbl-$(CONFIG_PBL_OPTEE) += optee.o > > obj-$(CONFIG_BOOTM_OPTEE) += optee.o > > obj-$(CONFIG_FASTBOOT_BASE) += fastboot.o > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > >