src: audio: module_adapter: Do the params config right after init

The module_adapter_params() functions set the stream params based on the
base config for each module which is available right after module init.
So configure the params for IPC4 during module_new() and remove the call
to ipc4_pipeline_params(). In order to update the buffer params, add a
call to comp_verify_params() during module_bind when the intermediate
buffers between modules are created. This should help with reducing the
time to trigger pipelines during start.

Add the params handling for the KPB and detect_test modules explicitly
because they don't use the module adapter.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

src/audio/kpb.c

@@ -330,6 +330,9 @@ static int kpb_get_attribute(struct comp_dev *dev,
 	return 0;
 }
 
+static int kbp_verify_params(struct comp_dev *dev,
+			     struct sof_ipc_stream_params *params);
+
 /**
  * \brief Initialize KPB sinks when binding.
  * \param[in] dev - component device pointer.
@@ -339,6 +342,7 @@ static int kpb_get_attribute(struct comp_dev *dev,
 static int kpb_bind(struct comp_dev *dev, struct bind_info *bind_data)
 {
 	struct comp_data *kpb = comp_get_drvdata(dev);
+	struct sof_ipc_stream_params params;
 	struct ipc4_module_bind_unbind *bu;
 	int buf_id;
 	int ret = 0;
@@ -356,6 +360,7 @@ static int kpb_bind(struct comp_dev *dev, struct bind_info *bind_data)
 	 */
 	struct comp_buffer *sink;
 
+	kpb_set_params(dev, &params);
 	comp_dev_for_each_consumer(dev, sink) {
 		int sink_buf_id;
 
@@ -372,6 +377,10 @@ static int kpb_bind(struct comp_dev *dev, struct bind_info *bind_data)
 			else
 				kpb->host_sink = sink;
 		}
+
+		/* set buffer params based on the basecfg */
+		if (sink_buf_id != 0)
+			buffer_set_params(sink, &params, BUFFER_UPDATE_FORCE);
 	}
 
 	return ret;
@@ -453,6 +462,8 @@ static void kpb_set_params(struct comp_dev *dev,
 {}
 #endif /* CONFIG_IPC_MAJOR_4 */
 
+static int kpb_params(struct comp_dev *dev, struct sof_ipc_stream_params *params);
+
 /*
  * \brief Create a key phrase buffer component.
  * \param[in] config - generic ipc component pointer.
@@ -534,6 +545,17 @@ static struct comp_dev *kpb_new(const struct comp_driver *drv,
 	dev->state = COMP_STATE_READY;
 	kpb_change_state(kpb, KPB_STATE_CREATED);
 
+#if CONFIG_IPC_MAJOR_4
+	struct sof_ipc_stream_params params;
+
+	/* set params based on base config for IPC4 */
+	ret = kpb_params(dev, &params);
+	if (ret < 0) {
+		rfree(dev);
+		return NULL;
+	}
+#endif
+
 	return dev;
 }
 

src/audio/module_adapter/module_adapter.c

@@ -123,6 +123,19 @@ struct comp_dev *module_adapter_new(const struct comp_driver *drv,
 
 	dev->state = COMP_STATE_READY;
 
+#if CONFIG_IPC_MAJOR_4
+	struct sof_ipc_stream_params params = {{ 0 }};
+
+	/* set the stream params based on the module base cfg. It is OK to pass NULL params
+	 * here because it will be filled in based on the module base_cfg.
+	 */
+	ret = module_adapter_params(dev, &params);
+	if (ret) {
+		comp_err(dev, "module_adapter_new() %d: module params failed", ret);
+		goto err;
+	}
+#endif
+
 	comp_dbg(dev, "module_adapter_new() done");
 	return dev;
 err:
@@ -1185,9 +1198,10 @@ int module_adapter_reset(struct comp_dev *dev)
 		buffer_zero(buffer);
 	}
 
+#if CONFIG_IPC_MAJOR_3
 	rfree(mod->stream_params);
 	mod->stream_params = NULL;
