sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i.MX6: Remove non-cached, inter-cpu memory region. Not a useful concept.

Browse Source
This commit is contained in:
Gregory Nutt 2016-12-13 16:59:50 -06:00
parent a36ed28790
commit 26560cb9e1
6 changed files with 22 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/include/armv7-a/spinlock.h
View File

@ -36,25 +36,4 @@
#ifndef __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H #ifndef __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H
#define __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H #define __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Not a useful feature */
#undef SMP_INTERCPU_NONCACHED
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* In SMP configurations, save spinlocks and other inter-CPU communications
* data in a non-cached memory region.
*/
# define SP_SECTION __attribute__((section(".nocache")))
#endif
#endif /* __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H */ #endif /* __ARCH_ARM_INCLUDE_ARMV7_A_SPINLOCK_H */

3
arch/arm/src/armv7-a/mmu.h
View File

@ -605,9 +605,6 @@
#define MMU_L2_VECTROFLAGS (PTE_TYPE_SMALL | PTE_WRITE_THROUGH | PTE_AP_R1) #define MMU_L2_VECTROFLAGS (PTE_TYPE_SMALL | PTE_WRITE_THROUGH | PTE_AP_R1)
#define MMU_L2_VECTORFLAGS MMU_L2_VECTRWFLAGS #define MMU_L2_VECTORFLAGS MMU_L2_VECTRWFLAGS
#define MMU_L1_INTERCPUFLAGS (PMD_TYPE_PTE | PMD_PTE_PXN | PMD_PTE_DOM(0))
#define MMU_L2_INTERCPUFLAGS (PTE_TYPE_SMALL | PTE_DEVICE | PTE_AP_RW1)
/* Mapped section size */ /* Mapped section size */
#define SECTION_SHIFT (20) #define SECTION_SHIFT (20)

10
arch/arm/src/common/up_internal.h
View File

