Cortex-A address environment: Fix some section mapping and address increments

3 files changed, 34 insertions, 31 deletions

diff --git a/nuttx/arch/arm/src/armv7-a/arm_addrenv.c b/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
index cd03bddce..8bc649c67 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
@@ -85,6 +85,24 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+/* Configuration */
+
+#if (CONFIG_ARCH_TEXT_VBASE & SECTION_MASK) != 0
+#  error CONFIG_ARCH_TEXT_VBASE not aligned to section boundary
+#endif
+
+#if (CONFIG_ARCH_DATA_VBASE & SECTION_MASK) != 0
+#  error CONFIG_ARCH_DATA_VBASE not aligned to section boundary
+#endif
+
+#if (CONFIG_ARCH_HEAP_VBASE & SECTION_MASK) != 0
+#  error CONFIG_ARCH_HEAP_VBASE not aligned to section boundary
+#endif
+
+#if (CONFIG_ARCH_STACK_VBASE & SECTION_MASK) != 0
+#  error CONFIG_ARCH_STACK_VBASE not aligned to section boundary
+#endif
+
 /* Using a 4KiB page size, each 1MiB section maps to a PTE containing
  * 256*2KiB entries
  */
@@ -126,21 +144,6 @@ static void set_l2_entry(FAR uint32_t *l2table, uintptr_t paddr,
 }
 
 /****************************************************************************
- * Name: set_l1_entry
- *
- * Description:
- *   Set an L1 page table entry to refer to a specific L2 page table.
- *
- ****************************************************************************/
-
-static inline void set_l1_entry(uintptr_t l2vaddr, uintptr_t l2paddr)
-{
-  mmu_l1_setentry(l2paddr & PMD_PTE_PADDR_MASK,
-                  l2vaddr & PMD_PTE_PADDR_MASK,
-                  MMU_L1_PGTABFLAGS);
-}
-
-/****************************************************************************
  * Public Functions
  ****************************************************************************/
 
