From 38b62d07a6109f7e00714316afbe2aead8c3dfa3 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Fri, 8 Nov 2019 09:25:39 +0100 Subject: ARM: mmu-early: On i.MX6 with HAB map ROM is mapped without XN On i.MX6 with HAB enabled we call into the ROM later in imx6_hab_get_status(). This only works when the XN bit is not set for this area, so remap the first MiB as cached which doesn't have the XN bit set. Signed-off-by: Sascha Hauer --- arch/arm/cpu/mmu-early.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c index 7c30526b94..b985aa455f 100644 --- a/arch/arm/cpu/mmu-early.c +++ b/arch/arm/cpu/mmu-early.c @@ -58,5 +58,12 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize, /* maps main memory as cachable */ map_region(membase, memsize, PMD_SECT_DEF_CACHED); + /* + * With HAB enabled we call into the ROM code later in imx6_hab_get_status(). + * Map the ROM cached which has the effect that the XN bit is not set. + */ + if (IS_ENABLED(CONFIG_HABV4) && IS_ENABLED(CONFIG_ARCH_IMX6)) + map_region(0x0, SZ_1M, PMD_SECT_DEF_CACHED); + __mmu_cache_on(); } -- cgit v1.2.3