From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 11 Jan 2024 16:26:15 +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 1rNwwh-00D7Fv-1m for lore@lore.pengutronix.de; Thu, 11 Jan 2024 16:26:15 +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 1rNwwg-00078W-RH for lore@pengutronix.de; Thu, 11 Jan 2024 16:26:15 +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:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Dt3yfgFAUdpQsa52IJWFaOdnnsy9Givo8Vr/595JMTc=; b=uNdzyn0ADDYtAcObPvCajE9lZ5 jqc6a7E9OeOf0foVXwqfeJCMeIV+1mnx4TNU83QIvwDnxkTWqMchU4Di4DTAtCO/4BnT0nsHLN4bm /NvqYmSm2qHLs7QsViqoEBt7bfRJ32sPkYwD1RB7KJdbGHSWGBiejTy+l4ujqbrNjGGusfbhK6dut pn8wkPGX8ChirXhZQFY7nrbKpLXBhc0rgTmahSoHS5n89EkM4SP/Wo3jTNEJ1Zeo046QCXMReq6If N6UrQiUQnmhAKZZxBD4fWemfWRTE3M8/da2Npf9bVVeAXHhAy5ki7d19YBUA2t6DlDl1u0Q6zF+/l 7FxzpyqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rNwve-000QNS-1p; Thu, 11 Jan 2024 15:25:10 +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 1rNwva-000QJA-1d for barebox@lists.infradead.org; Thu, 11 Jan 2024 15:25:09 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rNwvX-0006sI-Lh; Thu, 11 Jan 2024 16:25:03 +0100 Message-ID: <5aff954f-9b2e-4249-95c9-e199fb2ba0dd@pengutronix.de> Date: Thu, 11 Jan 2024 16:25:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Marco Felsch Cc: barebox@lists.infradead.org References: <20240111114841.2676939-1-m.felsch@pengutronix.de> <20240111114841.2676939-13-m.felsch@pengutronix.de> <8ee79958-7c0c-4691-9a4a-ce65b2be9921@pengutronix.de> <20240111121423.s5rul7u4v7yrv3ed@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20240111121423.s5rul7u4v7yrv3ed@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240111_072506_547261_AD97781E X-CRM114-Status: GOOD ( 20.06 ) 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.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, 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 11.01.24 13:14, Marco Felsch wrote: > 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? As the series should go into next as it's not a fix, please rebase on next. Usually, it doesn't matter, but there was recent rework for OP-TEE for SCMI and thus it conflicts. > > 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 | >> >> > -- 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 |