revert: Cross core Virtual heaps, invalidation of cross core buffers in unbind call #10044

Author: marcinszkudlinski

src/audio/buffers/audio_buffer.c

@@ -7,7 +7,6 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <errno.h>
-#include <rtos/panic.h>
 #include <rtos/alloc.h>
 #include <ipc/stream.h>
 #include <sof/audio/audio_buffer.h>
@@ -93,8 +92,9 @@ void audio_buffer_free(struct sof_audio_buffer *buffer)
 	audio_buffer_free(buffer->secondary_buffer_sink);
 	audio_buffer_free(buffer->secondary_buffer_source);
 #endif /* CONFIG_PIPELINE_2_0 */
-	/* "virtual destructor": free the buffer internals and buffer memory */
-	buffer->ops->free(buffer);
+	if (buffer->ops->free)
+		buffer->ops->free(buffer);
+	rfree(buffer);
 }
 
 static
@@ -196,7 +196,6 @@ void audio_buffer_init(struct sof_audio_buffer *buffer, uint32_t buffer_type, bo
 	CORE_CHECK_STRUCT_INIT(&buffer, is_shared);
 	buffer->buffer_type = buffer_type;
 	buffer->ops = audio_buffer_ops;
-	assert(audio_buffer_ops->free);
 	buffer->audio_stream_params = audio_stream_params;
 	buffer->is_shared = is_shared;
 

src/audio/buffers/comp_buffer.c

@@ -158,7 +158,6 @@ static void comp_buffer_free(struct sof_audio_buffer *audio_buffer)
 	notifier_unregister_all(NULL, buffer);
 
 	rfree(buffer->stream.addr);
-	rfree(buffer);
 }
 
 static struct source_ops comp_buffer_source_ops = {

src/audio/buffers/ring_buffer.c

@@ -96,7 +96,6 @@ static void ring_buffer_free(struct sof_audio_buffer *audio_buffer)
 			container_of(audio_buffer, struct ring_buffer, audio_buffer);
 
 	rfree((__sparse_force void *)ring_buffer->_data_buffer);
-	rfree(ring_buffer);
 }
 
 static void ring_buffer_reset(struct sof_audio_buffer *audio_buffer)
@@ -240,21 +239,6 @@ static int ring_buffer_release_data(struct sof_source *source, size_t free_size)
 	return 0;
 }
 
