Seeing

        create_sections(ttb, 0, PAGE_SIZE, ...);

as the code the creates initial flat 4 GiB mapping is a bit less
intuitive then

        create_sections(ttb, 0, SZ_4G - 1, ...);

so, for the sake of clarification, convert create_sections() to accept
address of the last byte in the region instead of size in MiB. Note
the alternative of converting size to units of bytes was not chosen to
avoid converting 3-rd function argument into a 64-bit number.

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

diff --git a/arch/arm/cpu/mmu-early.c b/arch/arm/cpu/mmu-early.c
index 70ece0d2f..b10aa6fde 100644
--- a/arch/arm/cpu/mmu-early.c
+++ b/arch/arm/cpu/mmu-early.c
@@ -16,7 +16,7 @@ static void map_cachable(unsigned long start, unsigned long 
size)
        start = ALIGN_DOWN(start, SZ_1M);
        size  = ALIGN(size, SZ_1M);
 
-       create_sections(ttb, start, size >> 20, PMD_SECT_AP_WRITE |
+       create_sections(ttb, start, start + size - 1, PMD_SECT_AP_WRITE |
                        PMD_SECT_AP_READ | PMD_TYPE_SECT | PMD_SECT_WB);
 }
 
@@ -30,7 +30,7 @@ void mmu_early_enable(unsigned long membase, unsigned long 
memsize,
        set_ttbr(ttb);
        set_domain(DOMAIN_MANAGER);
 
-       create_sections(ttb, 0, 4096, PMD_SECT_AP_WRITE |
+       create_sections(ttb, 0, SZ_4G - 1, PMD_SECT_AP_WRITE |
                        PMD_SECT_AP_READ | PMD_TYPE_SECT);
 
        map_cachable(membase, memsize);
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index 2289a19c5..a9a5f2f8c 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -460,7 +460,7 @@ static int mmu_init(void)
        set_domain(DOMAIN_MANAGER);
 
        /* create a flat mapping using 1MiB sections */
-       create_sections(ttb, 0, PAGE_SIZE, PMD_SECT_AP_WRITE | PMD_SECT_AP_READ 
|
+       create_sections(ttb, 0, SZ_4G - 1, PMD_SECT_AP_WRITE | PMD_SECT_AP_READ 
|
                        PMD_TYPE_SECT);
        __mmu_cache_flush();
 
@@ -472,7 +472,7 @@ static int mmu_init(void)
         * below
         */
        for_each_memory_bank(bank) {
-               create_sections(ttb, bank->start, bank->size >> 20,
+               create_sections(ttb, bank->start, bank->start + bank->size - 1,
                                PMD_SECT_DEF_CACHED);
                __mmu_cache_flush();
        }
diff --git a/arch/arm/cpu/mmu.h b/arch/arm/cpu/mmu.h
index 56e78c715..fa01cbe4e 100644
--- a/arch/arm/cpu/mmu.h
+++ b/arch/arm/cpu/mmu.h
@@ -27,12 +27,12 @@ static inline void set_domain(unsigned val)
 }
 
 static inline void
-create_sections(uint32_t *ttb, unsigned long addr,
-               int size_m, unsigned int flags)
+create_sections(uint32_t *ttb, unsigned long first,
+               unsigned long last, unsigned int flags)
 {
-       unsigned long ttb_start = addr >> 20;
-       unsigned long ttb_end = ttb_start + size_m;
-       unsigned int i;
+       unsigned long ttb_start = first >> 20;
+       unsigned long ttb_end = (last >> 20) + 1;
+       unsigned int i, addr = first;
 
        for (i = ttb_start; i < ttb_end; i++) {
                ttb[i] = addr | flags;
-- 
2.17.0


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

Reply via email to