audio: dai-zephyr: rework calls to DMA driver, remove channel pointer

For historical reasons, dai-zephyr has somewhat complicated code to
manage the DMA channel instance information. When a DMA channel is
allocated, a pointer to the system DMA channel table is acquired and
some additional information is stored per channel. This is however
redundant as the only piece of information actually needed is the
channel index.

Simplify the code by not storing the channel pointer anymore, but rather
just store the channel index and use that in all calls to the DMA
driver.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

src/audio/copier/copier_dai.c

@@ -208,6 +208,8 @@ __cold static int copier_dai_init(struct comp_dev *dev,
 	if (!dd)
 		return -ENOMEM;
 	memset(dd, 0, sizeof(*dd));
+	dd->chan_index = -1;
+	comp_info(dev, "dd %p initialized, index %d", dd, dd->chan_index);
 
 	ret = dai_common_new(dd, dev, dai);
 	if (ret < 0)

src/audio/dai-zephyr.c

@@ -505,7 +505,6 @@ __cold int dai_common_new(struct dai_data *dd, struct comp_dev *dev,
 
 	dma_sg_init(&dd->config.elem_array);
 	dd->xrun = 0;
-	dd->chan = NULL;
 
 #ifdef CONFIG_SOF_USERSPACE_LL
 	/*
@@ -591,6 +590,8 @@ __cold static struct comp_dev *dai_new(const struct comp_driver *drv,
 
 	memset(dd, 0, sizeof(*dd));
 	dd->heap = heap;
+	dd->chan_index = -1;
+	comp_info(dev, "dd %p initialized, index %d", dd, dd->chan_index);
 
 	comp_set_drvdata(dev, dd);
 
@@ -622,10 +623,8 @@ __cold void dai_common_free(struct dai_data *dd)
 	if (dd->group)
 		dai_group_put(dd->group);
 
-	if (dd->chan) {
-		sof_dma_release_channel(dd->dma, dd->chan->index);
-		dd->chan->dev_data = NULL;
-	}
+	if (dd->chan_index != -1)
+		sof_dma_release_channel(dd->dma, dd->chan_index);
 
 	sof_dma_put(dd->dma);
 
@@ -1157,9 +1156,9 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev)
 		return -EINVAL;
 	}
 
-	if (dd->chan) {
+	if (dd->chan_index != -1) {
 		comp_info(dev, "dma channel index %d already configured",
-			  dd->chan->index);
+			  dd->chan_index);
 		return 0;
 	}
 
@@ -1173,18 +1172,14 @@ int dai_common_config_prepare(struct dai_data *dd, struct comp_dev *dev)
 	}
 
 	/* get DMA channel */
-	channel = sof_dma_request_channel(dd->dma, channel);
-	if (channel < 0) {
+	dd->chan_index = sof_dma_request_channel(dd->dma, channel);
+	if (dd->chan_index < 0) {
 		comp_err(dev, "dma_request_channel() failed");
-		dd->chan = NULL;
 		return -EIO;
 	}
 
-	dd->chan = &dd->dma->chan[channel];
-	dd->chan->dev_data = dd;
-
 	comp_dbg(dev, "new configured dma channel index %d",
-		 dd->chan->index);
+		 dd->chan_index);
 
 	return 0;
 }
@@ -1195,8 +1190,8 @@ int dai_common_prepare(struct dai_data *dd, struct comp_dev *dev)
 
 	dd->total_data_processed = 0;
 
-	if (!dd->chan) {
-		comp_err(dev, "Missing dd->chan.");
+	if (dd->chan_index == -1) {
+		comp_err(dev, "Missing dd->chan_index.");
 		comp_set_state(dev, COMP_TRIGGER_RESET);
 		return -EINVAL;
 	}
@@ -1217,7 +1212,7 @@ int dai_common_prepare(struct dai_data *dd, struct comp_dev *dev)
 		return 0;
 	}
 
-	ret = sof_dma_config(dd->chan->dma, dd->chan->index, dd->z_config);
+	ret = sof_dma_config(dd->dma, dd->chan_index, dd->z_config);
 	if (ret < 0)
 		comp_set_state(dev, COMP_TRIGGER_RESET);
 
@@ -1304,7 +1299,7 @@ static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev,
 
 		/* only start the DAI if we are not XRUN handling */
 		if (dd->xrun == 0) {
-			ret = sof_dma_start(dd->chan->dma, dd->chan->index);
+			ret = sof_dma_start(dd->dma, dd->chan_index);
 			if (ret < 0)
 				return ret;
 
@@ -1342,16 +1337,16 @@ static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev,
 		/* only start the DAI if we are not XRUN handling */
 		if (dd->xrun == 0) {
 			/* recover valid start position */
-			ret = sof_dma_stop(dd->chan->dma, dd->chan->index);
+			ret = sof_dma_stop(dd->dma, dd->chan_index);
 			if (ret < 0)
 				return ret;
 
 			/* dma_config needed after stop */
-			ret = sof_dma_config(dd->chan->dma, dd->chan->index, dd->z_config);
+			ret = sof_dma_config(dd->dma, dd->chan_index, dd->z_config);
 			if (ret < 0)
 				return ret;
 
-			ret = sof_dma_start(dd->chan->dma, dd->chan->index);
+			ret = sof_dma_start(dd->dma, dd->chan_index);
 			if (ret < 0)
 				return ret;
 
@@ -1379,11 +1374,11 @@ static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev,
  * as soon as possible.
  */
 #if CONFIG_COMP_DAI_STOP_TRIGGER_ORDER_REVERSE
-		ret = sof_dma_stop(dd->chan->dma, dd->chan->index);
+		ret = sof_dma_stop(dd->dma, dd->chan_index);
 		dai_trigger_op(dd->dai, cmd, dev->direction);
 #else
 		dai_trigger_op(dd->dai, cmd, dev->direction);
-		ret = sof_dma_stop(dd->chan->dma, dd->chan->index);
+		ret = sof_dma_stop(dd->dma, dd->chan_index);
 		if (ret) {
 			comp_warn(dev, "dma was stopped earlier");
 			ret = 0;
@@ -1393,11 +1388,11 @@ static int dai_comp_trigger_internal(struct dai_data *dd, struct comp_dev *dev,
 	case COMP_TRIGGER_PAUSE:
 		comp_dbg(dev, "PAUSE");
 #if CONFIG_COMP_DAI_STOP_TRIGGER_ORDER_REVERSE
-		ret = sof_dma_suspend(dd->chan->dma, dd->chan->index);
+		ret = sof_dma_suspend(dd->dma, dd->chan_index);
 		dai_trigger_op(dd->dai, cmd, dev->direction);
 #else
 		dai_trigger_op(dd->dai, cmd, dev->direction);
-		ret = sof_dma_suspend(dd->chan->dma, dd->chan->index);
+		ret = sof_dma_suspend(dd->dma, dd->chan_index);
 #endif
 		break;
 	case COMP_TRIGGER_PRE_START:
@@ -1495,7 +1490,7 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd)
  */
 static int dai_get_status(struct comp_dev *dev, struct dai_data *dd, struct dma_status *stat)
 {
-	int ret = sof_dma_get_status(dd->chan->dma, dd->chan->index, stat);
+	int ret = sof_dma_get_status(dd->dma, dd->chan_index, stat);
 #if CONFIG_XRUN_NOTIFICATIONS_ENABLE
 	if (ret == -EPIPE && !dd->xrun_notification_sent) {
 		struct ipc_msg *notify = ipc_notification_pool_get(IPC4_RESOURCE_EVENT_SIZE);
@@ -1611,7 +1606,7 @@ int dai_zephyr_multi_endpoint_copy(struct dai_data **dd, struct comp_dev *dev,
 #endif
 
 		for (i = 0; i < num_endpoints; i++) {
-			ret = sof_dma_reload(dd[i]->chan->dma, dd[i]->chan->index, 0);
+			ret = sof_dma_reload(dd[i]->dma, dd[i]->chan_index, 0);
 			if (ret < 0) {
 				dai_report_reload_xrun(dd[i], dev, 0);
 				return ret;
@@ -1637,10 +1632,10 @@ int dai_zephyr_multi_endpoint_copy(struct dai_data **dd, struct comp_dev *dev,
 
 		status = dai_dma_multi_endpoint_cb(dd[i], dev, frames, multi_endpoint_buffer);
 		if (status == SOF_DMA_CB_STATUS_END)
-			sof_dma_stop(dd[i]->chan->dma, dd[i]->chan->index);
+			sof_dma_stop(dd[i]->dma, dd[i]->chan_index);
 
 		copy_bytes = frames * audio_stream_frame_bytes(&dd[i]->dma_buffer->stream);
-		ret = sof_dma_reload(dd[i]->chan->dma, dd[i]->chan->index, copy_bytes);
+		ret = sof_dma_reload(dd[i]->dma, dd[i]->chan_index, copy_bytes);
 		if (ret < 0) {
 			dai_report_reload_xrun(dd[i], dev, copy_bytes);
 			return ret;
@@ -1829,7 +1824,7 @@ int dai_common_copy(struct dai_data *dd, struct comp_dev *dev, pcm_converter_fun
 		comp_warn(dev, "nothing to copy, src_frames: %u, sink_frames: %u",
 			  src_frames, sink_frames);
 #endif
-		sof_dma_reload(dd->chan->dma, dd->chan->index, 0);
+		sof_dma_reload(dd->dma, dd->chan_index, 0);
 		return 0;
 	}
 
@@ -1839,9 +1834,9 @@ int dai_common_copy(struct dai_data *dd, struct comp_dev *dev, pcm_converter_fun
 		comp_warn(dev, "dai trigger copy failed");
 
 	if (dai_dma_cb(dd, dev, copy_bytes, converter) == SOF_DMA_CB_STATUS_END)
-		sof_dma_stop(dd->chan->dma, dd->chan->index);
+		sof_dma_stop(dd->dma, dd->chan_index);
 
-	ret = sof_dma_reload(dd->chan->dma, dd->chan->index, copy_bytes);
+	ret = sof_dma_reload(dd->dma, dd->chan_index, copy_bytes);
 	if (ret < 0) {
 		dai_report_reload_xrun(dd, dev, copy_bytes);
 		return ret;
@@ -1879,7 +1874,7 @@ int dai_common_ts_config_op(struct dai_data *dd, struct comp_dev *dev)
 	struct dai_ts_cfg *cfg = &dd->ts_config;
 
 	comp_dbg(dev, "dai_ts_config()");
-	if (!dd->chan) {
+	if (dd->chan_index == -1) {
 		comp_err(dev, "No DMA channel information");
 		return -EINVAL;
 	}
@@ -1902,7 +1897,7 @@ int dai_common_ts_config_op(struct dai_data *dd, struct comp_dev *dev)
 	cfg->direction = dai->direction;
 	cfg->index = dd->dai->index;
 	cfg->dma_id = dd->dma->plat_data.id;
-	cfg->dma_chan_index = dd->chan->index;
+	cfg->dma_chan_index = dd->chan_index;
 	cfg->dma_chan_count = dd->dma->plat_data.channels;
 
 	return dai_ts_config(dd->dai->dev, cfg);

src/include/sof/lib/dai-zephyr.h

@@ -117,7 +117,7 @@ typedef int (*channel_copy_func)(const struct audio_stream *src, unsigned int sr
  */
 struct dai_data {
 	/* local DMA config */
-	struct dma_chan_data *chan;
+	int chan_index;
 	uint32_t stream_id;
 	struct dma_sg_config config;
 	struct dma_config *z_config;

src/ipc/ipc4/dai.c

@@ -202,7 +202,7 @@ void dai_dma_release(struct dai_data *dd, struct comp_dev *dev)
 	}
 
 	/* put the allocated DMA channel first */
-	if (dd->chan) {
+	if (dd->chan_index != -1) {
 		struct ipc4_llp_reading_slot slot;
 
 		if (dd->slot_info.node_id) {
@@ -224,15 +224,16 @@ void dai_dma_release(struct dai_data *dd, struct comp_dev *dev)
 		 */
 #if CONFIG_ZEPHYR_NATIVE_DRIVERS
 		/* if reset is after pause dma has already been stopped */
-		dma_stop(dd->chan->dma->z_dev, dd->chan->index);
+		dma_stop(dd->dma->z_dev, dd->chan_index);
 
-		dma_release_channel(dd->chan->dma->z_dev, dd->chan->index);
+		dma_release_channel(dd->dma->z_dev, dd->chan_index);
 #else
+		/* TODO: to remove this, no longer works! */
 		dma_stop_legacy(dd->chan);
 		dma_channel_put_legacy(dd->chan);
-#endif
-		dd->chan->dev_data = NULL;
 		dd->chan = NULL;
+#endif
+
 	}
 }
 
@@ -351,9 +352,9 @@ __cold int dai_config(struct dai_data *dd, struct comp_dev *dev,
 		return 0;
 	}
 
-	if (dd->chan) {
+	if (dd->chan_index != -1) {
 		comp_info(dev, "Configured. dma channel index %d, ignore...",
-			  dd->chan->index);
+			  dd->chan_index);
 		return 0;
 	}
 
@@ -414,7 +415,7 @@ int dai_common_position(struct dai_data *dd, struct comp_dev *dev,
 	platform_dai_wallclock(dev, &dd->wallclock);
 	posn->wallclock = dd->wallclock;
 
-	ret = dma_get_status(dd->dma->z_dev, dd->chan->index, &status);
+	ret = dma_get_status(dd->dma->z_dev, dd->chan_index, &status);
 	if (ret < 0)
 		return ret;
 
@@ -439,7 +440,7 @@ void dai_dma_position_update(struct dai_data *dd, struct comp_dev *dev)
 	if (!dd->slot_info.node_id)
 		return;
 
-	ret = dma_get_status(dd->dma->z_dev, dd->chan->index, &status);
+	ret = dma_get_status(dd->dma->z_dev, dd->chan_index, &status);
 	if (ret < 0)
 		return;