From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH v2 7/8] ARM: mmu-early: map no-map entries XN & uncached
Date: Tue, 3 Aug 2021 11:44:17 +0200 [thread overview]
Message-ID: <20210803094418.475609-8-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20210803094418.475609-1-r.czerwinski@pengutronix.de>
Ensure that reserved map entries with the no-map flag are marked as
uncached and non-execute during the early MMU initialization.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/cpu/mmu-early.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c
index b985aa455f..9c3f01326b 100644
--- a/arch/arm/cpu/mmu-early.c
+++ b/arch/arm/cpu/mmu-early.c
@@ -3,9 +3,11 @@
#include <errno.h>
#include <linux/sizes.h>
#include <asm/memory.h>
+#include <asm-generic/memory_layout.h>
#include <asm/system.h>
#include <asm/cache.h>
#include <asm-generic/sections.h>
+#include <pbl.h>
#include "mmu.h"
@@ -24,7 +26,10 @@ static inline void map_region(unsigned long start, unsigned long size,
void mmu_early_enable(unsigned long membase, unsigned long memsize,
unsigned long _ttb)
{
+ const struct pbl_reserved_memory *res_mem;
+ int i;
ttb = (uint32_t *)_ttb;
+ res_mem = get_pbl_reserved_memory();
arm_set_cache_functions();
@@ -58,6 +63,14 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize,
/* maps main memory as cachable */
map_region(membase, memsize, PMD_SECT_DEF_CACHED);
+ for (i = 0; i < get_pbl_reserved_memory_num(); i++) {
+ if (res_mem->flags & FDT_RES_MEM_FLAG_NOMAP)
+ map_region(res_mem->base, res_mem->size,
+ PMD_SECT_DEF_UNCACHED | PMD_SECT_XN);
+ res_mem++;
+ }
+
+
/*
* 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.
--
2.32.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-08-03 9:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-03 9:44 [PATCH v2 0/8] XN Support for reserved-memory areas Rouven Czerwinski
2021-08-03 9:44 ` [PATCH v2 1/8] of: reserve: add xn flag mem entries Rouven Czerwinski
2021-08-05 13:54 ` Ahmad Fatoum
2021-08-09 18:26 ` Sascha Hauer
2021-08-03 9:44 ` [PATCH v2 2/8] of: add of_get_reserve_map stub for !CONFIG_OFTREE Rouven Czerwinski
2021-08-05 13:55 ` Ahmad Fatoum
2021-08-03 9:44 ` [PATCH v2 3/8] ARM: mmu: use reserve mem entries to modify maps Rouven Czerwinski
2021-08-05 14:06 ` Ahmad Fatoum
2021-08-09 18:30 ` Sascha Hauer
2021-08-24 7:09 ` Ahmad Fatoum
2021-08-03 9:44 ` [PATCH v2 4/8] of: add flag to not create resmem DT entries Rouven Czerwinski
2021-08-05 14:09 ` Ahmad Fatoum
2021-08-03 9:44 ` [PATCH v2 5/8] of: add reserved_mem_read initcall Rouven Czerwinski
2021-08-05 14:14 ` Ahmad Fatoum
2021-08-03 9:44 ` [PATCH v2 6/8] pbl: fdt: add support to parse reserved mem Rouven Czerwinski
2021-08-05 14:20 ` Ahmad Fatoum
2021-08-03 9:44 ` Rouven Czerwinski [this message]
2021-08-05 14:24 ` [PATCH v2 7/8] ARM: mmu-early: map no-map entries XN & uncached Ahmad Fatoum
2021-08-03 9:44 ` [PATCH v2 8/8] PBL: enable LIBFDT for OP-TEE early loading Rouven Czerwinski
2021-08-05 13:53 ` Ahmad Fatoum
2021-08-24 6:47 ` Rouven Czerwinski
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=20210803094418.475609-8-r.czerwinski@pengutronix.de \
--to=r.czerwinski@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