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

arch/xtensa/esp32: In SMP case move the internal memory to region 3.

Browse Source 
Region 2 is only 15KB in SMP, so we don't have enough memory to play
with.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2021-03-08 10:04:08 +01:00 committed by YAMAMOTO Takashi
parent cba44928d2
commit 5c7d041b91
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/xtensa/include/esp32/memory_layout.h
View File

@ -59,12 +59,10 @@
/* Region 1 of the heap is the area from the end of the .data section to the
* beginning of the ROM data. The start address is defined from the linker
* script as "_sheap". Then end is defined here, as follows:
* script as "_sheap". The end is defined here, as follows:
*/
#ifndef HEAP_REGION1_END
# define HEAP_REGION1_END 0x3ffdfff0
#endif
#define HEAP_REGION1_END 0x3ffdfff0
/* Region 2 of the heap is the area from the end of the ROM data to the end
* of DRAM. The linker script has already set "_eheap" as the end of DRAM,
@ -73,13 +71,14 @@
* enabled include APP's region with the heap.
*
* When an internal heap is enabled this region starts at an offset equal to
* the size of the internal heap. (see esp32_imem.c)
* the size of the internal heap.
*/
#ifndef CONFIG_SMP
# define HEAP_REGION2_START 0x3ffe1330
#else
# define HEAP_REGION2_START 0x3ffe7e40
#define HEAP_REGION2_START 0x3ffe0450
#ifdef CONFIG_SMP
# define HEAP_REGION2_END 0x3ffe3f10
# define HEAP_REGION3_START 0x3ffe5240
#endif
#ifdef CONFIG_XTENSA_IMEM_USE_SEPARATE_HEAP
@ -88,12 +87,15 @@
# define XTENSA_IMEM_REGION_SIZE 0
#endif
/* Internal heap starts at the end of the ROM data. */
/* Internal heap starts at the end of the ROM data.
* This is either the start of region2 if SMP is disabled or start of region3
* if SMP is enabled.
*/
#ifndef CONFIG_SMP
# define ESP32_IMEM_START 0x3ffe1330
# define ESP32_IMEM_START HEAP_REGION2_START
#else
# define ESP32_IMEM_START 0x3ffe7e40
# define ESP32_IMEM_START HEAP_REGION3_START
#endif
/* Region of unused ROM App data */

20
arch/xtensa/src/esp32/esp32_allocateheap.c
View File

@ -94,16 +94,22 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size)
#if CONFIG_MM_REGIONS > 1
void xtensa_add_region(void)
{
size_t region2_start = HEAP_REGION2_START + XTENSA_IMEM_REGION_SIZE;
void *start;
size_t size;
#ifndef CONFIG_SMP
umm_addregion((FAR void *)region2_start,
(size_t)(uintptr_t)&_eheap - region2_start);
start = (FAR void *)(HEAP_REGION2_START + XTENSA_IMEM_REGION_SIZE);
size = (size_t)(uintptr_t)&_eheap - (size_t)start;
umm_addregion(start, size);
#else
umm_addregion((FAR void *)region2_start,
(size_t)HEAP_REGION2_END - region2_start);
umm_addregion((FAR void *)HEAP_REGION3_START,
(size_t)&_eheap - HEAP_REGION3_START);
start = (FAR void *)HEAP_REGION2_START;
size = (size_t)(HEAP_REGION2_END - HEAP_REGION2_START);
umm_addregion(start, size);
start = (FAR void *)HEAP_REGION3_START + XTENSA_IMEM_REGION_SIZE;
size = (size_t)(uintptr_t)&_eheap - (size_t)start;
umm_addregion(start, size);
#endif
#if defined(CONFIG_ESP32_SPIRAM)