Skip to content

Heap refinement Part1 -- prerequisites #4730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 3 commits into from
Sep 9, 2021
Merged

Heap refinement Part1 -- prerequisites #4730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88340c3
buffer: remove the unneeded size check
keyonjie Sep 2, 2021
cc7dc16
rimage: update rimage for more cavs platforms
keyonjie Jul 22, 2021
e3414b9
zephyr: wrapper: hardcode SIZEs to unblock building
keyonjie Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rimage
Open in desktop
Submodule rimage updated 4 files
+1 −1 config/kbl.toml
+1 −1 config/skl.toml
+1 −1 config/sue.toml
+1 −1 config/tgl-cavs.toml
4 changes: 2 additions & 2 deletions src/audio/buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct comp_buffer *buffer_alloc(uint32_t size, uint32_t caps, uint32_t align)
tr_dbg(&buffer_tr, "buffer_alloc()");

/* validate request */
if (size == 0 || size > HEAP_BUFFER_SIZE) {
if (size == 0) {
tr_err(&buffer_tr, "buffer_alloc(): new size = %u is invalid",
size);
return NULL;
Expand Down Expand Up @@ -85,7 +85,7 @@ int buffer_set_size(struct comp_buffer *buffer, uint32_t size)
void *new_ptr = NULL;

/* validate request */
if (size == 0 || size > HEAP_BUFFER_SIZE) {
if (size == 0) {
buf_err(buffer, "resize size = %u is invalid", size);
return -EINVAL;
}
Expand Down
34 changes: 27 additions & 7 deletions zephyr/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,38 @@ __section(".heap_mem") static uint8_t __aligned(64) heapmem[HEAPMEM_SIZE];

#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.
* At the moment, the HEAP_SIZEs are approximations from the XTOS linker scripts
* (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
/* e.g. CNL/ICL/TGL */
#define HEAP_SIZE 0x200000
#endif

#ifdef ENABLE_CACHED_HEAP
#define HEAPMEM_SIZE HEAP_BUFFER_SIZE
/* hard code the cached portion at the moment */
#define HEAP_SYSTEM_CACHED_SIZE (HEAP_SIZE / 2)
#else
#define HEAPMEM_SIZE (HEAP_BUFFER_SIZE + HEAPMEM_SHARED_SIZE)
#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];
#ifdef ENABLE_CACHED_HEAP
static uint8_t __aligned(PLATFORM_DCACHE_ALIGN)heapmem_shared[HEAPMEM_SHARED_SIZE];
static struct k_heap sof_heap_shared;
static uint8_t __aligned(PLATFORM_DCACHE_ALIGN)heapmem_cached[HEAP_SYSTEM_CACHED_SIZE];
static struct k_heap sof_heap_cached;
#endif

#endif
Expand All @@ -96,7 +116,7 @@ static int statics_init(const struct device *unused)

sys_heap_init(&sof_heap.heap, heapmem, HEAPMEM_SIZE);
#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
return 0;
}
Expand Down