Skip to content

audio: buffer: do not mix cached and non-cached access in buffer_init #7786

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
Jun 14, 2023
Merged

audio: buffer: do not mix cached and non-cached access in buffer_init #7786

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
19 changes: 11 additions & 8 deletions src/audio/buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct comp_buffer *buffer_alloc(uint32_t size, uint32_t caps, uint32_t flags, u
{
struct comp_buffer *buffer;
struct comp_buffer __sparse_cache *buffer_c;
void *stream_addr;
Comment thread
kv2019i marked this conversation as resolved.
Outdated

tr_dbg(&buffer_tr, "buffer_alloc()");

Expand All @@ -51,23 +52,22 @@ struct comp_buffer *buffer_alloc(uint32_t size, uint32_t caps, uint32_t flags, u
return NULL;
}

buffer->stream.addr = rballoc_align(0, caps, size, align);
if (!buffer->stream.addr) {
stream_addr = rballoc_align(0, caps, size, align);
if (!stream_addr) {
rfree(buffer);
tr_err(&buffer_tr, "buffer_alloc(): could not alloc size = %u bytes of type = %u",
size, caps);
return NULL;
}

buffer->stream.underrun_permitted = !!(flags & SOF_BUF_UNDERRUN_PERMITTED);
buffer->stream.overrun_permitted = !!(flags & SOF_BUF_OVERRUN_PERMITTED);

list_init(&buffer->source_list);
list_init(&buffer->sink_list);

/* From here no more uncached access to the buffer object, except its list headers */
buffer_c = buffer_acquire(buffer);
buffer_c->stream.addr = stream_addr;
buffer_init(buffer_c, size, caps);

buffer_c->stream.underrun_permitted = !!(flags & SOF_BUF_UNDERRUN_PERMITTED);
buffer_c->stream.overrun_permitted = !!(flags & SOF_BUF_OVERRUN_PERMITTED);

buffer_release(buffer_c);

/*
Expand All @@ -82,6 +82,9 @@ struct comp_buffer *buffer_alloc(uint32_t size, uint32_t caps, uint32_t flags, u
*/
dcache_writeback_invalidate_region(uncache_to_cache(buffer), sizeof(*buffer));

list_init(&buffer->source_list);
list_init(&buffer->sink_list);

return buffer;
}

Expand Down