mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 10/28] ARM: mmu: Share code for initial flat mapping creation
Date: Tue,  8 May 2018 14:29:33 -0700	[thread overview]
Message-ID: <20180508212951.6446-11-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180508212951.6446-1-andrew.smirnov@gmail.com>

Code creating inital 4GiB flat mapping is identical between mmu.c and
mmu-early.c, so move it to mmu.h and share.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 arch/arm/cpu/mmu-early.c |  4 +---
 arch/arm/cpu/mmu.c       |  6 +-----
 arch/arm/cpu/mmu.h       | 10 ++++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c
index 136b33c3a..1ff48d1da 100644
--- a/arch/arm/cpu/mmu-early.c
+++ b/arch/arm/cpu/mmu-early.c
@@ -5,7 +5,6 @@
 #include <asm/memory.h>
 #include <asm/system.h>
 #include <asm/cache.h>
-#include <asm/pgtable.h>
 
 #include "mmu.h"
 
@@ -30,8 +29,7 @@ void mmu_early_enable(unsigned long membase, unsigned long memsize,
 	set_ttbr(ttb);
 	set_domain(DOMAIN_MANAGER);
 
-	create_sections(ttb, 0, SZ_4G, PMD_SECT_AP_WRITE |
-			PMD_SECT_AP_READ | PMD_TYPE_SECT);
+	create_flat_mapping(ttb);
 
 	map_cachable(membase, memsize);
 
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index f02c99f65..5600cfbe2 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -27,14 +27,12 @@
 #include <asm/barebox-arm.h>
 #include <asm/system.h>
 #include <asm/cache.h>
-#include <asm/pgtable.h>
 #include <memory.h>
 #include <asm/system_info.h>
 #include <asm/sections.h>
 
 #include "mmu.h"
 
-#define PMD_SECT_DEF_UNCACHED (PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | PMD_TYPE_SECT)
 #define PMD_SECT_DEF_CACHED (PMD_SECT_WB | PMD_SECT_DEF_UNCACHED)
 
 static uint32_t *ttb;
@@ -459,9 +457,7 @@ static int mmu_init(void)
 	set_ttbr(ttb);
 	set_domain(DOMAIN_MANAGER);
 
-	/* create a flat mapping using 1MiB sections */
-	create_sections(ttb, 0, SZ_4G, PMD_SECT_AP_WRITE | PMD_SECT_AP_READ |
-			PMD_TYPE_SECT);
+	create_flat_mapping(ttb);
 	__mmu_cache_flush();
 
 	vectors_init();
diff --git a/arch/arm/cpu/mmu.h b/arch/arm/cpu/mmu.h
index d87d82c1c..659bcfffd 100644
--- a/arch/arm/cpu/mmu.h
+++ b/arch/arm/cpu/mmu.h
@@ -1,6 +1,9 @@
 #ifndef __ARM_MMU_H
 #define __ARM_MMU_H
 
+#include <asm/pgtable.h>
+#include <linux/sizes.h>
+
 #ifdef CONFIG_MMU
 void __mmu_cache_on(void);
 void __mmu_cache_off(void);
@@ -36,5 +39,12 @@ create_sections(uint32_t *ttb, unsigned long addr,
 		ttb[i] = addr | flags;
 }
 
+#define PMD_SECT_DEF_UNCACHED (PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | PMD_TYPE_SECT)
+
+static inline void create_flat_mapping(uint32_t *ttb)
+{
+	/* create a flat mapping using 1MiB sections */
+	create_sections(ttb, 0, SZ_4G, PMD_SECT_DEF_UNCACHED);
+}
 
 #endif /* __ARM_MMU_H */
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-05-08 21:30 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08 21:29 [PATCH 00/28] ARM MMU code improvements and on-demand PTE allocation Andrey Smirnov
2018-05-08 21:29 ` [PATCH 01/28] ARM: mmu: Remove unused ARM_VECTORS_SIZE Andrey Smirnov
2018-05-08 21:29 ` [PATCH 02/28] ARM: mmu: Make use of IS_ALIGNED in arm_mmu_remap_sdram() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 03/28] ARM: mmu: Use ALIGN and ALIGN_DOWN in map_cachable() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 04/28] ARM: mmu: Introduce set_ttbr() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 05/28] ARM: mmu: Introduce set_domain() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 06/28] ARM: mmu: Share code for create_sections() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 07/28] ARM: mmu: Separate index and address in create_sections() Andrey Smirnov
2018-05-14  6:47   ` Sascha Hauer
2018-05-15  5:41     ` Andrey Smirnov
2018-05-08 21:29 ` [PATCH 08/28] sizes.h: Sync with Linux 4.16 Andrey Smirnov
2018-05-08 21:29 ` [PATCH 09/28] ARM: mmu: Specify size in bytes in create_sections() Andrey Smirnov
2018-05-14  6:52   ` Sascha Hauer
2018-05-15  5:42     ` Andrey Smirnov
2018-05-08 21:29 ` Andrey Smirnov [this message]
2018-05-08 21:29 ` [PATCH 11/28] ARM: mmu: Share PMD_SECT_DEF_CACHED Andrey Smirnov
2018-05-08 21:29 ` [PATCH 12/28] ARM: mmu: Drop needless shifting in map_io_sections() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 13/28] ARM: mmu: Replace hardcoded shifts with pgd_index() from Linux Andrey Smirnov
2018-05-08 21:29 ` [PATCH 14/28] ARM: mmu: Trivial simplification in arm_mmu_remap_sdram() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 15/28] ARM: mmu: Replace various SZ_1M with PGDIR_SIZE Andrey Smirnov
2018-05-08 21:29 ` [PATCH 16/28] ARM: mmu: Use PAGE_SIZE when specifying size of one page Andrey Smirnov
2018-05-08 21:29 ` [PATCH 17/28] ARM: mmu: Define and use PTRS_PER_PTE Andrey Smirnov
2018-05-08 21:29 ` [PATCH 18/28] ARM: mmu: Use PAGE_SIZE instead of magic right shift by 12 Andrey Smirnov
2018-05-08 21:29 ` [PATCH 19/28] ARM: mmu: Use xmemalign in arm_create_pte() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 20/28] ARM: mmu: Use xmemalign in mmu_init() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 21/28] ARM: mmu: Share code between dma_alloc_*() functions Andrey Smirnov
2018-05-08 21:29 ` [PATCH 22/28] ARM: mmu: Pass PTE flags a parameter to arm_create_pte() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 23/28] ARM: mmu: Make sure that address is 1M aligned in arm_create_pte() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 24/28] ARM: mmu: Use find_pte() to find PTE in create_vector_table() Andrey Smirnov
2018-05-08 21:29 ` [PATCH 25/28] ARM: mmu: Use dma_inv_range() in dma_sync_single_for_cpu() Andrey Smirnov
2018-05-09  8:49   ` Lucas Stach
2018-05-08 21:29 ` [PATCH 26/28] ARM: mmu: Simplify the use of dma_flush_range() Andrey Smirnov
2018-05-09  8:48   ` Lucas Stach
2018-05-14 23:37     ` Andrey Smirnov
2018-05-08 21:29 ` [PATCH 27/28] ARM: mmu: Implement on-demand PTE allocation Andrey Smirnov
2018-05-08 21:29 ` [PATCH 28/28] ARM: mmu: Introduce ARM_TTB_SIZE Andrey Smirnov
2018-05-14  7:06 ` [PATCH 00/28] ARM MMU code improvements and on-demand PTE allocation Sascha Hauer

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=20180508212951.6446-11-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --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