-
+#endif
 	comp_dbg(dev, "module_adapter_reset(): done");
 
 	return comp_set_state(dev, COMP_TRIGGER_RESET);
@@ -1219,6 +1233,7 @@ void module_adapter_free(struct comp_dev *dev)
 
 #if CONFIG_IPC_MAJOR_4
 	rfree(mod->priv.cfg.input_pins);
+	rfree(mod->stream_params);
 #endif
 
 	rfree(mod);

src/audio/module_adapter/module_adapter_ipc4.c

@@ -253,7 +253,12 @@ int module_adapter_bind(struct comp_dev *dev, struct bind_info *bind_data)
 
 	mod->stream_copy_single_to_single = !module_adapter_multi_sink_source_prepare(dev);
 
-	return 0;
+	/* call comp_verify_params() to update the buffer params */
+	ret = comp_verify_params(dev, mod->verify_params_flags, mod->stream_params);
+	if (ret < 0)
+		comp_err(dev, "module_adapter_bind(): comp_verify_params() failed.");
+
+	return ret;
 }
 EXPORT_SYMBOL(module_adapter_bind);
 

src/ipc/ipc4/handler.c

@@ -155,46 +155,6 @@ __cold static int ipc4_delete_pipeline(struct ipc4_message_request *ipc4)
 	return ipc_pipeline_free(ipc, pipe->primary.r.instance_id);
 }
 
-static int ipc4_comp_params(struct comp_dev *current,
-			    struct comp_buffer *calling_buf,
-			    struct pipeline_walk_context *ctx, int dir)
-{
-	struct pipeline_data *ppl_data = ctx->comp_data;
-	int err;
-
-	/* don't do any params if current is running */
-	if (current->state == COMP_STATE_ACTIVE)
-		return 0;
-
-	/* Stay on the current pipeline */
-	if (current->pipeline != ((struct pipeline_data *)ctx->comp_data)->p)
-		return 0;
-
-	err = comp_params(current, &ppl_data->params->params);
-	if (err < 0 || err == PPL_STATUS_PATH_STOP)
-		return err;
-
-	return pipeline_for_each_comp(current, ctx, dir);
-}
-
-static int ipc4_pipeline_params(struct pipeline *p, struct comp_dev *host)
-{
-	struct sof_ipc_pcm_params hw_params = {{ 0 }};
-	struct pipeline_data data = {
-		.start = host,
-		.params = &hw_params,
-		.p = p,
-	};
-
-	struct pipeline_walk_context param_ctx = {
-		.comp_func = ipc4_comp_params,
-		.comp_data = &data,
-		.skip_incomplete = true,
-	};
-
-	return param_ctx.comp_func(host, NULL, &param_ctx, host->direction);
-}
-
 static int ipc4_pcm_params(struct ipc_comp_dev *pcm_dev)
 {
 	int err, reset_err;
@@ -205,15 +165,6 @@ static int ipc4_pcm_params(struct ipc_comp_dev *pcm_dev)
 		return -EINVAL;
 	}
 
