Skip to content

sparse: fix address space mismatches #6876

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 2 commits into from
Dec 22, 2022
Merged

sparse: fix address space mismatches #6876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae238d5
module-adapter: fix address space mismatch
lyakh Dec 21, 2022
9ac90a2
mixin-mixout: fix address space mismatch
lyakh Dec 21, 2022
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
17 changes: 10 additions & 7 deletions src/audio/mixin_mixout/mixin_mixout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,14 +517,16 @@ static int mixout_process(struct processing_module *mod,
*/
for (i = 0; i < num_input_buffers; i++) {
const struct audio_stream __sparse_cache *source_stream;
struct comp_buffer *unused_in_between_buf;
struct comp_buffer __sparse_cache *unused_in_between_buf;
struct comp_dev *source;
int source_index;

source_stream = mod->input_buffers[i].data;
unused_in_between_buf = container_of(source_stream, struct comp_buffer, stream);
unused_in_between_buf = attr_container_of(source_stream,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);

source = buffer_get_comp(unused_in_between_buf, PPL_DIR_UPSTREAM);
source = unused_in_between_buf->source;

source_index = find_module_source_index(mod_source_info, source);
/* this shouldn't happen but skip even if it does and move to the next source */
Expand All @@ -538,16 +540,17 @@ static int mixout_process(struct processing_module *mod,
if (frames_to_produce > 0 && frames_to_produce < INT32_MAX) {
for (i = 0; i < num_input_buffers; i++) {
const struct audio_stream __sparse_cache *source_stream;
struct comp_buffer *unused_in_between_buf;
struct comp_buffer __sparse_cache *unused_in_between_buf;
struct comp_dev *source;
int source_index;
uint32_t pending_frames;

source_stream = mod->input_buffers[i].data;
unused_in_between_buf = container_of(source_stream, struct comp_buffer,
stream);
unused_in_between_buf = attr_container_of(source_stream,
struct comp_buffer __sparse_cache,
stream, __sparse_cache);

source = buffer_get_comp(unused_in_between_buf, PPL_DIR_UPSTREAM);
source = unused_in_between_buf->source;

source_index = find_module_source_index(mod_source_info, source);
if (source_index < 0)
Expand Down
3 changes: 1 addition & 2 deletions src/include/sof/audio/module_adapter/module/generic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,7 @@ static inline void module_update_buffer_position(struct input_stream_buffer *inp
}

__must_check static inline
struct module_source_info __sparse_cache *
module_source_info_acquire(struct module_source_info __sparse_cache *msi)
struct module_source_info __sparse_cache *module_source_info_acquire(struct module_source_info *msi)
{
struct coherent __sparse_cache *c;

Expand Down