Skip to content

coherent: fix allocation size #7323

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
kv2019i merged 1 commit into from
Mar 22, 2023
Merged

coherent: fix allocation size #7323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 14 additions & 8 deletions src/include/sof/coherent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,13 @@ static inline void coherent_release(struct coherent __sparse_cache *c,

static inline void *__coherent_init(size_t offset, const size_t size)
{
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, size);
/*
* Allocate an object with an uncached alias but align size on a cache-
* line boundary to avoid sharing a cache line with the adjacent
* allocation
*/
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM,
ALIGN_UP(size, PLATFORM_DCACHE_ALIGN));
struct coherent *c;

if (!object)
Expand Down Expand Up @@ -245,7 +251,9 @@ static inline void coherent_release_thread(struct coherent __sparse_cache *c,

static inline void *__coherent_init_thread(size_t offset, const size_t size)
{
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, size);
/* As above - prevent cache line sharing */
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM,
ALIGN_UP(size, PLATFORM_DCACHE_ALIGN));
struct coherent *c;

if (!object)
Expand Down Expand Up @@ -331,7 +339,9 @@ static inline void coherent_release(struct coherent __sparse_cache *c,

static inline void *__coherent_init(size_t offset, const size_t size)
{
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM, size);
/* As in CONFIG_INCOHERENT case - prevent cache line sharing */
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM,
ALIGN_UP(size, PLATFORM_DCACHE_ALIGN));
struct coherent *c;

if (!object)
Expand Down Expand Up @@ -394,11 +404,7 @@ static inline void coherent_release_thread(struct coherent __sparse_cache *c,

static inline void *__coherent_init_thread(size_t offset, const size_t size)
{
/*
* Allocate an object with an uncached alias but align size on a cache-
* line boundary to avoid sharing a cache line with the adjacent
* allocation
*/
/* As above - prevent cache line sharing */
void *object = rzalloc(SOF_MEM_ZONE_RUNTIME_SHARED, 0, SOF_MEM_CAPS_RAM,
ALIGN_UP(size, PLATFORM_DCACHE_ALIGN));
struct coherent *c;
Expand Down