@ -191,11 +191,6 @@
# define _DATA_INIT &_eronly # define _DATA_INIT &_eronly
# define _START_DATA &_sdata # define _START_DATA &_sdata
# define _END_DATA &_edata # define _END_DATA &_edata
#ifdef CONFIG_SMP
# define _START_NOCACHE &_snocache
# define _END_NOCACHE &_enocache
#endif
#endif #endif
/* This is the value used to mark the stack for subsequent stack monitoring /* This is the value used to mark the stack for subsequent stack monitoring
@ -284,11 +279,6 @@ EXTERN uint32_t _edata; /* End+1 of .data */
EXTERN uint32_t _sbss; /* Start of .bss */ EXTERN uint32_t _sbss; /* Start of .bss */
EXTERN uint32_t _ebss; /* End+1 of .bss */ EXTERN uint32_t _ebss; /* End+1 of .bss */
#ifdef CONFIG_SMP
EXTERN uint32_t _snocache; /* Start of .nocache */
EXTERN uint32_t _enocache; /* End+1 of .nocache */
#endif
/* Sometimes, functions must be executed from RAM. In this case, the following /* Sometimes, functions must be executed from RAM. In this case, the following
* macro may be used (with GCC!) to specify a function that will execute from * macro may be used (with GCC!) to specify a function that will execute from
* RAM. For example, * RAM. For example,

88
arch/arm/src/imx6/chip/imx_memorymap.h
View File

@ -126,9 +126,7 @@
* address in the top-level memory map are candidates for other mapping uses: * address in the top-level memory map are candidates for other mapping uses:
* *
* 00018000-000fffff Reserved -- Not used * 00018000-000fffff Reserved -- Not used
* 00400000-007fffff Reserved -- Used as the virtual address an inter-CPU, * 00400000-007fffff Reserved -- Not used
* un-cached memory region in SMP
* configurations
* 00d00000-00ffffff Reserved -- Not used * 00d00000-00ffffff Reserved -- Not used
* 0220c000-023fffff Reserved -- Not used * 0220c000-023fffff Reserved -- Not used
* 80000000-efffffff Reserved -- Level 2 page table (See below) * 80000000-efffffff Reserved -- Level 2 page table (See below)
@ -929,8 +927,6 @@
* the address space. * the address space.
*/ */
#define INTERCPU_L2_PAGES 1 /* Pages allowed for inter-processor communications */
#ifndef CONFIG_ARCH_LOWVECTORS #ifndef CONFIG_ARCH_LOWVECTORS
/* Memory map /* Memory map
* VIRTUAL ADDRESS RANGE L1 PG TABLE L2 PG TABLE DESCRIPTION * VIRTUAL ADDRESS RANGE L1 PG TABLE L2 PG TABLE DESCRIPTION
@ -938,10 +934,6 @@
* ---------- ---------- ------------ ---------------------------- * ---------- ---------- ------------ ----------------------------
* 0x80000000 0x803fffff 0x000002000 0x000000400 Vectors (1MiB) * 0x80000000 0x803fffff 0x000002000 0x000000400 Vectors (1MiB)
* 0x80100000 0x806fffff 0x000002400 0x000001800 Paging (6MiB) * 0x80100000 0x806fffff 0x000002400 0x000001800 Paging (6MiB)
*
* If SMP is enabled, then 1MiB of address spaces for the INTERCPU_L2_PAGES
* pages are taken from the end of the Paging L2 page table to hold non-
* cacheable, inter-processor communication data.
*/ */
/* Vector L2 page table offset/size */ /* Vector L2 page table offset/size */
@ -959,18 +951,10 @@
# define VECTOR_L2_END_PADDR (VECTOR_L2_PBASE + VECTOR_L2_SIZE) # define VECTOR_L2_END_PADDR (VECTOR_L2_PBASE + VECTOR_L2_SIZE)
# define VECTOR_L2_END_VADDR (VECTOR_L2_VBASE + VECTOR_L2_SIZE) # define VECTOR_L2_END_VADDR (VECTOR_L2_VBASE + VECTOR_L2_SIZE)
# if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED) /* Paging L2 page table offset/size */
/* Paging L2 page table offset/size */
# define PGTABLE_L2_OFFSET 0x000002400 # define PGTABLE_L2_OFFSET 0x000002400
# define PGTABLE_L2_SIZE 0x000001400 # define PGTABLE_L2_SIZE 0x000001800
# else
/* Paging L2 page table offset/size */
# define PGTABLE_L2_OFFSET 0x000002400
# define PGTABLE_L2_SIZE 0x000001800
# endif
#else #else
/* Memory map /* Memory map
@ -978,24 +962,12 @@
* START END OFFSET SIZE * START END OFFSET SIZE
* ---------- ---------- ------------ ---------------------------- * ---------- ---------- ------------ ----------------------------
* 0x80000000 0x806fffff 0x000002000 0x000001c00 Paging (7MiB) * 0x80000000 0x806fffff 0x000002000 0x000001c00 Paging (7MiB)
*
* If SMP is enabled, then 1MiB of address spaces for the INTERCPU_L2_PAGES
* pages are taken from the end of the Paging L2 page table to hold non-
* cacheable, inter-processor communication data.
*/ */
# if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* Paging L2 page table offset/size */ /* Paging L2 page table offset/size */
# define PGTABLE_L2_OFFSET 0x000002000 # define PGTABLE_L2_OFFSET 0x000002000
# define PGTABLE_L2_SIZE 0x000001800 # define PGTABLE_L2_SIZE 0x000001c00
# else
/* Paging L2 page table offset/size */
# define PGTABLE_L2_OFFSET 0x000002000
# define PGTABLE_L2_SIZE 0x000001c00
# endif
#endif #endif
@ -1013,23 +985,6 @@
#define PGTABLE_L2_END_PADDR (PGTABLE_L2_PBASE + PGTABLE_L2_SIZE) #define PGTABLE_L2_END_PADDR (PGTABLE_L2_PBASE + PGTABLE_L2_SIZE)
#define PGTABLE_L2_END_VADDR (PGTABLE_L2_VBASE + PGTABLE_L2_SIZE) #define PGTABLE_L2_END_VADDR (PGTABLE_L2_VBASE + PGTABLE_L2_SIZE)
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* Non-cached inter-processor communication data */
# define INTERCPU_L2_OFFSET (PGTABLE_L2_OFFSET + PGTABLE_L2_SIZE)
# define INTERCPU_L2_SIZE (0x00000400)
/* Non-cached inter-processor communication page table base addresses */
# define INTERCPU_L2_PBASE (PGTABLE_BASE_PADDR + INTERCPU_L2_OFFSET)
# define INTERCPU_L2_VBASE (PGTABLE_BASE_VADDR + INTERCPU_L2_OFFSET)
/* Non-cached inter-processor communication end addresses */
# define INTERCPU_L2_END_PADDR (INTERCPU_L2_PBASE + INTERCPU_L2_SIZE)
# define INTERCPU_L2_END_VADDR (INTERCPU_L2_VBASE + INTERCPU_L2_SIZE)
#endif
/* Base address of the interrupt vector table. /* Base address of the interrupt vector table.
* *
* IMX_VECTOR_PADDR - Unmapped, physical address of vector table in SRAM * IMX_VECTOR_PADDR - Unmapped, physical address of vector table in SRAM
@ -1052,8 +1007,7 @@
* START END CONTENT * START END CONTENT
* ---------- ---------- --------------------------- * ---------- ---------- ---------------------------
* 0x00000000 0x00010000 Vectors (VECTOR_TABLE_SIZE) * 0x00000000 0x00010000 Vectors (VECTOR_TABLE_SIZE)
* 0x00010000 0x00011000 Inter-CPU communications * 0x00010000 0x0003c000 Unused
* 0x00011000 0x0003c000 Unused
* 0x0003c000 0x00004000 Page table (PGTABLE_SIZE) * 0x0003c000 0x00004000 Page table (PGTABLE_SIZE)
*/ */
@ -1061,27 +1015,13 @@
# define IMX_VECTOR_VSRAM IMX_OCRAM_VBASE # define IMX_VECTOR_VSRAM IMX_OCRAM_VBASE
# define IMX_VECTOR_VADDR 0x00000000 # define IMX_VECTOR_VADDR 0x00000000
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* Inter-processor communications.
*
* NOTICE that we use the unused virtual address space at 0x00400000 for
* the inter-CPU virtual communication area.
*/
# define INTERCPU_PADDR (IMX_VECTOR_PADDR + VECTOR_TABLE_SIZE)
# define INTERCPU_VADDR (0x00400000)
# define INTERCPU_SIZE (INTERCPU_L2_PAGES << 12)
# define INTERCPU_VSRAM (IMX_VECTOR_VSRAM + VECTOR_TABLE_SIZE)
#endif
#else /* Vectors located at 0xffff:0000 -- this probably does not work */ #else /* Vectors located at 0xffff:0000 -- this probably does not work */
/* OCRAM Memory Map: /* OCRAM Memory Map:
* ---------- ---------- --------------------------- * ---------- ---------- ---------------------------
* START END CONTENT * START END CONTENT
* ---------- ---------- --------------------------- * ---------- ---------- ---------------------------
* 0x00000000 0x00004000 Page table (PGTABLE_SIZE) * 0x00000000 0x00004000 Page table (PGTABLE_SIZE)
* 0x00004000 0x0002f000 Unused * 0x00004000 0x00030000 Unused
* 0x0002f000 0x00030000 Inter-CPU communications
* 0x00030000 0x00010000 Vectors (VECTOR_TABLE_SIZE) * 0x00030000 0x00010000 Vectors (VECTOR_TABLE_SIZE)
*/ */
@ -1089,18 +1029,6 @@
# define IMX_VECTOR_VSRAM (IMX_OCRAM_VBASE + IMX_OCRAM_SIZE - VECTOR_TABLE_SIZE) # define IMX_VECTOR_VSRAM (IMX_OCRAM_VBASE + IMX_OCRAM_SIZE - VECTOR_TABLE_SIZE)
# define IMX_VECTOR_VADDR 0xffff0000 # define IMX_VECTOR_VADDR 0xffff0000
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* Inter-processor communications
*
* NOTICE that we use the unused virtual address space at 0x00400000 for
* the inter-CPU virtual communication area.
*/
# define INTERCPU_PADDR (IMX_VECTOR_PADDR - INTERCPU_L2_SIZE)
# define INTERCPU_VADDR (0x00400000)
# define INTERCPU_SIZE (INTERCPU_L2_PAGES << 12)
# define INTERCPU_VSRAM (IMX_VECTOR_VSRAM - INTERCPU_L2_SIZE)
#endif
#endif #endif
/************************************************************************************ /************************************************************************************

88
arch/arm/src/imx6/imx_boot.c
View File

@ -235,48 +235,6 @@ static void imx_vectormapping(void)
# define imx_vectormapping() # define imx_vectormapping()
#endif #endif
/****************************************************************************
* Name: imx_intercpu_mapping
*
* Description:
* Setup a special mapping for the non-cached, inter-cpu communications
* area.
*
****************************************************************************/
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
static void imx_intercpu_mapping(void)
{
uint32_t intercpu_paddr = INTERCPU_PADDR & PTE_SMALL_PADDR_MASK;
uint32_t intercpu_vaddr = INTERCPU_VADDR & PTE_SMALL_PADDR_MASK;
uint32_t end_paddr = INTERCPU_PADDR + INTERCPU_SIZE;
DEBUGASSERT(intercpu_vaddr == (uint32_t)&_snocache);
/* We want to keep the inter-cpu region in on-chip RAM (OCRAM). The
* i.MX6 has 256Kb of OCRAM positioned at physical address 0x0090:0000.
*/
while (intercpu_paddr < end_paddr)
{
mmu_l2_setentry(INTERCPU_L2_VBASE, intercpu_paddr, intercpu_vaddr,
MMU_L2_INTERCPUFLAGS);
intercpu_paddr += 4096;
intercpu_vaddr += 4096;
}
/* Now set the level 1 descriptor to refer to the level 2 page table. */
mmu_l1_setentry(INTERCPU_L2_PBASE & PMD_PTE_PADDR_MASK,
INTERCPU_VADDR & PMD_PTE_PADDR_MASK,
MMU_L1_INTERCPUFLAGS);
}
#else
/* No inter-cpu communications area */
# define imx_intercpu_mapping()
#endif
/**************************************************************************** /****************************************************************************
* Name: imx_copyvectorblock * Name: imx_copyvectorblock
* *
@ -477,15 +435,6 @@ void arm_boot(void)
imx_vectormapping(); imx_vectormapping();
PROGRESS('D'); PROGRESS('D');
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* Provide a special mapping for the OCRAM interrupt vector positioned in
* high memory.
*/
imx_intercpu_mapping();
PROGRESS('E');
#endif
#ifdef CONFIG_ARCH_RAMFUNCS #ifdef CONFIG_ARCH_RAMFUNCS
/* Copy any necessary code sections from FLASH to RAM. The correct /* Copy any necessary code sections from FLASH to RAM. The correct
* destination in OCRAM is given by _sramfuncs and _eramfuncs. The * destination in OCRAM is given by _sramfuncs and _eramfuncs. The
@ -498,14 +447,14 @@ void arm_boot(void)
*dest++ = *src++; *dest++ = *src++;
} }
PROGRESS('F'); PROGRESS('E');
/* Flush the copied RAM functions into physical RAM so that will /* Flush the copied RAM functions into physical RAM so that will
* be available when fetched into the I-Cache. * be available when fetched into the I-Cache.
*/ */
arch_clean_dcache((uintptr_t)&_sramfuncs, (uintptr_t)&_eramfuncs) arch_clean_dcache((uintptr_t)&_sramfuncs, (uintptr_t)&_eramfuncs)
PROGRESS('G'); PROGRESS('F');
#endif #endif
/* Setup up vector block. _vector_start and _vector_end are exported from /* Setup up vector block. _vector_start and _vector_end are exported from
@ -513,23 +462,23 @@ void arm_boot(void)
*/ */
imx_copyvectorblock(); imx_copyvectorblock();
PROGRESS('H'); PROGRESS('G');
/* Disable the watchdog timer */ /* Disable the watchdog timer */
imx_wdtdisable(); imx_wdtdisable();
PROGRESS('I'); PROGRESS('H');
/* Initialize clocking to settings provided by board-specific logic */ /* Initialize clocking to settings provided by board-specific logic */
imx_clockconfig(); imx_clockconfig();
PROGRESS('J'); PROGRESS('I');
#ifdef CONFIG_ARCH_FPU #ifdef CONFIG_ARCH_FPU
/* Initialize the FPU */ /* Initialize the FPU */
arm_fpuconfig(); arm_fpuconfig();
PROGRESS('K'); PROGRESS('J');
#endif #endif
/* Perform board-specific memroy initialization, This must include /* Perform board-specific memroy initialization, This must include
@ -541,7 +490,7 @@ void arm_boot(void)
*/ */
imx_memory_initialize(); imx_memory_initialize();
PROGRESS('L'); PROGRESS('K');
#ifdef NEED_SDRAM_REMAPPING #ifdef NEED_SDRAM_REMAPPING
/* SDRAM was configured in a temporary state to support low-level /* SDRAM was configured in a temporary state to support low-level
@ -550,7 +499,7 @@ void arm_boot(void)
*/ */
imx_remap(); imx_remap();
PROGRESS('M'); PROGRESS('L');
#endif #endif
#ifdef CONFIG_BOOT_SDRAM_DATA #ifdef CONFIG_BOOT_SDRAM_DATA
@ -559,7 +508,7 @@ void arm_boot(void)
*/ */
arm_data_initialize(); arm_data_initialize();
PROGRESS('N'); PROGRESS('M');
#endif #endif
/* Perform board-specific device initialization. This would include /* Perform board-specific device initialization. This would include
@ -567,23 +516,12 @@ void arm_boot(void)
*/ */
imx_board_initialize(); imx_board_initialize();
PROGRESS('O'); PROGRESS('N');
#if defined(CONFIG_SMP) && defined(SMP_INTERCPU_NONCACHED)
/* Initialize the uncached, inter-CPU communications area */
for (dest = &_snocache; dest < &_enocache; )
{
*dest++ = 0;
}
PROGRESS('P');
#endif
/* Perform common, low-level chip initialization (might do nothing) */ /* Perform common, low-level chip initialization (might do nothing) */
imx_lowsetup(); imx_lowsetup();
PROGRESS('Q'); PROGRESS('O');
#ifdef USE_EARLYSERIALINIT #ifdef USE_EARLYSERIALINIT
/* Perform early serial initialization if we are going to use the serial /* Perform early serial initialization if we are going to use the serial
@ -591,7 +529,7 @@ void arm_boot(void)
*/ */
imx_earlyserialinit(); imx_earlyserialinit();
PROGRESS('R'); PROGRESS('P');
#endif #endif
/* Now we can enable all other CPUs. The enabled CPUs will start execution /* Now we can enable all other CPUs. The enabled CPUs will start execution
@ -600,6 +538,6 @@ void arm_boot(void)
*/ */
imx_cpu_enable(); imx_cpu_enable();
PROGRESS('S'); PROGRESS('Q');
PROGRESS('\n'); PROGRESS('\n');
} }

