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

zephyr: wrapper: hardcode SIZEs to unblock building 

We have change the size of runtime_shared zone to be decided at link
stage, here hardcode HEAP_RUNTIME_SHARED_SIZE to unblock the Zephyr
building.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
This commit is contained in:
Keyon Jie 2021-08-26 19:10:37 +08:00 committed by Liam Girdwood
parent 15e06515e2
commit 1e2d574356
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zephyr/wrapper.c
View File

@ -72,18 +72,38 @@ __section(".heap_mem") static uint8_t __aligned(64) heapmem[HEAPMEM_SIZE];
#else #else
#define HEAPMEM_SHARED_SIZE (HEAP_SYSTEM_SIZE + HEAP_RUNTIME_SIZE + \ /*
HEAP_RUNTIME_SHARED_SIZE + HEAP_SYSTEM_SHARED_SIZE) * TODO: heap size should be set based on Zephyr linker output.
#ifdef ENABLE_CACHED_HEAP * At the moment, the HEAP_SIZEs are approximations from the XTOS linker scripts
#define HEAPMEM_SIZE HEAP_BUFFER_SIZE * (e.g. src/platform/apollolake/apollolake.x.in for APL):
* (_bss_end - _runtime_heap_start)
*/
#if (CONFIG_HP_MEMORY_BANKS < 16)
/* e.g. APL */
#define HEAP_SIZE 0x30000
#elif (CONFIG_HP_MEMORY_BANKS < 30)
/* e.g. JSL */
#define HEAP_SIZE 0x80000
#elif (CONFIG_HP_MEMORY_BANKS < 45)
/* e.g. TGL-H */
#define HEAP_SIZE 0x100000
#else #else
#define HEAPMEM_SIZE (HEAP_BUFFER_SIZE + HEAPMEM_SHARED_SIZE) /* e.g. CNL/ICL/TGL */
#define HEAP_SIZE 0x200000
#endif #endif
#ifdef ENABLE_CACHED_HEAP
/* hard code the cached portion at the moment */
#define HEAP_SYSTEM_CACHED_SIZE (HEAP_SIZE / 2)
#else
#define HEAP_SYSTEM_CACHED_SIZE 0
#endif
#define HEAPMEM_SIZE (HEAP_SIZE - HEAP_SYSTEM_CACHED_SIZE)
static uint8_t __aligned(PLATFORM_DCACHE_ALIGN)heapmem[HEAPMEM_SIZE]; static uint8_t __aligned(PLATFORM_DCACHE_ALIGN)heapmem[HEAPMEM_SIZE];
#ifdef ENABLE_CACHED_HEAP #ifdef ENABLE_CACHED_HEAP
static uint8_t __aligned(PLATFORM_DCACHE_ALIGN)heapmem_shared[HEAPMEM_SHARED_SIZE]; static uint8_t __aligned(PLATFORM_DCACHE_ALIGN)heapmem_cached[HEAP_SYSTEM_CACHED_SIZE];
static struct k_heap sof_heap_shared; static struct k_heap sof_heap_cached;
#endif #endif
#endif #endif
@ -96,7 +116,7 @@ static int statics_init(const struct device *unused)
sys_heap_init(&sof_heap.heap, heapmem, HEAPMEM_SIZE); sys_heap_init(&sof_heap.heap, heapmem, HEAPMEM_SIZE);
#ifdef ENABLE_CACHED_HEAP #ifdef ENABLE_CACHED_HEAP
sys_heap_init(&sof_heap_shared.heap, heapmem_shared, HEAPMEM_SHARED_SIZE); sys_heap_init(&sof_heap_cached.heap, heapmem_cached, HEAP_SYSTEM_CACHED_SIZE);
#endif #endif
return 0; return 0;
} }