Skip to content

dma: switch to native Zephyr API for dw-dma & HDA #5610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
May 31, 2022
Merged

dma: switch to native Zephyr API for dw-dma & HDA #5610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf4e9e0
dma: add Zephyr native DMA support to host & dai
abonislawski May 12, 2022
a54a272
dma: cavs: use Zephyr DW-DMA & HDA drivers
abonislawski May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/audio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

if(NOT CONFIG_LIBRARY)
add_local_sources(sof
host.c
host-legacy.c
Copy link
Collaborator

@lyakh lyakh May 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be possible to split this patch, making the renaming to *legacy file and function names a separate patch?

component.c
data_blob.c
buffer.c
Expand Down Expand Up @@ -55,7 +55,7 @@ if(NOT CONFIG_LIBRARY)
endif()
if(CONFIG_COMP_DAI)
add_local_sources(sof
dai.c
dai-legacy.c
)
endif()
if(CONFIG_COMP_KPB)
Expand Down
22 changes: 11 additions & 11 deletions src/audio/dai.c → src/audio/dai-legacy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static void dai_free(struct comp_dev *dev)

if (dd->chan) {
notifier_unregister(dev, dd->chan, NOTIFIER_ID_DMA_COPY);
dma_channel_put(dd->chan);
dma_channel_put_legacy(dd->chan);
dd->chan->dev_data = NULL;
}

Expand Down Expand Up @@ -595,7 +595,7 @@ static int dai_config_prepare(struct comp_dev *dev)
}

/* allocate DMA channel */
dd->chan = dma_channel_get(dd->dma, channel);
dd->chan = dma_channel_get_legacy(dd->dma, channel);
if (!dd->chan) {
comp_err(dev, "dai_config_prepare(): dma_channel_get() failed");
dd->chan = NULL;
Expand Down Expand Up @@ -656,7 +656,7 @@ static int dai_prepare(struct comp_dev *dev)
return ret;
}

ret = dma_set_config(dd->chan, &dd->config);
ret = dma_set_config_legacy(dd->chan, &dd->config);
if (ret < 0)
comp_set_state(dev, COMP_TRIGGER_RESET);

Expand Down Expand Up @@ -728,7 +728,7 @@ static int dai_comp_trigger_internal(struct comp_dev *dev, int cmd)

/* only start the DAI if we are not XRUN handling */
if (dd->xrun == 0) {
ret = dma_start(dd->chan);
ret = dma_start_legacy(dd->chan);
if (ret < 0)
return ret;
/* start the DAI */
Expand All @@ -750,13 +750,13 @@ static int dai_comp_trigger_internal(struct comp_dev *dev, int cmd)
/* only start the DAI if we are not XRUN handling */
if (dd->xrun == 0) {
/* recover valid start position */
ret = dma_release(dd->chan);
ret = dma_release_legacy(dd->chan);
if (ret < 0)
return ret;

/* start the DAI */
dai_trigger(dd->dai, cmd, dev->direction);
ret = dma_start(dd->chan);
ret = dma_start_legacy(dd->chan);
if (ret < 0)
return ret;
} else {
Expand All @@ -781,16 +781,16 @@ static int dai_comp_trigger_internal(struct comp_dev *dev, int cmd)
* as soon as possible.
*/
#if CONFIG_DMA_SUSPEND_DRAIN
ret = dma_stop(dd->chan);
ret = dma_stop_legacy(dd->chan);
dai_trigger(dd->dai, cmd, dev->direction);
#else
dai_trigger(dd->dai, cmd, dev->direction);
ret = dma_stop(dd->chan);
ret = dma_stop_legacy(dd->chan);
#endif
break;
case COMP_TRIGGER_PAUSE:
comp_dbg(dev, "dai_comp_trigger_internal(), PAUSE");
ret = dma_pause(dd->chan);
ret = dma_pause_legacy(dd->chan);
dai_trigger(dd->dai, cmd, dev->direction);
break;
case COMP_TRIGGER_PRE_START:
Expand Down Expand Up @@ -904,7 +904,7 @@ static int dai_copy(struct comp_dev *dev)
comp_dbg(dev, "dai_copy()");

/* get data sizes from DMA */
ret = dma_get_data_size(dd->chan, &avail_bytes, &free_bytes);
ret = dma_get_data_size_legacy(dd->chan, &avail_bytes, &free_bytes);
if (ret < 0) {
dai_report_xrun(dev, 0);
return ret;
Expand Down Expand Up @@ -952,7 +952,7 @@ static int dai_copy(struct comp_dev *dev)
return 0;
}

ret = dma_copy(dd->chan, copy_bytes, 0);
ret = dma_copy_legacy(dd->chan, copy_bytes, 0);
if (ret < 0) {
dai_report_xrun(dev, copy_bytes);
return ret;
Expand Down
Loading