From: Patrick Delaunay <patrick.delaunay@foss.st.com>
To: u-boot@lists.denx.de
Subject: [PATCH 1/8] stm32mp: update MMU config before the relocation
Date: Fri, 5 Feb 2021 13:53:32 +0100 [thread overview]
Message-ID: <20210205135332.1.Id05ed63c4c424d0307d757026ab2f22621b5481b@changeid> (raw)
In-Reply-To: <20210205125339.24721-1-patrick.delaunay@foss.st.com>
Mark the top of ram, used for relocated U-Boot as a normal memory
(cacheable and executable) to avoid permission access issue when
U-Boot jumps to this relocated code.
When MMU is activated in pre-reloc stage; only the beginning of
DDR is marked executable.
This patch avoids access issue when DACR is correctly managed.
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
---
arch/arm/mach-stm32mp/dram_init.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-stm32mp/dram_init.c b/arch/arm/mach-stm32mp/dram_init.c
index 32b177bb79..5fc8c6e15d 100644
--- a/arch/arm/mach-stm32mp/dram_init.c
+++ b/arch/arm/mach-stm32mp/dram_init.c
@@ -12,6 +12,7 @@
#include <lmb.h>
#include <log.h>
#include <ram.h>
+#include <asm/system.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -40,6 +41,7 @@ int dram_init(void)
ulong board_get_usable_ram_top(ulong total_size)
{
+ phys_size_t size;
phys_addr_t reg;
struct lmb lmb;
@@ -47,10 +49,13 @@ ulong board_get_usable_ram_top(ulong total_size)
lmb_init(&lmb);
lmb_add(&lmb, gd->ram_base, gd->ram_size);
boot_fdt_add_mem_rsv_regions(&lmb, (void *)gd->fdt_blob);
- reg = lmb_alloc(&lmb, CONFIG_SYS_MALLOC_LEN + total_size, SZ_4K);
+ size = ALIGN(CONFIG_SYS_MALLOC_LEN + total_size, MMU_SECTION_SIZE),
+ reg = lmb_alloc(&lmb, size, MMU_SECTION_SIZE);
- if (reg)
- return ALIGN(reg + CONFIG_SYS_MALLOC_LEN + total_size, SZ_4K);
+ if (!reg)
+ reg = gd->ram_top - size;
- return gd->ram_top;
+ mmu_set_region_dcache_behaviour(reg, size, DCACHE_DEFAULT_OPTION);
+
+ return reg + size;
}
--
2.17.1
next prev parent reply other threads:[~2021-02-05 12:53 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 12:53 [PATCH 0/8] Patrick Delaunay
2021-02-05 12:53 ` Patrick Delaunay [this message]
2021-03-03 19:08 ` [PATCH 1/8] stm32mp: update MMU config before the relocation Tom Rini
2021-02-05 12:53 ` [PATCH 2/8] stm32mp: update the mmu configuration for SPL and prereloc Patrick Delaunay
2021-03-03 19:08 ` Tom Rini
2021-02-05 12:53 ` [PATCH 3/8] arm: remove TTB_SECT_XN_MASK in DCACHE_WRITETHROUGH Patrick Delaunay
2021-03-03 19:08 ` Tom Rini
2021-02-05 12:53 ` [PATCH 4/8] arm: cosmetic: align TTB_SECT define value Patrick Delaunay
2021-03-03 19:09 ` Tom Rini
2021-02-05 12:53 ` [PATCH 5/8] arm: cp15: update DACR value to activate access control Patrick Delaunay
2021-03-03 19:09 ` Tom Rini
2021-02-05 12:53 ` [PATCH 6/8] arm: omap2: remove arm_init_domains Patrick Delaunay
2021-03-03 19:09 ` Tom Rini
2021-02-05 12:53 ` [PATCH 7/8] arm: cp15: remove weak function arm_init_domains Patrick Delaunay
2021-03-03 19:09 ` Tom Rini
2021-02-05 12:53 ` [PATCH 8/8] arm: remove set_dacr/get_dacr functions Patrick Delaunay
2021-03-03 19:09 ` Tom Rini
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=20210205135332.1.Id05ed63c4c424d0307d757026ab2f22621b5481b@changeid \
--to=patrick.delaunay@foss.st.com \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.