From 9a5739b2ffd36693f006456a7691de93bcd61d0e Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 13 Jul 2023 14:21:47 -0700 Subject: [PATCH 1/4] audio: igo: Fix buffer access arg missing reference Fixes: 589df2aea4 ("buffer: don't access stream internals") Signed-off-by: Curtis Malainey --- src/audio/igo_nr/igo_nr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index 6a0d4e147e78..6a39066fccc7 100755 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -402,7 +402,7 @@ static int32_t igo_nr_params(struct comp_dev *dev, cd->source_rate = audio_stream_get_rate(&source_c->stream); cd->sink_rate = audio_stream_get_rate(&sink_c->stream); - if (audio_stream_get_channels(source_c->stream) != + if (audio_stream_get_channels(&source_c->stream) != audio_stream_get_channels(&sink_c->stream)) { comp_err(dev, "igo_nr_params(), mismatch source/sink stream channels"); cd->invalid_param = true; From 935aea36c09daff94cf6f9b55ede3342412b90e1 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 13 Jul 2023 16:40:39 -0700 Subject: [PATCH 2/4] audio: igo: fix create arg attributes Creation is done with constant args Fixes: 10f6dd0d7b ("module-adapter: add a constant data pointer") Signed-off-by: Curtis Malainey --- src/audio/igo_nr/igo_nr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index 6a39066fccc7..7ee3884bd023 100755 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -276,9 +276,9 @@ static inline int32_t set_capture_func(struct comp_dev *dev) } static struct comp_dev *igo_nr_new(const struct comp_driver *drv, - struct comp_ipc_config *config, void *spec) + const struct comp_ipc_config *config, const void *spec) { - struct ipc_config_process *ipc_igo_nr = spec; + const struct ipc_config_process *ipc_igo_nr = spec; struct comp_dev *dev = NULL; struct comp_data *cd = NULL; size_t bs = ipc_igo_nr->size; From 41a6a80e69dc4450dc469861d00e60bdd9657009 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 13 Jul 2023 16:49:08 -0700 Subject: [PATCH 3/4] audio: igo: remove unneeded header path include The headers are under the main include directory Signed-off-by: Curtis Malainey --- src/audio/igo_nr/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/audio/igo_nr/CMakeLists.txt b/src/audio/igo_nr/CMakeLists.txt index 7fb2e26ccf53..475d5c319d1a 100644 --- a/src/audio/igo_nr/CMakeLists.txt +++ b/src/audio/igo_nr/CMakeLists.txt @@ -1,6 +1,4 @@ # SPDX-License-Identifier: BSD-3-Clause -target_include_directories(sof_public_headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - add_local_sources(sof igo_nr.c) sof_add_static_library(IGOChrome ${CMAKE_CURRENT_LIST_DIR}/libigonr.a) From ff77a44050fb80cc8e53fe1f0286545b10e98a37 Mon Sep 17 00:00:00 2001 From: Curtis Malainey Date: Thu, 13 Jul 2023 17:05:49 -0700 Subject: [PATCH 4/4] audio: igo: add missing header include Needed for the config type Signed-off-by: Curtis Malainey --- src/include/sof/audio/igo_nr/igo_nr_comp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/sof/audio/igo_nr/igo_nr_comp.h b/src/include/sof/audio/igo_nr/igo_nr_comp.h index 7e6533a7c3ea..50159adb1a08 100644 --- a/src/include/sof/audio/igo_nr/igo_nr_comp.h +++ b/src/include/sof/audio/igo_nr/igo_nr_comp.h @@ -11,6 +11,7 @@ #include #include #include +#include #define IGO_FRAME_SIZE (768) #define IGO_NR_IN_BUF_LENGTH (IGO_FRAME_SIZE)