Merge pull request #27 from nashif/cache_api

Author: nashif

scripts/xtensa-build-zephyr.py

@@ -270,7 +270,15 @@ def execute_command(*run_args, **run_kwargs):
 		cwd = run_kwargs.get('cwd')
 		print_cwd = f"In dir: {cwd}" if cwd else f"in current dir: {os.getcwd()}"
 		print_args = shlex.join(command_args)
-		print(f"{print_cwd}; running command: {print_args}", flush=True)
+		output = f"{print_cwd}; running command:\n    {print_args}"
+		env_arg = run_kwargs.get('env')
+		env_change = set(env_arg.items()) - set(os.environ.items()) if env_arg else None
+		if env_change:
+			output += "\n... with extra/modified environment:"
+			for k_v in env_change:
+				output += f"\n{k_v[0]}={k_v[1]}"
+		print(output, flush=True)
+
 
 	if run_kwargs.get('check') is None:
 		run_kwargs['check'] = True
@@ -568,8 +576,6 @@ def build_platforms():
 			TOOLCHAIN_VER = platform_dict["XTENSA_TOOLS_VERSION"]
 			XTENSA_CORE = platform_dict["XTENSA_CORE"]
 			platf_build_environ["TOOLCHAIN_VER"] = TOOLCHAIN_VER
-			print(f"XTENSA_TOOLCHAIN_PATH={XTENSA_TOOLCHAIN_PATH}")
-			print(f"TOOLCHAIN_VER={TOOLCHAIN_VER}")
 
 			# Set variables expected by xcc toolchain. CMake cannot set (evil) build-time
 			# environment variables at configure time:
@@ -578,7 +584,6 @@ def build_platforms():
 				TOOLCHAIN_VER).absolute())
 			XTENSA_SYSTEM = str(pathlib.Path(XTENSA_BUILDS_DIR, XTENSA_CORE, "config").absolute())
 			platf_build_environ["XTENSA_SYSTEM"] = XTENSA_SYSTEM
-			print(f"XTENSA_SYSTEM={XTENSA_SYSTEM}")
 
 		platform_build_dir_name = f"build-{platform}"
 

src/audio/Kconfig

@@ -436,6 +436,7 @@ endif # COMP_ASRC
 
 config COMP_TDFB
 	bool "TDFB component"
+	depends on COMP_MODULE_ADAPTER
 	select MATH_FIR
 	select MATH_IIR_DF1
 	select SQRT_FIXED

src/audio/data_blob.c

