buffer: Move pipeline_id down into stream params

The pipeline_id has historically been part of the comp_buffer struct,
but that is being deprecated as a public API.  So move it down into
the contained sof_audio_stream_params struct where it can be found by
new style sink/source code.

Note that the actual value of the pipeline ID is a little ambiguous:
on IPC3, the buffer is defined by the user in the .tplg file as part
of a specific pipeline with a known ID.  With IPC4 topology, the
buffers are implicitly created and will be assigned the ID of their
source (!)  component.  It is legal to define a connection across two
pipelines, and there's no ability here to recover both pipeline IDs.

Signed-off-by: Andy Ross <andyross@google.com>

Author: andyross

src/audio/crossover/crossover.c

@@ -111,7 +111,7 @@ static int crossover_assign_sinks(struct processing_module *mod,
 		unsigned int sink_id, state;
 
 		sink = container_of(sink_list, struct comp_buffer, source_list);
-		sink_id = crossover_get_sink_id(cd, sink->pipeline_id, j);
+		sink_id = crossover_get_sink_id(cd, buffer_pipeline_id(sink), j);
 		state = sink->sink->state;
 		if (state != dev->state) {
 			j++;

src/audio/crossover/crossover_ipc3.c

@@ -46,7 +46,7 @@ int crossover_check_sink_assign(struct processing_module *mod,
 		unsigned int pipeline_id;
 
 		sink = container_of(sink_list, struct comp_buffer, source_list);
-		pipeline_id = sink->pipeline_id;
+		pipeline_id = buffer_pipeline_id(sink);
 
 		i = crossover_get_stream_index(mod, config, pipeline_id);
 		if (i < 0) {

src/audio/mux/mux.c

@@ -248,13 +248,13 @@ static int demux_process(struct processing_module *mod,
 	list_for_item(clist, &dev->bsink_list) {
 		sink = container_of(clist, struct comp_buffer, source_list);
 		if (sink->sink->state == dev->state) {
-			i = get_stream_index(dev, cd, sink->pipeline_id);
+			i = get_stream_index(dev, cd, buffer_pipeline_id(sink));
 			/* return if index wrong */
 			if (i < 0) {
 				return i;
 			}
 
-			look_ups[i] = get_lookup_table(dev, cd, sink->pipeline_id);
+			look_ups[i] = get_lookup_table(dev, cd, buffer_pipeline_id(sink));
 			sinks_stream[i] = &sink->stream;
 		}
 	}
@@ -310,7 +310,7 @@ static int mux_process(struct processing_module *mod,
 			else
 				frames = input_buffers[j].size;
 
-			i = get_stream_index(dev, cd, source->pipeline_id);
+			i = get_stream_index(dev, cd, buffer_pipeline_id(source));
 			/* return if index wrong */
 			if (i < 0) {
 				return i;

src/audio/mux/mux_ipc4.c

@@ -114,7 +114,7 @@ static void set_mux_params(struct processing_module *mod)
 		{
 			source = container_of(source_list, struct comp_buffer, sink_list);
 			j = buf_get_id(source);
-			cd->config.streams[j].pipeline_id = source->pipeline_id;
+			cd->config.streams[j].pipeline_id = buffer_pipeline_id(source);
 			if (j == BASE_CFG_QUEUED_ID)
 				audio_fmt = &cd->md.base_cfg.audio_fmt;
 			else

src/include/module/audio/audio_stream.h

@@ -20,6 +20,7 @@
  */
 struct sof_audio_stream_params {
 	uint32_t id;
+	uint32_t pipeline_id;
 	enum sof_ipc_frame frame_fmt;	/**< Sample data format */
 	enum sof_ipc_frame valid_sample_fmt;
 

src/include/sof/audio/buffer.h

@@ -43,9 +43,6 @@ extern struct tr_ctx buffer_tr;
 /** \brief Retrieves trace context from the buffer */
 #define trace_buf_get_tr_ctx(buf_ptr) (&(buf_ptr)->tctx)
 
-/** \brief Retrieves id (pipe id) from the buffer */
-#define trace_buf_get_id(buf_ptr) ((buf_ptr)->pipeline_id)
-
 /** \brief Retrieves subid (comp id) from the buffer */
 #define buf_get_id(buf_ptr) ((buf_ptr)->stream.runtime_stream_params.id)
 
@@ -57,36 +54,36 @@ extern struct tr_ctx buffer_tr;
 #define __BUF_FMT "buf:%u.%u "
 #endif
 
-#define buf_err(buf_ptr, __e, ...) LOG_ERR(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
+#define buf_err(buf_ptr, __e, ...) LOG_ERR(__BUF_FMT __e, buffer_pipeline_id(buf_ptr), \
 					   buf_get_id(buf_ptr), ##__VA_ARGS__)
 
-#define buf_warn(buf_ptr, __e, ...) LOG_WRN(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
+#define buf_warn(buf_ptr, __e, ...) LOG_WRN(__BUF_FMT __e, buffer_pipeline_id(buf_ptr), \
 					    buf_get_id(buf_ptr), ##__VA_ARGS__)
 
-#define buf_info(buf_ptr, __e, ...) LOG_INF(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
+#define buf_info(buf_ptr, __e, ...) LOG_INF(__BUF_FMT __e, buffer_pipeline_id(buf_ptr), \
 					    buf_get_id(buf_ptr), ##__VA_ARGS__)
 
-#define buf_dbg(buf_ptr, __e, ...) LOG_DBG(__BUF_FMT __e, trace_buf_get_id(buf_ptr), \
+#define buf_dbg(buf_ptr, __e, ...) LOG_DBG(__BUF_FMT __e, buffer_pipeline_id(buf_ptr), \
 					   buf_get_id(buf_ptr), ##__VA_ARGS__)
 
 #else
 /** \brief Trace error message from buffer */
 #define buf_err(buf_ptr, __e, ...)						\
-	trace_dev_err(trace_buf_get_tr_ctx, trace_buf_get_id,			\
+	trace_dev_err(trace_buf_get_tr_ctx, buffer_pipeline_id,			\
 		      buf_get_id,					\
 		      (__sparse_force const struct comp_buffer *)buf_ptr,	\
 		      __e, ##__VA_ARGS__)
 
 /** \brief Trace warning message from buffer */
 #define buf_warn(buf_ptr, __e, ...)						\
-	trace_dev_warn(trace_buf_get_tr_ctx, trace_buf_get_id,			\
+	trace_dev_warn(trace_buf_get_tr_ctx, buffer_pipeline_id,			\
 		       buf_get_id,					\
 		       (__sparse_force const struct comp_buffer *)buf_ptr,	\
 		        __e, ##__VA_ARGS__)
 
 /** \brief Trace info message from buffer */
 #define buf_info(buf_ptr, __e, ...)						\
-	trace_dev_info(trace_buf_get_tr_ctx, trace_buf_get_id,			\
+	trace_dev_info(trace_buf_get_tr_ctx, buffer_pipeline_id,			\
 		       buf_get_id,					\
 		       (__sparse_force const struct comp_buffer *)buf_ptr,	\
 		       __e, ##__VA_ARGS__)
@@ -96,7 +93,7 @@ extern struct tr_ctx buffer_tr;
 #define buf_dbg(buf_ptr, __e, ...)
 #else
 #define buf_dbg(buf_ptr, __e, ...)						\
-	trace_dev_dbg(trace_buf_get_tr_ctx, trace_buf_get_id,			\
+	trace_dev_dbg(trace_buf_get_tr_ctx, buffer_pipeline_id,			\
 		      buf_get_id,					\
 		      (__sparse_force const struct comp_buffer *)buf_ptr,	\
 		      __e, ##__VA_ARGS__)
@@ -139,7 +136,6 @@ struct comp_buffer {
 	struct audio_stream stream;
 
 	/* configuration */
-	uint32_t pipeline_id;
 	uint32_t caps;
 	uint32_t core;
 	struct tr_ctx tctx;			/* trace settings */
@@ -276,6 +272,11 @@ static inline struct comp_dev *buffer_get_comp(struct comp_buffer *buffer, int d
 	return comp;
 }
 
+static inline uint32_t buffer_pipeline_id(const struct comp_buffer *buffer)
+{
+	return buffer->stream.runtime_stream_params.pipeline_id;
+}
+
 static inline void buffer_reset_pos(struct comp_buffer *buffer, void *data)
 {
 	/* reset rw pointers and avail/free bytes counters */

src/ipc/ipc-helper.c

@@ -64,7 +64,7 @@ struct comp_buffer *buffer_new(const struct sof_ipc_buffer *desc, bool is_shared
 			      is_shared);
 	if (buffer) {
 		buffer->stream.runtime_stream_params.id = desc->comp.id;
-		buffer->pipeline_id = desc->comp.pipeline_id;
+		buffer->stream.runtime_stream_params.pipeline_id = desc->comp.pipeline_id;
 		buffer->core = desc->comp.core;
 
 		memcpy_s(&buffer->tctx, sizeof(struct tr_ctx),
@@ -80,7 +80,7 @@ int32_t ipc_comp_pipe_id(const struct ipc_comp_dev *icd)
 	case COMP_TYPE_COMPONENT:
 		return dev_comp_pipe_id(icd->cd);
 	case COMP_TYPE_BUFFER:
-		return icd->cb->pipeline_id;
+		return buffer_pipeline_id(icd->cb);
 	case COMP_TYPE_PIPELINE:
 		return icd->pipeline->pipeline_id;
 	default:

tools/testbench/testbench.c

@@ -163,7 +163,7 @@ static void test_pipeline_free_comps(int pipeline_id)
 					icd->id);
 			break;
 		case COMP_TYPE_BUFFER:
-			if (icd->cb->pipeline_id != pipeline_id)
+			if (buffer_pipeline_id(icd->cb) != pipeline_id)
 				break;
 			err = ipc_buffer_free(sof_get()->ipc, icd->id);
 			if (err)