9
configs/sabre-6quad/scripts/dramboot.ld
View File

@ -44,7 +44,6 @@
MEMORY MEMORY
{ {
nocache (WR) : ORIGIN = 0x00400000, LENGTH = 4K
oscram (W!RX) : ORIGIN = 0x00900000, LENGTH = 256K - 16K oscram (W!RX) : ORIGIN = 0x00900000, LENGTH = 256K - 16K
ddr3 (W!RX) : ORIGIN = 0x10800000, LENGTH = 1024M - 8M ddr3 (W!RX) : ORIGIN = 0x10800000, LENGTH = 1024M - 8M
} }
@ -123,14 +122,8 @@ SECTIONS
_enoinit = ABSOLUTE(.); _enoinit = ABSOLUTE(.);
} > ddr3 } > ddr3
.nocache :
{
_snocache = ABSOLUTE(.);
*(.nocache)
_enocache = ABSOLUTE(.);
} > nocache
/* Stabs debugging sections. */ /* Stabs debugging sections. */
.stab 0 : { *(.stab) } .stab 0 : { *(.stab) }
.stabstr 0 : { *(.stabstr) } .stabstr 0 : { *(.stabstr) }
.stab.excl 0 : { *(.stab.excl) } .stab.excl 0 : { *(.stab.excl) }