diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2023-05-22 07:28:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-05-23 09:24:52 +0200 |
| commit | 9845563450b88c77710c8b7e19d98b140cb542c4 (patch) | |
| tree | 9c363329dc6f441c8eccf2f1ffc82d1873afeb89 /arch/arm/cpu/mmu_64.c | |
| parent | b53744ffe333db8ee426fe7e5e93eb82a16bd9a9 (diff) | |
| download | barebox-9845563450b88c77710c8b7e19d98b140cb542c4.tar.gz barebox-9845563450b88c77710c8b7e19d98b140cb542c4.tar.xz | |
treewide: use remap_range instead of arch_remap_range
The remapping in arch_remap_range is currently limited to attributes. In
a later commit, we'll start supporting non-1:1 remappings. We'll keep
remap_range as is for 1:1, so as preparation, let's switch all
arch_remap_range users that want 1:1 remappings to remap_range.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20230522052835.1039143-2-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/cpu/mmu_64.c')
| -rw-r--r-- | arch/arm/cpu/mmu_64.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c index 8728c41d99..ef67a1c3a4 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c @@ -201,13 +201,13 @@ void __mmu_init(bool mmu_on) pos = bank->start; for_each_reserved_region(bank, rsv) { - arch_remap_range((void *)resource_first_page(rsv), - resource_count_pages(rsv), MAP_UNCACHED); - arch_remap_range((void *)pos, rsv->start - pos, MAP_CACHED); + remap_range((void *)resource_first_page(rsv), + resource_count_pages(rsv), MAP_UNCACHED); + remap_range((void *)pos, rsv->start - pos, MAP_CACHED); pos = rsv->end + 1; } - arch_remap_range((void *)pos, bank->start + bank->size - pos, MAP_CACHED); + remap_range((void *)pos, bank->start + bank->size - pos, MAP_CACHED); } /* Make zero page faulting to catch NULL pointer derefs */ @@ -257,9 +257,9 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize) memset((void *)ttb, 0, GRANULE_SIZE); - arch_remap_range(0, 1UL << (BITS_PER_VA - 1), MAP_UNCACHED); - arch_remap_range((void *)membase, memsize - OPTEE_SIZE, MAP_CACHED); - arch_remap_range((void *)membase + memsize - OPTEE_SIZE, OPTEE_SIZE, MAP_FAULT); + remap_range(0, 1UL << (BITS_PER_VA - 1), MAP_UNCACHED); + remap_range((void *)membase, memsize - OPTEE_SIZE, MAP_CACHED); + remap_range((void *)membase + memsize - OPTEE_SIZE, OPTEE_SIZE, MAP_FAULT); mmu_enable(); } |