diff options
-rw-r--r-- | nuttx/Documentation/NuttX.html | 3 | ||||
-rw-r--r-- | nuttx/arch/arm/include/arm/irq.h | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/arm/arm.h | 118 | ||||
-rw-r--r-- | nuttx/arch/arm/src/arm/pg_macros.h | 254 | ||||
-rwxr-xr-x | nuttx/arch/arm/src/arm/up_allocpage.c | 122 | ||||
-rw-r--r-- | nuttx/arch/arm/src/arm/up_head.S | 6 | ||||
-rwxr-xr-x | nuttx/arch/arm/src/arm/up_pginitialize.c | 8 | ||||
-rwxr-xr-x | nuttx/include/nuttx/page.h | 12 |
8 files changed, 457 insertions, 68 deletions
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 7f3f8a3fa..646275895 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: August 18, 2010</p> + <p>Last Updated: August 21, 2010</p> </td> </tr> </table> @@ -1008,6 +1008,7 @@ This port uses the <a href="http://wiki.neurostechnology.com/index.php/Developer_Welcome">Neuros OSD</a> with a GNU arm-elf toolchain* under Linux or Cygwin. + The port was performed using the OSD v1.0, development board. </p> <ul> <p> diff --git a/nuttx/arch/arm/include/arm/irq.h b/nuttx/arch/arm/include/arm/irq.h index 757b96227..65ccd1356 100644 --- a/nuttx/arch/arm/include/arm/irq.h +++ b/nuttx/arch/arm/include/arm/irq.h @@ -164,7 +164,7 @@ struct xcptcontext */ #ifdef CONFIG_PAGING - uint32_t far; + uintptr_t far; #endif }; #endif diff --git a/nuttx/arch/arm/src/arm/arm.h b/nuttx/arch/arm/src/arm/arm.h index 216f61dbe..f87159db4 100644 --- a/nuttx/arch/arm/src/arm/arm.h +++ b/nuttx/arch/arm/src/arm/arm.h @@ -282,6 +282,124 @@ #ifndef __ASSEMBLY__ +/* ARMv4/ARMv5 operation: Invalidate TLB + * ARM926EJ-S operation: Invalidate set-associative + * Data: Should be zero + */ + +static inline void tlb_invalidate(void) +{ + unsigned int sbz = 0; + __asm__ __volatile__ + ( + "\tmcr p15, 0, %0, c8, c7, 0" + : + : "r" (sbz) + : "memory"); +} + +/* ARMv4/ARMv5 operation: Invalidate TLB single entry (MVA) + * ARM926EJ-S operation: Invalidate single entry + * Data: MVA + */ + +static inline void tlb_invalidate_single(unsigned int mva) +{ + mva &= 0xfffffc00; + __asm__ __volatile__ + ( + "mcr p15, 0, %0, c8, c7, 1" + : + : "r" (mva) + : "memory"); +} + +/* ARMv4/ARMv5 operation: Invalidate instruction TLB + * ARM926EJ-S operation: Invalidate set-associative TLB + * Data: Should be zero + */ + +static inline void tlb_instr_invalidate(void) +{ + unsigned int sbz = 0; + __asm__ __volatile__ + ( + "\tmcr p15, 0, %0, c8, c5, 0" + : + : "r" (sbz) + : "memory"); +} + +/* ARMv4/ARMv5 operation: Invalidate instruction TLB single entry (MVA) + * ARM926EJ-S operation: Invalidate single entry + * Data: MVA + */ + +static inline void tlb_inst_invalidate_single(unsigned int mva) +{ + mva &= 0xfffffc00; + __asm__ __volatile__ + ( + "mcr p15, 0, %0, c8, c5, 1" + : + : "r" (mva) + : "memory"); +} + +/* ARMv4/ARMv5 operation: Invalidate data TLB + * ARM926EJ-S operation: Invalidate set-associative TLB + * Data: Should be zero + */ + +static inline void tlb_data_invalidate(void) +{ + unsigned int sbz = 0; + __asm__ __volatile__ + ( + "\tmcr p15, 0, %0, c8, c6, 0" + : + : "r" (sbz) + : "memory"); +} + +/* ARMv4/ARMv5 operation: Invalidate data TLB single entry (MVA) + * ARM926EJ-S operation: Invalidate single entry + * Data: MVA + */ + +static inline void tlb_data_invalidate_single(unsigned int mva) +{ + mva &= 0xfffffc00; + __asm__ __volatile__ + ( + "mcr p15, 0, %0, c8, c6, 1" + : + : "r" (mva) + : "memory"); +} + +#endif /* __ASSEMBLY__ */ + +/**************************************************************************** + * Public Variables + ****************************************************************************/ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifndef __ASSEMBLY__ +#ifdef __cplusplus +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +#undef EXTERN +#ifdef __cplusplus +} +#endif #endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_SRC_COMMON_ARM_H */ diff --git a/nuttx/arch/arm/src/arm/pg_macros.h b/nuttx/arch/arm/src/arm/pg_macros.h index 4c69ca12d..9d564e8a8 100644 --- a/nuttx/arch/arm/src/arm/pg_macros.h +++ b/nuttx/arch/arm/src/arm/pg_macros.h @@ -52,69 +52,94 @@ /* Configuration ************************************************************/ #ifdef CONFIG_PAGING - /* Sanity check -- we cannot be using a ROM page table and supporting on- - * demand paging. - */ -# ifdef CONFIG_ARCH_ROMPGTABLE -# error "Cannot support both CONFIG_PAGING and CONFIG_ARCH_ROMPGTABLE" -# endif - /* Page Size Selections ***************************************************/ +/* Sanity check -- we cannot be using a ROM page table and supporting on- + * demand paging. + */ + +#ifdef CONFIG_ARCH_ROMPGTABLE +# error "Cannot support both CONFIG_PAGING and CONFIG_ARCH_ROMPGTABLE" +#endif + +/* Page Size Selections *****************************************************/ + +/* Create some friendly definitions to handle some differences between + * small and tiny pages. + */ - /* Create some friendly definitions to handle some differences between - * small and tiny pages. - */ +#if CONFIG_PAGING_PAGESIZE == 1024 -# if CONFIG_PAGING_PAGESIZE == 1024 + /* Number of pages in an L2 table per L1 entry */ - /* Number of pages in an L2 table per L1 entry */ +# define PTE_NPAGES PTE_TINY_NPAGES -# define PTE_NPAGES PTE_TINY_NPAGES + /* L2 Page table address */ - /* L2 Page table address */ +# define PG_L2_BASE_PADDR PGTABLE_FINE_BASE_PADDR +# define PG_L2_BASE_VADDR PGTABLE_FINE_BASE_VADDR -# define PG_L2_BASE_PADDR PGTABLE_FINE_BASE_PADDR -# define PG_L2_BASE_VADDR PGTABLE_FINE_BASE_VADDR + /* MMU Flags for each memory region */ - /* MMU Flags for each memory region */ +# define MMU_L1_TEXTFLAGS (PMD_TYPE_FINE|PMD_BIT4) +# define MMU_L2_TEXTFLAGS (PTE_TYPE_TINY|PTE_EXT_AP_UNO_SRO|PTE_CACHEABLE) +# define MMU_L1_DATAFLAGS (PMD_TYPE_FINE|PMD_BIT4) +# define MMU_L2_DATAFLAGS (PTE_TYPE_TINY|PTE_EXT_AP_UNO_SRW|PTE_CACHEABLE|PTE_BUFFERABLE) +# define MMU_L1_PGTABFLAGS (PMD_TYPE_FINE|PMD_BIT4) +# define MMU_L2_PGTABFLAGS (PTE_TYPE_TINY|PTE_EXT_AP_UNO_SRW) -# define MMU_L1_TEXTFLAGS (PMD_TYPE_FINE|PMD_BIT4) -# define MMU_L2_TEXTFLAGS (PTE_TYPE_TINY|PTE_EXT_AP_UNO_SRO|PTE_CACHEABLE) -# define MMU_L1_DATAFLAGS (PMD_TYPE_FINE|PMD_BIT4) -# define MMU_L2_DATAFLAGS (PTE_TYPE_TINY|PTE_EXT_AP_UNO_SRW|PTE_CACHEABLE|PTE_BUFFERABLE) -# define MMU_L1_PGTABFLAGS (PMD_TYPE_FINE|PMD_BIT4) -# define MMU_L2_PGTABFLAGS (PTE_TYPE_TINY|PTE_EXT_AP_UNO_SRW) +#elif CONFIG_PAGING_PAGESIZE == 4096 -# elif CONFIG_PAGING_PAGESIZE == 4096 + /* Number of pages in an L2 table per L1 entry */ - /* Number of pages in an L2 table per L1 entry */ +# define PTE_NPAGES PTE_SMALL_NPAGES -# define PTE_NPAGES PTE_SMALL_NPAGES + /* L2 Page table address */ - /* L2 Page table address */ +# define PG_L2_BASE_PADDR PGTABLE_COARSE_BASE_PADDR +# define PG_L2_BASE_VADDR PGTABLE_COARSE_BASE_VADDR -# define PG_L2_BASE_PADDR PGTABLE_COARSE_BASE_PADDR -# define PG_L2_BASE_VADDR PGTABLE_COARSE_BASE_VADDR + /* MMU Flags for each memory region. */ - /* MMU Flags for each memory region. */ +# define MMU_L1_TEXTFLAGS (PMD_TYPE_COARSE|PMD_BIT4) +# define MMU_L2_TEXTFLAGS (PTE_TYPE_SMALL|PTE_SMALL_AP_UNO_SRO|PTE_CACHEABLE) +# define MMU_L1_DATAFLAGS (PMD_TYPE_COARSE|PMD_BIT4) +# define MMU_L2_DATAFLAGS (PTE_TYPE_SMALL|PTE_SMALL_AP_UNO_SRW|PTE_CACHEABLE|PTE_BUFFERABLE) +# define MMU_L1_PGTABFLAGS (PMD_TYPE_COARSE|PMD_BIT4) +# define MMU_L2_PGTABFLAGS (PTE_TYPE_SMALL|PTE_SMALL_AP_UNO_SRW) -# define MMU_L1_TEXTFLAGS (PMD_TYPE_COARSE|PMD_BIT4) -# define MMU_L2_TEXTFLAGS (PTE_TYPE_SMALL|PTE_SMALL_AP_UNO_SRO|PTE_CACHEABLE) -# define MMU_L1_DATAFLAGS (PMD_TYPE_COARSE|PMD_BIT4) -# define MMU_L2_DATAFLAGS (PTE_TYPE_SMALL|PTE_SMALL_AP_UNO_SRW|PTE_CACHEABLE|PTE_BUFFERABLE) -# define MMU_L1_PGTABFLAGS (PMD_TYPE_COARSE|PMD_BIT4) -# define MMU_L2_PGTABFLAGS (PTE_TYPE_SMALL|PTE_SMALL_AP_UNO_SRW) +#else +# error "Need extended definitions for CONFIG_PAGING_PAGESIZE" +#endif -# else -# error "Need extended definitions for CONFIG_PAGING_PAGESIZE" -# endif +#define PT_SIZE (4*PTE_NPAGES) -#define PT_SIZE (PTE_NPAGES * 4) +/* We position the locked region PTEs at the beginning of L2 page + * table. + */ + +#define PG_L2_LOCKED_PADDR PG_L2_BASE_PADDR +#define PG_L2_LOCKED_VADDR PG_L2_BASE_VADDR +#define PG_L2_LOCKED_SIZE (4*CONFIG_PAGING_NLOCKED) + +/* We position the paged region PTEs immediately after the locked + * region PTEs. + */ -/* We position the data section PTEs just after the text section PTE's */ +#define PG_L2_PAGED_PADDR (PG_L2_BASE_PADDR + PG_L2_LOCKED_SIZE) +#define PG_L2_PAGED_VADDR (PG_L2_BASE_VADDR + PG_L2_LOCKED_SIZE) +#define PG_L2_PAGED_SIZE (4*CONFIG_PAGING_NPAGED) -#define PG_L2_DATA_PADDR (PG_L2_BASE_PADDR + 4*PG_TEXT_NPAGES) -#define PG_L2_DATA_VADDR (PG_L2_BASE_VADDR + 4*PG_TEXT_NPAGES) +/* This describes the overall text region */ + +#define PG_L2_TEXT_PADDR PG_L2_LOCKED_PADDR +#define PG_L2_TEXT_VADDR PG_L2_LOCKED_VADDR +#define PG_L2_TEXT_SIZE (PG_L2_LOCKED_SIZE + PG_L2_PAGED_SIZE) + +/* We position the data section PTEs just after the text region PTE's */ + +#define PG_L2_DATA_PADDR (PG_L2_BASE_PADDR + PG_L2_TEXT_SIZE) +#define PG_L2_DATA_VADDR (PG_L2_BASE_VADDR + PG_L2_TEXT_SIZE) +#define PG_L2_DATA_SIZE (4*PG_DATA_NPAGES) /* Page Table Info: The number of pages in the in the page table * (PG_PGTABLE_NPAGES). We position the pagetable PTEs just after @@ -122,21 +147,139 @@ */ #define PG_PGTABLE_NPAGES (PGTABLE_SIZE >> PAGESHIFT) -#define PG_L2_PGTABLE_PADDR (PG_L2_DATA_PADDR + 4*PG_DATA_NPAGES) -#define PG_L2_PGTABLE_VADDR (PG_L2_DATA_VADDR + 4*PG_DATA_NPAGES) +#define PG_L2_PGTABLE_PADDR (PG_L2_DATA_PADDR + PG_L2_DATA_SIZE) +#define PG_L2_PGTABLE_VADDR (PG_L2_DATA_VADDR + PG_L2_DATA_SIZE) +#define PG_L2_PGTABLE_SIZE (4*PG_DATA_NPAGES) + +/* Vector mapping. One page is required to map the vector table. The + * vector table could lie in at virtual address zero (or at the start + * of RAM which is aliased to address zero on the ea3131) or at virtual + * address 0xfff00000. We only have logic here to support the former + * case. + * + * NOTE: If the vectors are at address zero, the page table will be + * forced to the highest RAM addresses. If the vectors are at 0xfff0000, + * then the page table is forced to the beginning of RAM. + * + * When the vectors are at the beginning of RAM, they will probably overlap + * the first page of the locked text region. In any other case, the + * configuration must set CONFIG_PAGING_VECPPAGE to provide the physical + * address of the page to use for the vectors. + * + * When the vectors overlap the first page of the locked text region (the + * only case in use so far), then the text page will be temporarily be made + * writable in order to copy the vectors. + * + * PG_VECT_PBASE - This the physical address of the page in memory to be + * mapped to the vector address. + * PG_L2_VECT_PADDR - This is the physical address of the L2 page table + * entry to use for the vector mapping. + * PG_L2_VECT_VADDR - This is the virtual address of the L2 page table + * entry to use for the vector mapping. + */ -/* This is the total number of pages used in the initial page table setup - * in up_head.S +/* Case 1: The configuration tells us everything */ + +#if defined(CONFIG_PAGING_VECPPAGE) +# define PG_VECT_PBASE CONFIG_PAGING_VECPPAGE +# define PG_L2_VECT_PADDR CONFIG_PAGING_VECL2PADDR +# define PG_L2_VECT_VADDR CONFIG_PAGING_VECL2VADDR + +/* Case 2: Vectors are in low memory and the locked text region starts at + * the begin of SRAM (which will be aliased to address 0x00000000) */ + +#elif defined(CONFIG_ARCH_LOWVECTORS) && !defined(CONFIG_PAGING_LOCKED_PBASE) +# define PG_VECT_PBASE PG_LOCKED_PBASE +# define PG_L2_VECT_PADDR PG_L2_LOCKED_PADDR +# define PG_L2_VECT_VADDR PG_L2_LOCKED_VADDR + +/* Case 3: High vectors or the locked region is not at the beginning or SRAM */ + +#else +# error "Logic missing for high vectors in this case" +#endif -#define PG_STATIC_NPAGES (PG_TEXT_NPAGES + PG_DATA_PAGES + PG_PGTABLE_NPAGES) +/* This is the total number of pages used in the text/data mapping: */ + +#define PG_TOTAL_NPAGES (PG_TEXT_NPAGES + PG_DATA_PAGES + PG_PGTABLE_NPAGES) +#if PG_TOTAL_NPAGES >PG_RAM_PAGES +# error "Total pages required exceeds RAM size" +#endif /* For page managment purposes, the following summarize the "heap" of - * free pages + * free pages, operations on free pages and the L2 page table. + * + * PG_POOL_L2NDX(va) - Converts a virtual address in the paged SRAM + * region into a index into the paged region of + * the L2 page table. + * PG_POOL_L2OFFSET(va) - Converts a virtual address in the paged SRAM + * region into a byte offset into the paged + * region of the L2 page table. + * PG_POOL_L2VADDR(va) - Converts a virtual address in the paged SRAM + * region into the virtual address of the + * corresponding PTE entry. + * + * PG_POOL_L1VBASE - The virtual address of the start of the L1 + * page table range corresponding to the first + * virtual address of the paged text region. + * PG_POOL_L1VEND - The virtual address of the end+1 of the L1 + * page table range corresponding to the last + * virtual address+1 of the paged text region. + * + * PG_POOL_VA2L2NDX(va) - Converts a virtual address within the paged + * text region to the most compact possible + * representation. Each PAGESIZE of address + * corresponds to 1 index in the L2 page table; + * Index 0 corresponds to the first L2 page table + * entry for the first page in the virtual paged + * text address space. + * PG_POOL_NDX2VA(ndx) - Performs the opposite conversion.. convests + * an index into a virtual address in the paged + * text region (the address at the beginning of + * the page). + * PG_POOL_MAXL2NDX - This is the maximum value+1 of such an index. + * PG_POOL_NDX2L2VADDR(ndx) - Converts an index to the corresponding address + * in the L1 page table entry. + * PG_POOL_VA2L2VADDR(va) - Converts a virtual address within the paged + * text region to the corresponding address in + * the L2 page table entry. + * + * PG_POOL_PGPADDR(ndx) - Converts an index into the corresponding + * (physical) address of the backing page memory. + * PG_POOL_PGVADDR(ndx) - Converts an index into the corresponding + * (virtual)address of the backing page memory. + * + * PG_POOL_VIRT2PHYS(va) - Convert a virtual address within the paged + * text region into a physical address. + * PG_POOL_PHYS2VIRT(va) - Convert a physical address within the paged + * text region into a virtual address. + * + * These are used as follows: If a miss occurs at some virtual address, va, + * A new page index, ndx, is allocated. PG_POOL_PGPADDR(i) converts the index + * into the physical address of the page memory; PG_POOL_L2VADDR(va) converts + * the virtual address in the L2 page table there the new mapping will be + * written. */ -#define PG_POOL_FIRSTPAGE PG_STATIC_NPAGES -#define PG_POOL_NPAGES CONFIG_PAGING_NLOCKED +#define PG_POOL_L2NDX(va) ((va) - PG_PAGED_VBASE) >> PAGESHIFT) +#define PG_POOL_L2OFFSET(va) (PG_POOL_L2NDX(va) << 2) +#define PG_POOL_L2VADDR(va) (PG_L2_PAGED_VADDR + PG_POOL_L2OFFSET(va)) + +#define PG_POOL_L1VBASE (PGTABLE_BASE_VADDR + ((PG_PAGED_VBASE >> 20) << 2)) +#define PG_POOL_L1VEND (PG_POOL_L1VBASE + (CONFIG_PAGING_NPAGED << 2)) + +#define PG_POOL_VA2L2NDX(va) (((va) - PG_PAGED_VBASE) >> PAGESHIFT) +#define PG_POOL_NDX2VA(ndx) (((ndx) << PAGESHIFT) + PG_PAGED_VBASE) +#define PG_POOL_MAXL2NDX PG_POOL_VA2L2NDX(PG_PAGED_VEND) +#define PG_POOL_NDX2L2VADDR(ndx) (PG_L2_PAGED_VADDR + ((ndx) << 2)) +#define PG_POOL_VA2L2VADDR(va) PG_POOL_NDX2L2VADDR(PG_POOL_VA2L2NDX(va)) + +#define PG_POOL_PGPADDR(ndx) (PG_PAGED_PBASE + ((ndx) << PAGESHIFT)) +#define PG_POOL_PGVADDR(ndx) (PG_PAGED_VBASE + ((ndx) << PAGESHIFT)) + +#define PG_POOL_VIRT2PHYS(va) ((va) + (PG_PAGED_PBASE - PG_PAGED_VBASE)) +#define PG_POOL_PHYS2VIRT(pa) ((pa) + (PG_PAGED_VBASE - PG_PAGED_PBASE)) #endif /* CONFIG_PAGING */ @@ -144,7 +287,7 @@ * Assembly Macros ****************************************************************************/ -#ifdef __ASSEMBLY +#ifdef __ASSEMBLY__ /**************************************************************************** * Name: pg_map @@ -209,6 +352,7 @@ cmp \npages, #0 bgt 1b .endm +#endif /* CONFIG_PAGING */ /**************************************************************************** * Name: pg_span @@ -291,13 +435,13 @@ .endm #endif /* CONFIG_PAGING */ -#endif /* __ASSEMBLY */ +#endif /* __ASSEMBLY__ */ /**************************************************************************** * Inline Functions ****************************************************************************/ -#ifndef __ASSEMBLY +#ifndef __ASSEMBLY__ -#endif /* __ASSEMBLY */ +#endif /* __ASSEMBLY__ */ #endif /* __ARCH_ARM_SRC_ARM_PG_MACROS_H */ diff --git a/nuttx/arch/arm/src/arm/up_allocpage.c b/nuttx/arch/arm/src/arm/up_allocpage.c index 383de23b7..8881620db 100755 --- a/nuttx/arch/arm/src/arm/up_allocpage.c +++ b/nuttx/arch/arm/src/arm/up_allocpage.c @@ -40,22 +40,72 @@ #include <nuttx/config.h> +#include <stdint.h> +#include <stdbool.h> #include <errno.h> #include <debug.h> #include <nuttx/sched.h> -#include <nuttx/page.h> #ifdef CONFIG_PAGING +#include <nuttx/page.h> +#include "pg_macros.h" + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** + * Private Types + ****************************************************************************/ + +#if CONFIG_PAGING_NPAGED < 256 +typedef uint8_t pgndx_t; +#elif CONFIG_PAGING_NPAGED < 65536 +typedef uint16_t pgndx_t; +#else +typedef uint32_t pgndx_t; +#endif + +#if PG_POOL_MAXL1NDX < 256 +typedef uint8_t L1ndx_t; +#elif PG_POOL_MAXL1NDX < 65536 +typedef uint16_t L1ndx_t; +#else +typedef uint32_t L1ndx_t; +#endif + +/**************************************************************************** * Private Data ****************************************************************************/ +/* Free pages in memory are managed by indices ranging from up to + * CONFIG_PAGING_NPAGED. Initially all pages are free so the page can be + * simply allocated in order: 0, 1, 2, ... . After all CONFIG_PAGING_NPAGED + * pages have be filled, then they are blindly freed and re-used in the + * same order 0, 1, 2, ... because we don't know any better. No smart "least + * recently used" kind of logic is supported. + */ + +static pgndx_t g_pgndx; + +/* After CONFIG_PAGING_NPAGED have been allocated, the pages will be re-used. + * In order to re-used the page, we will have un-map the page from its previous + * mapping. In order to that, we need to be able to map a physical address to + * to an index into the PTE where it was mapped. The following table supports + * this backward lookup - it is indexed by the page number index, and holds + * another index to the mapped virtual page. + */ + +static L1ndx_t g_ptemap[CONFIG_PAGING_NPAGED]; + +/* The contents of g_ptemap[] are not valid until g_pgndx has wrapped at + * least one time. + */ + +static bool g_pgwrap; + /**************************************************************************** * Private Functions ****************************************************************************/ @@ -108,8 +158,74 @@ int up_allocpage(FAR _TCB *tcb, FAR void **vpage) { -# warning "Not implemented" - return -ENOSYS; + uintptr_t vaddr; + uintptr_t paddr; + uint32_t *pte; + unsigned int pgndx; + unsigned int l2ndx; + + /* Since interrupts are disabled, we don't need to anything special. */ + + DEBUGASSERT(tcb && vpage); + + /* Get the virtual address that caused the fault */ + + vaddr = tcb->xcp.far; + DEBUGASSERT(vaddr >= PG_PAGED_VBASE && vaddr < PG_PAGED_VEND); + + /* Verify that this virtual address was previously unmapped */ + +#if CONFIG_DEBUG + pte = (uint32_t*)PG_POOL_L2VADDR(vaddr); + DEBUGASSERT(*pte == 0); +#endif + + /* Allocate page memory to back up the mapping. Start by getting the + * index of the next page that we are going to allocate. + */ + + pgndx = g_pgndx++; + if (p_pgndx >= CONFIG_PAGING) + { + g_pgndx = 0; + g_pgwrap = true; + } + + /* Then convert the index to a (physical) page address. */ + + paddr = PG_POOL_PGPADDR(pgndx); + + /* Was this physical page previously mapped? If so, then we need to un-map + * it. + */ + + if (g_pgwrap) + { + /* Yes.. Get a pointer to the L2 entry corresponding to the previous + * mapping -- then zero it! + */ + + l2ndx = g_ptemap[pgndx]; + pte = (uint32_t*)PG_POOL_NDX2L2VADDR(l2ndx); + *pte = 0; + + /* Invalidate the TLB corresponding to the virtual address */ + + tlb_inst_invalidate_single(PG_POOL_NDX2VA(l2ndx)) + } + + /* Now setup up the new mapping. Get a pointer to the L2 entry + * corresponding to the new mapping. Then set it map to the newly + * allocated page address. + */ + + pte = (uint32_t*)PG_POOL_VA2L2VADDR(va) + *pte = (paddr | MMU_L2_TEXTFLAGS); + + /* Finally, return the virtual address of allocated page */ + + *vpage = (void*)PG_POOL_PHYS2VIRT(paddr); + return OK; } #endif /* CONFIG_PAGING */ diff --git a/nuttx/arch/arm/src/arm/up_head.S b/nuttx/arch/arm/src/arm/up_head.S index 8bdba5baa..24fb381ae 100644 --- a/nuttx/arch/arm/src/arm/up_head.S +++ b/nuttx/arch/arm/src/arm/up_head.S @@ -350,13 +350,13 @@ __start: #ifdef CONFIG_PAGING .Ltxtspan: - .long PG_L2_BASE_PADDR /* Physical address of L2 table */ - .long PG_LOCKED_VBASE /* Virtual address of locked base */ + .long PG_L2_TEXT_PADDR /* Physical address of L2 table */ + .long PG_TEXT_VBASE /* Virtual address of text base */ .long PG_TEXT_NPAGES /* Total mapped text pages */ .long MMU_L1_TEXTFLAGS /* L1 MMU flags to use */ .Ltxtmap: - .long PG_L2_BASE_PADDR /* Physical address of L2 table */ + .long PG_L2_LOCKED_PADDR /* Physical address of L2 table */ .long PG_LOCKED_PBASE /* Physical address of locked base */ .long CONFIG_PAGING_NLOCKED /* Number of pages in the locked region */ .long MMU_L2_TEXTFLAGS /* L2 MMU flags to use */ diff --git a/nuttx/arch/arm/src/arm/up_pginitialize.c b/nuttx/arch/arm/src/arm/up_pginitialize.c index 7c6268217..1aea95113 100755 --- a/nuttx/arch/arm/src/arm/up_pginitialize.c +++ b/nuttx/arch/arm/src/arm/up_pginitialize.c @@ -79,14 +79,18 @@ * initialization * * Assumptions: - * - Called early in the platform initializatin sequence so that no special + * - Called early in the platform initialization sequence so that no special * concurrency protection is required. * ****************************************************************************/ void up_pginitialize(void) { -# warning "Not implemented" + /* None needed at present. This file is just retained in case the need + * arises in the future. Nothing calls up_pginitialize() now. If needed, + * if should be called early in up_boot.c to assure that all paging is + * ready. + */ } #endif /* CONFIG_PAGING */ diff --git a/nuttx/include/nuttx/page.h b/nuttx/include/nuttx/page.h index 28545154c..dd1be371b 100755 --- a/nuttx/include/nuttx/page.h +++ b/nuttx/include/nuttx/page.h @@ -123,8 +123,8 @@ */ #if defined(CONFIG_PAGING_LOCKED_PBASE) && defined(CONFIG_PAGING_LOCKED_VBASE) -# define PG_LOCKED_PBASE CONFIG_PAGING_LOCKED_PBASE -# define PG_LOCKED_VBASE CONFIG_PAGING_LOCKED_VBASE +# define PG_PAGED_PBASE CONFIG_PAGING_LOCKED_PBASE +# define PG_PAGED_VBASE CONFIG_PAGING_LOCKED_VBASE #else # define PG_PAGED_PBASE PG_LOCKED_PEND # define PG_PAGED_VBASE PG_LOCKED_VEND @@ -133,10 +133,16 @@ #define PG_PAGED_PEND (PG_PAGED_PBASE + PG_PAGED_SIZE) #define PG_PAGED_VEND (PG_PAGED_VBASE + PG_PAGED_SIZE) -/* Size of the overall text section */ +/* Size and description of the overall text section. The number of + * pages in the text section is the sum of the number of pages in + * both the locked and paged regions. The base of the text section + * is the base of the locked region. + */ #define PG_TEXT_NPAGES (CONFIG_PAGING_NLOCKED + CONFIG_PAGING_NPAGED) #define PG_TEXT_SIZE (PG_TEXT_NPAGES << PAGESHIFT) +#define PG_TEXT_PBASE PG_LOCKED_PBASE +#define PG_TEXT_VBASE PG_LOCKED_VBASE /* CONFIG_PAGING_NDATA - This is the number of data pages in the memory * map. The data region will extend to the end of RAM unless overridden |