@@ -164,13 +164,26 @@ int comp_init_data_blob(struct comp_data_blob_handler *blob_handler,
 
 int comp_data_blob_set(struct comp_data_blob_handler *blob_handler,
 		       enum module_cfg_fragment_position pos, uint32_t data_offset_size,
-		       const uint8_t *fragment, size_t fragment_size)
+		       const uint8_t *fragment_in, size_t fragment_size)
 {
+#if CONFIG_IPC_MAJOR_3
+	struct sof_ipc_ctrl_data *cdata	= (struct sof_ipc_ctrl_data *)fragment_in;
+	const uint8_t *fragment = (const uint8_t *)cdata->data[0].data;
+#elif CONFIG_IPC_MAJOR_4
+	const uint8_t *fragment = fragment_in;
+#endif
 	int ret;
 
 	if (!blob_handler)
 		return -EINVAL;
 
+#if CONFIG_IPC_MAJOR_3
+	if (cdata->cmd != SOF_CTRL_CMD_BINARY) {
+		comp_err(blob_handler->dev, "comp_data_blob_set_cmd(), illegal control command");
+		return -EINVAL;
+	}
+#endif
+
 	comp_dbg(blob_handler->dev, "comp_data_blob_set_cmd() pos = %d, fragment size = %d",
 		 pos, fragment_size);
 
@@ -556,6 +569,11 @@ int comp_data_blob_get_cmd(struct comp_data_blob_handler *blob_handler,
 
 	assert(blob_handler);
 
+	if (cdata->cmd != SOF_CTRL_CMD_BINARY) {
+		comp_err(blob_handler->dev, "comp_data_blob_set_cmd(), illegal control command");
+		return -EINVAL;
+	}
+
 	comp_dbg(blob_handler->dev, "comp_data_blob_get_cmd() msg_index = %d, num_elems = %d, remaining = %d ",
 		 cdata->msg_index, cdata->num_elems,
 		 cdata->elems_remaining);

src/audio/mixer/mixer.c

@@ -82,6 +82,7 @@ static int mixer_process(struct processing_module *mod,
 	struct mixer_data *md = module_get_private_data(mod);
 	struct comp_dev *dev = mod->dev;
 	const struct audio_stream __sparse_cache *sources_stream[PLATFORM_MAX_STREAMS];
+	int sources_indices[PLATFORM_MAX_STREAMS];
 	int32_t i = 0, j = 0;
 	uint32_t frames = INT32_MAX;
 	/* Redundant, but helps the compiler */
@@ -143,6 +144,7 @@ static int mixer_process(struct processing_module *mod,
 		if (avail_frames == 0)
 			continue;
 
+		sources_indices[j] = i;
 		sources_stream[j++] = mod->input_buffers[i].data;
 	}
 
@@ -152,7 +154,7 @@ static int mixer_process(struct processing_module *mod,
 
 	/* update source buffer consumed bytes */
 	for (i = 0; i < j; i++)
-		mod->input_buffers[i].consumed = source_bytes;
+		mod->input_buffers[sources_indices[i]].consumed = source_bytes;
 
 	return 0;
 }

src/audio/module_adapter/module/cadence.c

@@ -16,6 +16,8 @@
 #include <ipc/compress_params.h>
 #include <rtos/init.h>
 
+LOG_MODULE_REGISTER(cadence, CONFIG_SOF_LOG_LEVEL);
+
 /* d8218443-5ff3-4a4c-b388-6cfe07b956aa */
 DECLARE_SOF_RT_UUID("cadence_codec", cadence_uuid, 0xd8218443, 0x5ff3, 0x4a4c,
 		    0xb3, 0x88, 0x6c, 0xfe, 0x07, 0xb9, 0x56, 0xaa);

src/audio/module_adapter/module_adapter.c

@@ -170,13 +170,10 @@ int module_adapter_prepare(struct comp_dev *dev)
 	/* Prepare module */
 	ret = module_prepare(mod);
 	if (ret) {
-		if (ret == PPL_STATUS_PATH_STOP)
-			return ret;
-
-		comp_err(dev, "module_adapter_prepare() error %x: module prepare failed",
-			 ret);
-
-		return -EIO;
+		if (ret != PPL_STATUS_PATH_STOP)
+			comp_err(dev, "module_adapter_prepare() error %x: module prepare failed",
+				 ret);
+		return ret;
 	}
 
 	/* Get period_bytes first on prepare(). At this point it is guaranteed that the stream
@@ -942,12 +939,11 @@ static int module_adapter_get_set_params(struct comp_dev *dev, struct sof_ipc_ct
 	 */
 	if (set && md->ops->set_configuration)
 		return md->ops->set_configuration(mod, cdata->data[0].type, pos, data_offset_size,
-						  (const uint8_t *)cdata->data[0].data,
-						  cdata->num_elems, NULL, 0);
+						  (const uint8_t *)cdata, cdata->num_elems,
+						  NULL, 0);
 	else if (!set && md->ops->get_configuration)
 		return md->ops->get_configuration(mod, pos, &data_offset_size,
-						  (uint8_t *)cdata->data[0].data,
-						  cdata->num_elems);
+						  (uint8_t *)cdata, cdata->num_elems);
 
 	comp_warn(dev, "module_adapter_get_set_params(): no configuration op set for %d",
 		  dev_comp_id(dev));