@@ -227,7 +230,7 @@ int up_addrenv_create(size_t textsize, size_t datasize,
 
       flags = irqsave();
       l1save = mmu_l1_getentry(ARCH_SCRATCH_VBASE);
-      set_l1_entry(ARCH_SCRATCH_VBASE, paddr);
+      mmu_l1_setentry(paddr, ARCH_SCRATCH_VBASE, MMU_MEMFLAGS);
       l2table = (FAR uint32_t *)ARCH_SCRATCH_VBASE;
 
       /* Initialize the page table */
@@ -270,7 +273,7 @@ int up_addrenv_create(size_t textsize, size_t datasize,
 
       flags = irqsave();
       l1save = mmu_l1_getentry(ARCH_SCRATCH_VBASE);
-      set_l1_entry(ARCH_SCRATCH_VBASE, paddr);
+      mmu_l1_setentry(paddr, ARCH_SCRATCH_VBASE, MMU_MEMFLAGS);
       l2table = (FAR uint32_t *)ARCH_SCRATCH_VBASE;
 
       /* Initialize the page table */
@@ -324,7 +327,7 @@ int up_addrenv_destroy(FAR group_addrenv_t *addrenv)
 
   for (vaddr = CONFIG_ARCH_TEXT_VBASE, i = 0;
        i < ARCH_TEXT_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       mmu_l1_clrentry(vaddr);
       if (addrenv->text[i])
@@ -335,7 +338,7 @@ int up_addrenv_destroy(FAR group_addrenv_t *addrenv)
 
   for (vaddr = CONFIG_ARCH_DATA_VBASE, i = 0;
        i < ARCH_DATA_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       mmu_l1_clrentry(vaddr);
       if (addrenv->data[i])
@@ -347,7 +350,7 @@ int up_addrenv_destroy(FAR group_addrenv_t *addrenv)
 #if 0 /* Not yet implemented */
   for (vaddr = CONFIG_ARCH_HEAP_VBASE, i = 0;
        i < ARCH_HEAP_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       mmu_l1_clrentry(vaddr);
       if (addrenv->heap[i])
@@ -456,7 +459,7 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
 
   for (vaddr = CONFIG_ARCH_TEXT_VBASE, i = 0;
        i < ARCH_TEXT_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       /* Save the old L1 page table entry */
 
@@ -470,7 +473,7 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
       paddr = (uintptr_t)addrenv->text[i];
       if (paddr)
         {
-          set_l1_entry(vaddr, paddr);
+          mmu_l1_setentry(paddr, vaddr, MMU_L1_PGTABFLAGS);
         }
       else
         {
@@ -480,7 +483,7 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
 
   for (vaddr = CONFIG_ARCH_DATA_VBASE, i = 0;
        i < ARCH_DATA_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       /* Save the old L1 page table entry */
 
@@ -494,7 +497,7 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
       paddr = (uintptr_t)addrenv->data[i];
       if (paddr)
         {
-          set_l1_entry(vaddr, paddr);
+          mmu_l1_setentry(paddr, vaddr, MMU_L1_PGTABFLAGS);
         }
       else
         {
@@ -505,7 +508,7 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
 #if 0 /* Not yet implemented */
   for (vaddr = CONFIG_ARCH_HEAP_VBASE, i = 0;
        i < ARCH_HEAP_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       /* Save the old L1 page table entry */
 
@@ -519,7 +522,7 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
       paddr = (uintptr_t)addrenv->heap[i];
       if (paddr)
         {
-          set_l1_entry(vaddr, paddr);
+          mmu_l1_setentry(paddr, vaddr, MMU_L1_PGTABFLAGS);
         }
       else
         {
@@ -557,7 +560,7 @@ int up_addrenv_restore(FAR const save_addrenv_t *oldenv)
 
   for (vaddr = CONFIG_ARCH_TEXT_VBASE, i = 0;
        i < ARCH_TEXT_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       /* Restore the L1 page table entry */
 
@@ -566,7 +569,7 @@ int up_addrenv_restore(FAR const save_addrenv_t *oldenv)
 
   for (vaddr = CONFIG_ARCH_DATA_VBASE, i = 0;
        i < ARCH_DATA_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       /* Restore the L1 page table entry */
 
@@ -576,7 +579,7 @@ int up_addrenv_restore(FAR const save_addrenv_t *oldenv)
 #if 0 /* Not yet implemented */
   for (vaddr = CONFIG_ARCH_HEAP_VBASE, i = 0;
        i < ARCH_HEAP_NSECTS;
-       vaddr += MM_PGSIZE, i++)
+       vaddr += SECTION_SIZE, i++)
     {
       /* Restore the L1 page table entry */
 
diff --git a/nuttx/arch/arm/src/armv7-a/mmu.h b/nuttx/arch/arm/src/armv7-a/mmu.h
index 8c5819553..84fa18a50 100644
--- a/nuttx/arch/arm/src/armv7-a/mmu.h
+++ b/nuttx/arch/arm/src/armv7-a/mmu.h
@@ -562,6 +562,7 @@
 /* Mapped section size */
 
 #define SECTION_SIZE          (1 << 20)   /* 1Mb */
+#define SECTION_MASK          (SECTION_SIZE - 1)
 
 /* The Cortex-A5 supports two translation table base address registers.  In
  * this, implementation, only Translation Table Base Register 0 (TTBR0) is
diff --git a/nuttx/binfmt/libelf/libelf_bind.c b/nuttx/binfmt/libelf/libelf_bind.c
index 4b54bd01d..d046b7a7b 100644
--- a/nuttx/binfmt/libelf/libelf_bind.c
+++ b/nuttx/binfmt/libelf/libelf_bind.c
@@ -326,7 +326,7 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo,
 #ifdef CONFIG_ARCH_HAVE_COHERENT_DCACHE
   /* Ensure that the I and D caches are coherent before starting the newly
    * loaded module by cleaning the D cache (i.e., flushing the D cache
-   * contents to memory and invalidating the I cache.
+   * contents to memory and invalidating the I cache).
    */
 
   up_coherent_dcache(loadinfo->textalloc, loadinfo->textsize);
@@ -334,4 +334,3 @@ int elf_bind(FAR struct elf_loadinfo_s *loadinfo,
 
   return ret;
 }
-