mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Marco Felsch <m.felsch@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 12/18] ARM64: mmu: add dynamic optee memory mapping support
Date: Thu, 11 Jan 2024 13:14:23 +0100	[thread overview]
Message-ID: <20240111121423.s5rul7u4v7yrv3ed@pengutronix.de> (raw)
In-Reply-To: <8ee79958-7c0c-4691-9a4a-ce65b2be9921@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 <m.felsch@pengutronix.de>
> 
> 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 <memory.h>
> >  #include <asm/system_info.h>
> >  #include <linux/pagemap.h>
> > +#include <tee/optee.h>
> >  
> >  #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 <mach/imx/imx8m-regs.h>
> >  #include <mach/imx/imx7-regs.h>
> >  #include <mach/imx/imx9-regs.h>
> > +#include <mach/imx/scratch.h>
> > +#include <tee/optee.h>
> >  
> >  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 |
> 
> 



  reply	other threads:[~2024-01-11 12:15 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-11 11:48 [PATCH 00/18] Dynamic OP-TEE Loading Marco Felsch
2024-01-11 11:48 ` [PATCH 01/18] ARM: i.MX8M: atf: make use of imx8m*_save_bootrom_log macros Marco Felsch
2024-01-11 12:06   ` Ahmad Fatoum
2024-01-11 12:16     ` Marco Felsch
2024-01-11 15:28       ` Ahmad Fatoum
2024-01-11 11:48 ` [PATCH 02/18] ARM: i.MX8M: bundle imx-scratch code Marco Felsch
2024-01-11 11:48 ` [PATCH 03/18] ARM: i.MX8M: scratch: make imx_scratch_space private Marco Felsch
2024-01-11 11:48 ` [PATCH 04/18] ARM: i.MX8M: romapi: refactor saving the bootrom log Marco Felsch
2024-01-11 11:48 ` [PATCH 05/18] ARM: i.MX8M: scratch: add optee_hdr area Marco Felsch
2024-01-11 11:48 ` [PATCH 06/18] common: limit BOOTM_OPTEE to 32bit systems Marco Felsch
2024-01-11 11:48 ` [PATCH 07/18] common: add OPTEE_SHM_SIZE to configure optee shared memory Marco Felsch
2024-01-11 13:24   ` Marco Felsch
2024-01-11 11:48 ` [PATCH 08/18] optee: add support to verify 64-bit headers as well Marco Felsch
2024-01-11 11:48 ` [PATCH 09/18] optee: add header version check Marco Felsch
2024-01-11 11:48 ` [PATCH 10/18] optee: add helper functions to set/get the optee memory base Marco Felsch
2024-01-11 11:48 ` [PATCH 11/18] optee: optee_verify_header: constify optee_header Marco Felsch
2024-01-11 11:48 ` [PATCH 12/18] ARM64: mmu: add dynamic optee memory mapping support Marco Felsch
2024-01-11 12:07   ` Ahmad Fatoum
2024-01-11 12:14     ` Marco Felsch [this message]
2024-01-11 15:25       ` Ahmad Fatoum
2024-01-11 11:48 ` [PATCH 13/18] ARM: i.MX8M: add dynamic optee memory of-fixup support Marco Felsch
2024-01-11 11:48 ` [PATCH 14/18] drivers: tee: optee: add support for dynamic optee memory base address Marco Felsch
2024-01-11 11:48 ` [PATCH 15/18] ARM: i.MX8M: atf: add support for optee hdr parsing Marco Felsch
2024-01-11 11:48 ` [PATCH 16/18] ARM: i.MX8M: allow board code to configure the bl33 loadaddr Marco Felsch
2024-01-11 11:48 ` [PATCH 17/18] ARM: i.MX8M: cleanup MX8M*_ATF_BL33_BASE_ADDR defines Marco Felsch
2024-01-11 11:48 ` [PATCH 18/18] ARM: i.MX8M: fix optee of-fixup logic Marco Felsch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240111121423.s5rul7u4v7yrv3ed@pengutronix.de \
    --to=m.felsch@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox