OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

memory: reorder heap defines to match order from CNL memory layout 

This will make easier to analyse heaps in memory.h

Signed-off-by: Adrian Bonislawski <adrian.bonislawski@linux.intel.com>
This commit is contained in:
Adrian Bonislawski 2019-06-18 13:32:50 +02:00 committed by Liam Girdwood
parent a71aed4210
commit c8e957c0dd
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/platform/cannonlake/include/platform/memory.h
View File

@ -111,6 +111,8 @@
#define ROM_BASE 0xBEFE0000
#define ROM_SIZE 0x00002000
#define L2_VECTOR_SIZE 0x1000
#define LOG_ENTRY_ELF_BASE 0x20000000
#define LOG_ENTRY_ELF_SIZE 0x2000000
@ -162,28 +164,6 @@
#define HP_SRAM_BASE 0xBE000000
#define HP_SRAM_MASK 0xFF000000
/* HP SRAM Base */
#define HP_SRAM_VECBASE_RESET (HEAP_HP_BUFFER_BASE + HEAP_HP_BUFFER_SIZE)
/* Heap section sizes for system runtime heap for master core */
#define HEAP_SYS_RT_0_COUNT64 64
#define HEAP_SYS_RT_0_COUNT512 16
#define HEAP_SYS_RT_0_COUNT1024 4
/* Heap section sizes for system runtime heap for slave core */
#define HEAP_SYS_RT_X_COUNT64 32
#define HEAP_SYS_RT_X_COUNT512 8
#define HEAP_SYS_RT_X_COUNT1024 4
/* Heap section sizes for module pool */
#define HEAP_RT_COUNT64 128
#define HEAP_RT_COUNT128 64
#define HEAP_RT_COUNT256 128
#define HEAP_RT_COUNT512 8
#define HEAP_RT_COUNT1024 4
#define L2_VECTOR_SIZE 0x1000
/* HP SRAM windows */
/* window 0 */
#define SRAM_SW_REG_BASE (HP_SRAM_BASE + 0x4000)
@ -238,6 +218,9 @@
#define HEAP_HP_BUFFER_COUNT \
(HEAP_HP_BUFFER_SIZE / HEAP_HP_BUFFER_BLOCK_SIZE)
/* HP SRAM Base */
#define HP_SRAM_VECBASE_RESET (HEAP_HP_BUFFER_BASE + HEAP_HP_BUFFER_SIZE)
/* text and data share the same HP L2 SRAM on Cannonlake */
#define SOF_FW_START (HP_SRAM_VECBASE_RESET + 0x400)
#define SOF_FW_BASE (SOF_FW_START)
@ -248,7 +231,33 @@
#define SOF_TEXT_START (SOF_FW_START)
#define SOF_TEXT_BASE (SOF_FW_START)
/* Heap section sizes for system runtime heap for master core */
#define HEAP_SYS_RT_0_COUNT64 64
#define HEAP_SYS_RT_0_COUNT512 16
#define HEAP_SYS_RT_0_COUNT1024 4
/* Heap section sizes for system runtime heap for slave core */
#define HEAP_SYS_RT_X_COUNT64 32
#define HEAP_SYS_RT_X_COUNT512 8
#define HEAP_SYS_RT_X_COUNT1024 4
/* Heap section sizes for module pool */
#define HEAP_RT_COUNT64 128
#define HEAP_RT_COUNT128 64
#define HEAP_RT_COUNT256 128
#define HEAP_RT_COUNT512 8
#define HEAP_RT_COUNT1024 4
/* Heap configuration */
#define HEAP_RUNTIME_SIZE \
(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
HEAP_RT_COUNT1024 * 1024)
#define HEAP_BUFFER_SIZE 0xF000
#define HEAP_BUFFER_BLOCK_SIZE 0x180
#define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE)
#define HEAP_SYSTEM_M_SIZE 0x8000 /* heap master core size */
#define HEAP_SYSTEM_S_SIZE 0x5000 /* heap slave core size */
@ -267,11 +276,6 @@
(HEAP_SYS_RUNTIME_M_SIZE + ((PLATFORM_CORE_COUNT - 1) * \
HEAP_SYS_RUNTIME_S_SIZE))
#define HEAP_RUNTIME_SIZE \
(HEAP_RT_COUNT64 * 64 + HEAP_RT_COUNT128 * 128 + \
HEAP_RT_COUNT256 * 256 + HEAP_RT_COUNT512 * 512 + \
HEAP_RT_COUNT1024 * 1024)
/* Stack configuration */
#define SOF_STACK_SIZE ARCH_STACK_SIZE
#define SOF_STACK_TOTAL_SIZE ARCH_STACK_TOTAL_SIZE
@ -282,10 +286,6 @@
SRAM_BANK_SIZE)
#define SOF_CORE_S_T_SIZE ((PLATFORM_CORE_COUNT - 1) * SOF_CORE_S_SIZE)
#define HEAP_BUFFER_SIZE 0xF000
#define HEAP_BUFFER_BLOCK_SIZE 0x180
#define HEAP_BUFFER_COUNT (HEAP_BUFFER_SIZE / HEAP_BUFFER_BLOCK_SIZE)
/* Temporary until the boot_loader code get fixed */
#define SOF_MEMORY_SIZE (HP_SRAM_SIZE)