From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH v3 13/28] ARM: mmu: Replace hardcoded shifts with pgd_index() from Linux
Date: Thu, 17 May 2018 13:58:22 -0700 [thread overview]
Message-ID: <20180517205837.32421-14-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180517205837.32421-1-andrew.smirnov@gmail.com>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/cpu/mmu.c | 12 ++++++------
arch/arm/cpu/mmu.h | 8 ++++++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index 06c9045b7..1dbfcee16 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -96,7 +96,7 @@ static u32 *arm_create_pte(unsigned long virt)
if (!ttb)
arm_mmu_not_initialized_error();
- ttb[virt >> 20] = (unsigned long)table | PMD_TYPE_TABLE;
+ ttb[pgd_index(virt)] = (unsigned long)table | PMD_TYPE_TABLE;
for (i = 0; i < 256; i++) {
table[i] = virt | PTE_TYPE_SMALL | pte_flags_uncached;
@@ -113,7 +113,7 @@ static u32 *find_pte(unsigned long adr)
if (!ttb)
arm_mmu_not_initialized_error();
- if ((ttb[adr >> 20] & PMD_TYPE_MASK) != PMD_TYPE_TABLE) {
+ if ((ttb[pgd_index(adr)] & PMD_TYPE_MASK) != PMD_TYPE_TABLE) {
struct memory_bank *bank;
int i = 0;
@@ -132,7 +132,7 @@ static u32 *find_pte(unsigned long adr)
}
/* find the coarse page table base address */
- table = (u32 *)(ttb[adr >> 20] & ~0x3ff);
+ table = (u32 *)(ttb[pgd_index(adr)] & ~0x3ff);
/* find second level descriptor */
return &table[(adr >> PAGE_SHIFT) & 0xff];
@@ -197,7 +197,7 @@ void *map_io_sections(unsigned long phys, void *_start, size_t size)
unsigned long start = (unsigned long)_start, sec;
for (sec = start; sec < start + size; sec += (1 << 20), phys += SZ_1M)
- ttb[sec >> 20] = phys | PMD_SECT_DEF_UNCACHED;
+ ttb[pgd_index(sec)] = phys | PMD_SECT_DEF_UNCACHED;
dma_flush_range((unsigned long)ttb, (unsigned long)ttb + 0x4000);
tlb_invalidate();
@@ -211,8 +211,8 @@ void *map_io_sections(unsigned long phys, void *_start, size_t size)
static int arm_mmu_remap_sdram(struct memory_bank *bank)
{
unsigned long phys = (unsigned long)bank->start;
- unsigned long ttb_start = phys >> 20;
- unsigned long ttb_end = (phys >> 20) + (bank->size >> 20);
+ unsigned long ttb_start = pgd_index(phys);
+ unsigned long ttb_end = pgd_index(phys) + pgd_index(bank->size);
unsigned long num_ptes = bank->size >> 12;
int i, pte;
u32 *ptes;
diff --git a/arch/arm/cpu/mmu.h b/arch/arm/cpu/mmu.h
index efe4091c6..4f6ab2e71 100644
--- a/arch/arm/cpu/mmu.h
+++ b/arch/arm/cpu/mmu.h
@@ -4,6 +4,10 @@
#include <asm/pgtable.h>
#include <linux/sizes.h>
+#define PGDIR_SHIFT 20
+
+#define pgd_index(addr) ((addr) >> PGDIR_SHIFT)
+
#ifdef CONFIG_MMU
void __mmu_cache_on(void);
void __mmu_cache_off(void);
@@ -31,8 +35,8 @@ static inline void
create_sections(uint32_t *ttb, unsigned long first,
unsigned long last, unsigned int flags)
{
- unsigned long ttb_start = first >> 20;
- unsigned long ttb_end = (last >> 20) + 1;
+ unsigned long ttb_start = pgd_index(first);
+ unsigned long ttb_end = pgd_index(last) + 1;
unsigned int i, addr = first;
for (i = ttb_start; i < ttb_end; i++) {
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-05-17 21:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-17 20:58 [PATCH v3 00/28] ARM MMU code improvements and on-demand PTE allocation Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 01/28] ARM: mmu: Remove unused ARM_VECTORS_SIZE Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 02/28] ARM: mmu: Make use of IS_ALIGNED in arm_mmu_remap_sdram() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 03/28] ARM: mmu: Use ALIGN and ALIGN_DOWN in map_cachable() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 04/28] ARM: mmu: Introduce set_ttbr() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 05/28] ARM: mmu: Introduce set_domain() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 06/28] ARM: mmu: Share code for create_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 07/28] ARM: mmu: Separate index and address in create_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 08/28] sizes.h: Sync with Linux 4.16 Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 09/28] ARM: mmu: Specify size in bytes in create_sections() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 10/28] ARM: mmu: Share code for initial flat mapping creation Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 11/28] ARM: mmu: Share PMD_SECT_DEF_CACHED Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 12/28] ARM: mmu: Drop needless shifting in map_io_sections() Andrey Smirnov
2018-05-17 20:58 ` Andrey Smirnov [this message]
2018-05-17 20:58 ` [PATCH v3 14/28] ARM: mmu: Trivial simplification in arm_mmu_remap_sdram() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 15/28] ARM: mmu: Replace various SZ_1M with PGDIR_SIZE Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 16/28] ARM: mmu: Use PAGE_SIZE when specifying size of one page Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 17/28] ARM: mmu: Define and use PTRS_PER_PTE Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 18/28] ARM: mmu: Use PAGE_SIZE instead of magic right shift by 12 Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 19/28] ARM: mmu: Use xmemalign in arm_create_pte() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 20/28] ARM: mmu: Use xmemalign in mmu_init() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 21/28] ARM: mmu: Share code between dma_alloc_*() functions Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 22/28] ARM: mmu: Pass PTE flags a parameter to arm_create_pte() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 23/28] ARM: mmu: Make sure that address is 1M aligned in arm_create_pte() Andrey Smirnov
2018-05-18 20:23 ` Sam Ravnborg
2018-05-21 19:12 ` Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 24/28] ARM: mmu: Use find_pte() to find PTE in create_vector_table() Andrey Smirnov
2018-05-18 20:41 ` Sam Ravnborg
2018-05-18 23:30 ` Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 25/28] ARM: mmu: Use dma_inv_range() in dma_sync_single_for_cpu() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 26/28] ARM: mmu: Simplify the use of dma_flush_range() Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 27/28] ARM: mmu: Implement on-demand PTE allocation Andrey Smirnov
2018-05-17 20:58 ` [PATCH v3 28/28] ARM: mmu: Introduce ARM_TTB_SIZE Andrey Smirnov
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=20180517205837.32421-14-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