From 9a5640b54219fbbb2c8bc36f917f65f92cdf8e06 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 10 Sep 2014 08:44:09 -0600 Subject: [PATCH] SAMA5D4-EK: These configurations now use the fixed DRAM mapping for manipulating the page memory pool. --- arch/arm/src/armv7-a/pginline.h | 119 ++++++++++++++++++++++++ configs/sama5d4-ek/elf/defconfig | 7 ++ configs/sama5d4-ek/knsh/defconfig | 10 +- configs/sama5d4-ek/knsh/defconfig.ROMFS | 4 + 4 files changed, 135 insertions(+), 5 deletions(-) create mode 100644 arch/arm/src/armv7-a/pginline.h diff --git a/arch/arm/src/armv7-a/pginline.h b/arch/arm/src/armv7-a/pginline.h new file mode 100644 index 0000000000..bc703f572f --- /dev/null +++ b/arch/arm/src/armv7-a/pginline.h @@ -0,0 +1,119 @@ +/**************************************************************************** + * arch/arm/src/armv7/pginline.h + * + * Copyright (C) 2014 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __ARCH_ARM_SRC_ARMV7_A_PGINLINE_H +#define __ARCH_ARM_SRC_ARMV7_A_PGINLINE_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include + +#include "mmu.h" + +#if defined(CONFIG_MM_PGALLOC) && defined(CONFIG_ARCH_USE_MMU) + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: arm_pgmap + * + * Description: + * Map one page to a temporary, scratch virtual memory address + * + ****************************************************************************/ + +#ifndef CONFIG_ARCH_PGPOOL_MAPPING +static inline uintptr_t arm_tmpmap(uintptr_t paddr, FAR uint32_t *l1save) +{ + *l1save = mmu_l1_getentry(ARCH_SCRATCH_VBASE); + mmu_l1_setentry(paddr & ~SECTION_MASK, ARCH_SCRATCH_VBASE, MMU_MEMFLAGS); + return ((uintptr_t)ARCH_SCRATCH_VBASE | (paddr & SECTION_MASK)); +} +#endif + +/**************************************************************************** + * Name: arm_pgrestore + * + * Description: + * Restore any previous L1 page table mapping that was in place when + * arm_tmpmap() was called + * + ****************************************************************************/ + +#ifndef CONFIG_ARCH_PGPOOL_MAPPING +static inline void arm_tmprestore(uint32_t l1save) +{ + mmu_l1_restore(ARCH_SCRATCH_VBASE, l1save); +} +#endif + +/**************************************************************************** + * Name: arm_pgvaddr + * + * Description: + * If the page memory pool is staticly mapped, then we do not have to + * go through the the temporary mapping. We simply have to perform a + * physical to virtual memory address mapping. + * + ****************************************************************************/ + +#ifdef CONFIG_ARCH_PGPOOL_MAPPING +static inline uintptr_t arm_pgvaddr(uintptr_t paddr) +{ + DEBUGASSERT(paddr >= CONFIG_ARCH_PGPOOL_PBASE && + paddr < CONFIG_ARCH_PGPOOL_PEND); + + return paddr - CONFIG_ARCH_PGPOOL_PBASE + CONFIG_ARCH_PGPOOL_VBASE; +} +#endif + +#endif /* CONFIG_MM_PGALLOC && CONFIG_ARCH_USE_MMU */ +#endif /* __ARCH_ARM_SRC_ARMV7_A_PGINLINE_H */ diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig index d9aee6fd00..d82d452b00 100644 --- a/configs/sama5d4-ek/elf/defconfig +++ b/configs/sama5d4-ek/elf/defconfig @@ -271,6 +271,10 @@ CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_DATA_NPAGES=256 CONFIG_ARCH_HEAP_NPAGES=256 CONFIG_ARCH_STACK_NPAGES=256 +CONFIG_ARCH_PGPOOL_MAPPING=y +CONFIG_ARCH_PGPOOL_PBASE=0x28000000 +CONFIG_ARCH_PGPOOL_VBASE=0x28000000 +CONFIG_ARCH_PGPOOL_SIZE=134217728 # CONFIG_PAGING is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y @@ -334,6 +338,7 @@ CONFIG_SAMA5D4_MB_REVC=y # CONFIG_SAMA5D4EK_396MHZ is not set CONFIG_SAMA5D4EK_528MHZ=y CONFIG_SAMA5D4EK_DRAM_BOOT=y +# CONFIG_SAMA5D4EK_ROMFS_MOUNT is not set # CONFIG_SAMA5D4EK_SLOWCLOCK is not set # @@ -363,6 +368,8 @@ CONFIG_PREALLOC_TIMERS=4 # # Tasks and Scheduling # +CONFIG_INIT_ENTRYPOINT=y +# CONFIG_INIT_FILEPATH is not set CONFIG_USER_ENTRYPOINT="elf_main" CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=32 diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig index 6ef5c2264a..37daf0d0cf 100644 --- a/configs/sama5d4-ek/knsh/defconfig +++ b/configs/sama5d4-ek/knsh/defconfig @@ -241,10 +241,6 @@ CONFIG_SAMA5_HSMCI0_XDMAC0=y # # External Memory Configuration # -# CONFIG_SAMA5_EBICS0 is not set -# CONFIG_SAMA5_EBICS1 is not set -# CONFIG_SAMA5_EBICS2 is not set -# CONFIG_SAMA5_EBICS3 is not set # CONFIG_SAMA5_HAVE_NAND is not set # CONFIG_SAMA5_HAVE_PMECC is not set # CONFIG_SAMA5_BOOT_ISRAM is not set @@ -286,6 +282,10 @@ CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_DATA_NPAGES=256 CONFIG_ARCH_HEAP_NPAGES=256 CONFIG_ARCH_STACK_NPAGES=256 +CONFIG_ARCH_PGPOOL_MAPPING=y +CONFIG_ARCH_PGPOOL_PBASE=0x28000000 +CONFIG_ARCH_PGPOOL_VBASE=0x28000000 +CONFIG_ARCH_PGPOOL_SIZE=134217728 # CONFIG_PAGING is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y @@ -355,6 +355,7 @@ CONFIG_SAMA5D4EK_HSMCI0_MOUNT=y CONFIG_SAMA5D4EK_HSMCI0_MOUNT_FSTYPE="vfat" CONFIG_SAMA5D4EK_HSMCI0_MOUNT_BLKDEV="/dev/mmcsd0" CONFIG_SAMA5D4EK_HSMCI0_MOUNT_MOUNTPOINT="/bin" +# CONFIG_SAMA5D4EK_ROMFS_MOUNT is not set # CONFIG_SAMA5D4EK_SLOWCLOCK is not set # @@ -949,7 +950,6 @@ CONFIG_NSH_CONSOLE=y # # I2C tool # -# CONFIG_SYSTEM_I2CTOOL is not set # # INI File Parser diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS index 8642df347f..d52473f33d 100644 --- a/configs/sama5d4-ek/knsh/defconfig.ROMFS +++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS @@ -266,6 +266,10 @@ CONFIG_ARCH_TEXT_NPAGES=256 CONFIG_ARCH_DATA_NPAGES=256 CONFIG_ARCH_HEAP_NPAGES=256 CONFIG_ARCH_STACK_NPAGES=256 +CONFIG_ARCH_PGPOOL_MAPPING=y +CONFIG_ARCH_PGPOOL_PBASE=0x28000000 +CONFIG_ARCH_PGPOOL_VBASE=0x28000000 +CONFIG_ARCH_PGPOOL_SIZE=134217728 # CONFIG_PAGING is not set # CONFIG_ARCH_IRQPRIO is not set CONFIG_ARCH_STACKDUMP=y