-int ring_buffer_module_unbind(struct sof_sink *sink)
-{
-	struct ring_buffer *ring_buffer = ring_buffer_from_sink(sink);
-
-	CORE_CHECK_STRUCT(&ring_buffer->audio_buffer);
-
-	/* in case of disconnection, invalidate all cache. This method is guaranteed be called on
-	 * core that have been using sink API
-	 */
-	ring_buffer_invalidate_shared(ring_buffer, ring_buffer->_data_buffer,
-				      ring_buffer->data_buffer_size);
-
-	return 0;
-}
-
 static struct source_ops ring_buffer_source_ops = {
 	.get_data_available = ring_buffer_get_data_available,
 	.get_data = ring_buffer_get_data,
@@ -265,7 +249,6 @@ static struct sink_ops ring_buffer_sink_ops = {
 	.get_free_size = ring_buffer_get_free_size,
 	.get_buffer = ring_buffer_get_buffer,
 	.commit_buffer = ring_buffer_commit_buffer,
-	.on_unbind = ring_buffer_module_unbind,
 };
 
 static const struct audio_buffer_ops audio_buffer_ops = {

src/audio/copier/copier.c

@@ -1173,9 +1173,9 @@ __cold static int copier_get_hw_params(struct comp_dev *dev, struct sof_ipc_stre
 	return dai_common_get_hw_params(dd, dev, params, dir);
 }
 
-__cold static int copier_bind(struct processing_module *mod, struct bind_info *bind_data)
+__cold static int copier_bind(struct processing_module *mod, void *data)
 {
-	const struct ipc4_module_bind_unbind *const bu = bind_data->ipc4_data;
+	const struct ipc4_module_bind_unbind *const bu = (struct ipc4_module_bind_unbind *)data;
 	const uint32_t src_id = IPC4_COMP_ID(bu->primary.r.module_id, bu->primary.r.instance_id);
 	const uint32_t src_queue_id = bu->extension.r.src_queue;
 	struct copier_data *cd = module_get_private_data(mod);
@@ -1202,7 +1202,7 @@ __cold static int copier_bind(struct processing_module *mod, struct bind_info *b
 	return -ENODEV;
 }
 
-__cold static int copier_unbind(struct processing_module *mod, struct bind_info *unbind_data)
+__cold static int copier_unbind(struct processing_module *mod, void *data)
 {
 	struct copier_data *cd = module_get_private_data(mod);
 	struct comp_dev *dev = mod->dev;
@@ -1212,7 +1212,7 @@ __cold static int copier_unbind(struct processing_module *mod, struct bind_info
 	if (dev->ipc_config.type == SOF_COMP_DAI) {
 		struct dai_data *dd = cd->dd[0];
 
-		return dai_zephyr_unbind(dd, dev, unbind_data);
+		return dai_zephyr_unbind(dd, dev, data);
 	}
 
 	return 0;

src/audio/copier/dai_copier.h

@@ -69,7 +69,7 @@ static inline int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, v
 int dai_zephyr_multi_endpoint_copy(struct dai_data **dd, struct comp_dev *dev,
 				   struct comp_buffer *multi_endpoint_buffer,
 				   int num_endpoints);
-int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, struct bind_info *unbind_data);
+int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, void *data);
 #endif
 
 

src/audio/dai-zephyr.c

@@ -1961,15 +1961,14 @@ static uint64_t dai_get_processed_data(struct comp_dev *dev, uint32_t stream_no,
 }
 
 #ifdef CONFIG_IPC_MAJOR_4
-__cold
-int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, struct bind_info *unbind_data)
+__cold int dai_zephyr_unbind(struct dai_data *dd, struct comp_dev *dev, void *data)
 {
 	struct ipc4_module_bind_unbind *bu;
 	int buf_id;
 
 	assert_can_be_cold();
 
-	bu = unbind_data->ipc4_data;
+	bu = (struct ipc4_module_bind_unbind *)data;
 	buf_id = IPC4_COMP_ID(bu->extension.r.src_queue, bu->extension.r.dst_queue);
 
 	if (dd && dd->local_buffer) {

src/audio/kpb.c

@@ -333,10 +333,10 @@ static int kpb_get_attribute(struct comp_dev *dev,
 /**
  * \brief Initialize KPB sinks when binding.
  * \param[in] dev - component device pointer.
- * \param[in] bind_data - bind/unbind data.
+ * \param[in] data - ipc4 bind/unbind data.
  * \return: none.
  */
-static int kpb_bind(struct comp_dev *dev, struct bind_info *bind_data)
+static int kpb_bind(struct comp_dev *dev, void *data)
 {
 	struct comp_data *kpb = comp_get_drvdata(dev);
 	struct ipc4_module_bind_unbind *bu;
@@ -345,7 +345,7 @@ static int kpb_bind(struct comp_dev *dev, struct bind_info *bind_data)
 
 	comp_dbg(dev, "kpb_bind()");
 
-	bu = bind_data->ipc4_data;
+	bu = (struct ipc4_module_bind_unbind *)data;
 	buf_id = IPC4_COMP_ID(bu->extension.r.src_queue, bu->extension.r.dst_queue);
 
 	/* We're assuming here that KPB Real Time sink (kpb->sel_sink) is
@@ -383,15 +383,15 @@ static int kpb_bind(struct comp_dev *dev, struct bind_info *bind_data)
  * \param[in] data - ipc4 bind/unbind data.
  * \return: none.
  */
-static int kpb_unbind(struct comp_dev *dev, struct bind_info *unbind_data)
+static int kpb_unbind(struct comp_dev *dev, void *data)
 {
 	struct comp_data *kpb = comp_get_drvdata(dev);
 	struct ipc4_module_bind_unbind *bu;
 	int buf_id;
 
 	comp_dbg(dev, "kpb_unbind()");
 
-	bu = unbind_data->ipc4_data;
+	bu = (struct ipc4_module_bind_unbind *)data;
 	buf_id = IPC4_COMP_ID(bu->extension.r.src_queue, bu->extension.r.dst_queue);
 
 	/* Reset sinks when unbinding */

src/audio/mixin_mixout/mixin_mixout.c

@@ -784,15 +784,17 @@ static int mixout_prepare(struct processing_module *mod,
 	return 0;
 }
 
-static int mixout_bind(struct processing_module *mod, struct bind_info *bind_data)
+static int mixout_bind(struct processing_module *mod, void *data)
 {
 	struct ipc4_module_bind_unbind *bu;
 	struct comp_dev *mixin;
 	struct pending_frames *pending_frames;
 	int src_id;
 	struct mixout_data *mixout_data;
 
-	bu = bind_data->ipc4_data;
+	comp_dbg(mod->dev, "mixout_bind() %p", data);
+
+	bu = (struct ipc4_module_bind_unbind *)data;
 	src_id = IPC4_COMP_ID(bu->primary.r.module_id, bu->primary.r.instance_id);
 
 	/* we are only interested in bind for mixin -> mixout pair */
@@ -831,7 +833,7 @@ static int mixout_bind(struct processing_module *mod, struct bind_info *bind_dat
 	return 0;
 }
 
-static int mixout_unbind(struct processing_module *mod, struct bind_info *unbind_data)
+static int mixout_unbind(struct processing_module *mod, void *data)
 {
 	struct ipc4_module_bind_unbind *bu;
 	struct comp_dev *mixin;
@@ -841,7 +843,7 @@ static int mixout_unbind(struct processing_module *mod, struct bind_info *unbind
 
 	comp_dbg(mod->dev, "mixout_unbind()");
 
-	bu = unbind_data->ipc4_data;
+	bu = (struct ipc4_module_bind_unbind *)data;
 	src_id = IPC4_COMP_ID(bu->primary.r.module_id, bu->primary.r.instance_id);
 
 	/* we are only interested in unbind for mixin -> mixout pair */

src/audio/module_adapter/module/generic.c

@@ -493,52 +493,22 @@ int module_set_configuration(struct processing_module *mod,
 }
 EXPORT_SYMBOL(module_set_configuration);
 
-int module_bind(struct processing_module *mod, struct bind_info *bind_data)
+int module_bind(struct processing_module *mod, void *data)
 {
-	int ret;
 	const struct module_interface *const ops = mod->dev->drv->adapter_ops;
 
-	switch (bind_data->bind_type) {
-	case COMP_BIND_TYPE_SINK:
-		ret = sink_bind(bind_data->sink, mod);
-		break;
-	case COMP_BIND_TYPE_SOURCE:
-		ret = source_bind(bind_data->source, mod);
-		break;
-	default:
-		ret = -EINVAL;
-	}
-	if (ret)
-		return ret;
-
 	if (ops->bind)
-		ret = ops->bind(mod, bind_data);
-
-	return ret;
+		return ops->bind(mod, data);
+	return 0;
 }
 
-int module_unbind(struct processing_module *mod, struct bind_info *unbind_data)
+int module_unbind(struct processing_module *mod, void *data)
 {
-	int ret;
 	const struct module_interface *const ops = mod->dev->drv->adapter_ops;
 
-	switch (unbind_data->bind_type) {
-	case COMP_BIND_TYPE_SINK:
-		ret = sink_unbind(unbind_data->sink);
-		break;
-	case COMP_BIND_TYPE_SOURCE:
-		ret = source_unbind(unbind_data->source);
-		break;
-	default:
-		ret = -EINVAL;
-	}
-	if (ret)
-		return ret;
-
 	if (ops->unbind)
-		ret = ops->unbind(mod, unbind_data);
-
-	return ret;
+		return ops->unbind(mod, data);
+	return 0;
 }
 
 void module_update_buffer_position(struct input_stream_buffer *input_buffers,

src/audio/module_adapter/module_adapter_ipc4.c

@@ -242,12 +242,12 @@ static bool module_adapter_multi_sink_source_prepare(struct comp_dev *dev)
 	return false;
 }
 
-int module_adapter_bind(struct comp_dev *dev, struct bind_info *bind_data)
+int module_adapter_bind(struct comp_dev *dev, void *data)
 {
 	struct processing_module *mod = comp_mod(dev);
 	int ret;
 
-	ret = module_bind(mod, bind_data);
+	ret = module_bind(mod, data);
 	if (ret < 0)
 		return ret;
 
@@ -257,12 +257,12 @@ int module_adapter_bind(struct comp_dev *dev, struct bind_info *bind_data)
 }
 EXPORT_SYMBOL(module_adapter_bind);
 
-int module_adapter_unbind(struct comp_dev *dev, struct bind_info *unbind_data)
+int module_adapter_unbind(struct comp_dev *dev, void *data)
 {
 	struct processing_module *mod = comp_mod(dev);
 	int ret;
 
-	ret = module_unbind(mod, unbind_data);
+	ret = module_unbind(mod, data);
 	if (ret < 0)
 		return ret;