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 05/28] ARM: mmu: Introduce set_domain()
Date: Tue,  8 May 2018 14:29:28 -0700	[thread overview]
Message-ID: <20180508212951.6446-6-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180508212951.6446-1-andrew.smirnov@gmail.com>

Port set_domain() form Linux kernel and share it between regular and
early MMU code to avoid duplication.

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

diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c
index 79fc3080a..f75cc7e4a 100644
--- a/arch/arm/cpu/mmu-early.c
+++ b/arch/arm/cpu/mmu-early.c
@@ -33,17 +33,12 @@ static void map_cachable(unsigned long start, unsigned long size)
 void mmu_early_enable(unsigned long membase, unsigned long memsize,
 		      unsigned long _ttb)
 {
-	int i;
-
 	ttb = (uint32_t *)_ttb;
 
 	arm_set_cache_functions();
 
 	set_ttbr(ttb);
-
-	/* Set the Domain Access Control Register */
-	i = 0x3;
-	asm volatile ("mcr  p15,0,%0,c3,c0,0" : : "r"(i) /*:*/);
+	set_domain(DOMAIN_MANAGER);
 
 	create_sections(0, 4096, PMD_SECT_AP_WRITE |
 			PMD_SECT_AP_READ | PMD_TYPE_SECT);
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index 28732b795..7e087d08f 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -422,7 +422,6 @@ static void vectors_init(void)
 static int mmu_init(void)
 {
 	struct memory_bank *bank;
-	int i;
 
 	if (list_empty(&memory_banks))
 		/*
@@ -472,10 +471,7 @@ static int mmu_init(void)
 	pr_debug("ttb: 0x%p\n", ttb);
 
 	set_ttbr(ttb);
-
-	/* Set the Domain Access Control Register */
-	i = 0x3;
-	asm volatile ("mcr  p15,0,%0,c3,c0,0" : : "r"(i) /*:*/);
+	set_domain(DOMAIN_MANAGER);
 
 	/* create a flat mapping using 1MiB sections */
 	create_sections(0, 0, PAGE_SIZE, PMD_SECT_AP_WRITE | PMD_SECT_AP_READ |
diff --git a/arch/arm/cpu/mmu.h b/arch/arm/cpu/mmu.h
index 5dcf4b53a..e71ff8e9a 100644
--- a/arch/arm/cpu/mmu.h
+++ b/arch/arm/cpu/mmu.h
@@ -16,4 +16,13 @@ static inline void set_ttbr(void *ttb)
 	asm volatile ("mcr  p15,0,%0,c2,c0,0" : : "r"(ttb) /*:*/);
 }
 
+#define DOMAIN_MANAGER	3
+
+static inline void set_domain(unsigned val)
+{
+	/* Set the Domain Access Control Register */
+	asm volatile ("mcr  p15,0,%0,c3,c0,0" : : "r"(val) /*:*/);
+}
+
+
 #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 ` Andrey Smirnov [this message]
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 ` [PATCH 10/28] ARM: mmu: Share code for initial flat mapping creation Andrey Smirnov
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-6-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