-	/* configure pipeline audio params */
-	err = ipc4_pipeline_params(pcm_dev->cd->pipeline, pcm_dev->cd);
-	if (err < 0) {
-		ipc_cmd_err(&ipc_tr, "ipc: pipe %d comp %d params failed %d",
-			    pcm_dev->cd->pipeline->pipeline_id,
-			    pcm_dev->cd->pipeline->comp_id, err);
-		goto error;
-	}
-
 	/* prepare pipeline audio params */
 	err = pipeline_prepare(pcm_dev->cd->pipeline, pcm_dev->cd);
 	if (err < 0) {

src/samples/audio/detect_test.c

@@ -481,6 +481,25 @@ static struct ipc_msg *ipc4_kd_notification_init(uint32_t word_id,
 	return msg;
 }
 
+/**
+ * \brief Set buffer params for source buffer
+ * \param[in] dev - component device pointer.
+ * \param[in] bind_data - bind/unbind data.
+ * \return: none.
+ */
+static int test_keyword_bind(struct comp_dev *dev, struct bind_info *bind_data)
+{
+	struct sof_ipc_stream_params params;
+	struct comp_buffer *sourceb;
+
+	sourceb = comp_dev_get_first_data_producer(dev);
+
+	test_keyword_set_params(dev, &params);
+	buffer_set_params(sourceb, &params, BUFFER_UPDATE_FORCE);
+
+	return 0;
+}
+
 #else /* CONFIG_IPC_MAJOR_4 */
 static int test_keyword_set_config(struct comp_dev *dev,
 				   struct sof_ipc_ctrl_data *cdata)
@@ -650,6 +669,7 @@ static int test_keyword_cmd(struct comp_dev *dev, int cmd, void *data,
 	}
 }
 #endif /* CONFIG_IPC_MAJOR_4 */
+static int test_keyword_params(struct comp_dev *dev, struct sof_ipc_stream_params *params);
 
 static struct comp_dev *test_keyword_new(const struct comp_driver *drv,
 					 const struct comp_ipc_config *config,
@@ -749,6 +769,16 @@ static struct comp_dev *test_keyword_new(const struct comp_driver *drv,
 	dev->direction = SOF_IPC_STREAM_CAPTURE;
 	dev->direction_set = true;
 	dev->state = COMP_STATE_READY;
+
+#if CONFIG_IPC_MAJOR_4
+	struct sof_ipc_stream_params params;
+
+	/* set params based on base config for IPC4 */
+	ret = test_keyword_params(dev, &params);
+	if (ret < 0)
+		goto cd_fail;
+#endif
+
 	return dev;
 
 cd_fail:
@@ -801,9 +831,6 @@ static int test_keyword_params(struct comp_dev *dev,
 			       struct sof_ipc_stream_params *params)
 {
 	struct comp_data *cd = comp_get_drvdata(dev);
-	struct comp_buffer *sourceb;
-	unsigned int channels, rate;
-	enum sof_ipc_frame frame_fmt;
 	int err;
 
 	test_keyword_set_params(dev, params);
@@ -816,26 +843,20 @@ static int test_keyword_params(struct comp_dev *dev,
 
 	cd->sample_valid_bytes = params->sample_valid_bytes;
 
-	/* keyword components will only ever have 1 source */
-	sourceb = comp_dev_get_first_data_producer(dev);
-	channels = audio_stream_get_channels(&sourceb->stream);
-	frame_fmt = audio_stream_get_frm_fmt(&sourceb->stream);
-	rate = audio_stream_get_rate(&sourceb->stream);
-
-	if (channels != 1) {
+	if (params->channels != 1) {
 		comp_err(dev, "test_keyword_params(): only single-channel supported");
 		return -EINVAL;
 	}
 
-	if (!detector_is_sample_width_supported(frame_fmt)) {
+	if (!detector_is_sample_width_supported(params->frame_fmt)) {
 		comp_err(dev, "test_keyword_params(): only 16-bit format supported");
 		return -EINVAL;
 	}
 
 	/* calculate the length of the preamble */
 	if (cd->config.preamble_time) {
 		cd->keyphrase_samples = cd->config.preamble_time *
-					(rate / 1000);
+					(params->rate / 1000);
 	} else {
 		cd->keyphrase_samples = KEYPHRASE_DEFAULT_PREAMBLE_LENGTH;
 	}
@@ -1073,6 +1094,7 @@ static const struct comp_driver comp_keyword = {
 		.set_large_config	= test_keyword_set_large_config,
 		.get_large_config	= test_keyword_get_large_config,
 		.get_attribute		= test_keyword_get_attribute,
+		.bind			= test_keyword_bind,
 #else
 		.cmd			= test_keyword_cmd,
 #endif /* CONFIG_IPC_MAJOR_4 */