Skip to content

memory: make buffers aligned to BUF_HEAP_ALIGNMENT on the i.MX8 #1582

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
jajanusz merged 3 commits into from
Jun 21, 2019
Merged

memory: make buffers aligned to BUF_HEAP_ALIGNMENT on the i.MX8 #1582

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
16b6dae
memory: Add HEAP_BUF_ALIGNMENT define for i.MX8 platform
Jun 20, 2019
f0d8fe7
memory: Add static assert for heap_buf_alignment value
Jun 20, 2019
d8377f0
memory: Make buffers aligned to HEAP_BUF_ALIGNMENT in i.MX8
Jun 20, 2019
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
4 changes: 2 additions & 2 deletions src/platform/imx8/imx8.x.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ SECTIONS

Comment thread
dbaluta marked this conversation as resolved.
Resolved
.system_runtime_heap (NOLOAD) : ALIGN(8)
{
. = ALIGN (32);
. = ALIGN (HEAP_BUF_ALIGNMENT);
_system_runtime_heap_start = ABSOLUTE(.);
. = . + HEAP_SYS_RUNTIME_SIZE;
_system_runtime_heap_end = ABSOLUTE(.);
Expand All @@ -477,7 +477,7 @@ SECTIONS

.buffer_heap (NOLOAD) : ALIGN(8)
{
. = ALIGN (32);
. = ALIGN (HEAP_BUF_ALIGNMENT);
_buffer_heap_start = ABSOLUTE(.);
. = . + HEAP_BUFFER_SIZE;
_buffer_heap_end = ABSOLUTE(.);
Expand Down
2 changes: 2 additions & 0 deletions src/platform/imx8/include/platform/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@
#define cache_to_uncache(address) address
#define is_uncached(address) 0

#define HEAP_BUF_ALIGNMENT XCHAL_DCACHE_LINESIZE

#if !defined(__ASSEMBLER__) && !defined(LINKER)
void platform_init_memmap(void);
#endif
Expand Down
3 changes: 3 additions & 0 deletions src/platform/imx8/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#include <sof/alloc.h>
#include <ipc/header.h>

STATIC_ASSERT(0 == (HEAP_BUF_ALIGNMENT % PLATFORM_DCACHE_ALIGN),
invalid_heap_buf_alignment);

/* Heap blocks for system runtime */
static struct block_hdr sys_rt_block64[HEAP_SYS_RT_COUNT64];
static struct block_hdr sys_rt_block512[HEAP_SYS_RT_COUNT512];
Expand Down