pipeline: Pass create pipeline payload parameters down to pipeline_new()

Pass create pipeline payload parameters down to pipeline_new() by
using struct pipeline_params. That is the place where the data will be
used.

Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>

Author: Jyri Sarha

src/audio/pipeline/pipeline-graph.c

@@ -108,7 +108,8 @@ void pipeline_posn_init(struct sof *sof)
 }
 
 /* create new pipeline - returns pipeline id or negative error */
-struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t comp_id)
+struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t comp_id,
+			      struct create_pipeline_params *pparams)
 {
 	struct sof_ipc_stream_posn posn;
 	struct pipeline *p;

src/include/sof/audio/pipeline.h

@@ -134,6 +134,13 @@ struct pipeline_task {
 	struct comp_dev *sched_comp;	/**< pipeline scheduling component */
 };
 
+struct ipc4_pipeline_ext_obj_mem_data;
+
+/** \brief For storing IPC payload data. */
+struct create_pipeline_params {
+	const struct ipc4_pipeline_ext_obj_mem_data *mem_data;
+};
+
 #define pipeline_task_get(t) container_of(t, struct pipeline_task, task)
 
 /*
@@ -148,9 +155,11 @@ struct pipeline_task {
  * \param[in] pipeline_id Pipeline ID number.
  * \param[in] priority Pipeline scheduling priority.
  * \param[in] comp_id Pipeline component ID number.
+ * \param[in] pparams Pipeline parameters from IPC payload, maybe NULL.
  * \return New pipeline pointer or NULL.
  */
-struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t comp_id);
+struct pipeline *pipeline_new(uint32_t pipeline_id, uint32_t priority, uint32_t comp_id,
+			      struct create_pipeline_params *pparams);
 
 /**
  * \brief Free's a pipeline.

src/ipc/ipc3/helper.c

@@ -396,7 +396,7 @@ int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc)
 
 	/* create the pipeline */
 	pipe = pipeline_new(pipe_desc->pipeline_id, pipe_desc->priority,
-			    pipe_desc->comp_id);
+			    pipe_desc->comp_id, NULL);
 	if (!pipe) {
 		tr_err(&ipc_tr, "pipeline_new() failed");
 		return -ENOMEM;

src/ipc/ipc4/helper.c

@@ -233,7 +233,8 @@ struct ipc_comp_dev *ipc_get_comp_by_ppl_id(struct ipc *ipc, uint16_t type,
  * This function currently only decodes the payload and prints out
  * data it finds, but it does not store it anywhere.
  */
-__cold static int ipc4_create_pipeline_payload_decode(char *data)
+__cold static int ipc4_create_pipeline_payload_decode(char *data,
+						      struct create_pipeline_params *pparams)
 {
 	const struct ipc4_pipeline_ext_payload *hdr =
 		(struct ipc4_pipeline_ext_payload *)data;
@@ -295,6 +296,7 @@ __cold static int ipc4_create_pipeline_payload_decode(char *data)
 				       obj->object_words * sizeof(uint32_t), sizeof(*mem_data));
 				break;
 			}
+			pparams->mem_data = mem_data;
 			tr_info(&ipc_tr,
 				"init_ext_obj_mem_data domain %u stack %u interim %u lifetime %u shared %u",
 				mem_data->domain_id, mem_data->stack_bytes,
@@ -315,7 +317,8 @@ __cold static int ipc4_create_pipeline_payload_decode(char *data)
 	return 0;
 }
 
-__cold static int ipc4_create_pipeline(struct ipc4_pipeline_create *pipe_desc)
+__cold static int ipc4_create_pipeline(struct ipc4_pipeline_create *pipe_desc,
+				       struct create_pipeline_params *pparams)
 {
 	struct ipc_comp_dev *ipc_pipe;
 	struct pipeline *pipe;
@@ -332,7 +335,8 @@ __cold static int ipc4_create_pipeline(struct ipc4_pipeline_create *pipe_desc)
 	}
 
 	/* create the pipeline */
-	pipe = pipeline_new(pipe_desc->primary.r.instance_id, pipe_desc->primary.r.ppl_priority, 0);
+	pipe = pipeline_new(pipe_desc->primary.r.instance_id, pipe_desc->primary.r.ppl_priority, 0,
+			    pparams);
 	if (!pipe) {
 		tr_err(&ipc_tr, "ipc: pipeline_new() failed");
 		return IPC4_OUT_OF_MEMORY;
@@ -387,7 +391,8 @@ __cold static inline char *ipc4_get_pipe_create_data(void)
 __cold int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc)
 {
 	struct ipc4_pipeline_create *pipe_desc = ipc_from_pipe_new(_pipe_desc);
-
+	struct create_pipeline_params pparams = { 0 };
+	bool valid_pparams = false;
 	assert_can_be_cold();
 
 	tr_dbg(&ipc_tr, "ipc: pipeline id = %u", (uint32_t)pipe_desc->primary.r.instance_id);
@@ -398,13 +403,16 @@ __cold int ipc_pipeline_new(struct ipc *ipc, ipc_pipe_new *_pipe_desc)
 
 	if (pipe_desc->extension.r.payload) {
 		char *data;
+		int ret;
 
 		data = ipc4_get_pipe_create_data();
 
-		ipc4_create_pipeline_payload_decode(data);
+		ret = ipc4_create_pipeline_payload_decode(data, &pparams);
+		if (ret == 0)
+			valid_pparams = true;
 	}
 
-	return ipc4_create_pipeline(pipe_desc);
+	return ipc4_create_pipeline(pipe_desc, valid_pparams ? &pparams : NULL);
 }
 
 __cold static inline int ipc_comp_free_remote(struct comp_dev *dev)

test/cmocka/src/audio/pipeline/pipeline_new.c

@@ -51,7 +51,8 @@ static void test_audio_pipeline_pipeline_new_creation(void **state)
 	/*Testing component*/
 	struct pipeline *result = pipeline_new(test_data->pipe_id,
 					       test_data->priority,
-					       test_data->comp_id);
+					       test_data->comp_id,
+					       NULL);
 
 	/*Pipeline should have been created so pointer can't be null*/
 	assert_non_null(result);