Skip to content

dai: fix error handling when DMA is stuck #208

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 1 commit into from
Aug 8, 2018
Merged

dai: fix error handling when DMA is stuck #208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd)

switch (cmd) {
case COMP_TRIGGER_START:
trace_dai("tsa");
if (!dd->pointer_init)
dai_pointer_init(dev);
/* only start the DAI if we are not XRUN handling */
Expand Down Expand Up @@ -595,15 +596,15 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd)
platform_dai_wallclock(dev, &dd->wallclock);
break;
case COMP_TRIGGER_XRUN:
trace_dai("txr");
dd->xrun = 1;
/* stop the DAI unconditionally */
dai_trigger(dd->dai, COMP_TRIGGER_STOP, dev->params.direction);
ret = dma_stop(dd->dma, dd->chan);
if (ret < 0)
return ret;
break;
case COMP_TRIGGER_PAUSE:
case COMP_TRIGGER_STOP:
trace_dai("tsp");
wait_init(&dd->complete);

/* wait for DMA to complete */
Expand All @@ -612,6 +613,10 @@ static int dai_comp_trigger(struct comp_dev *dev, int cmd)
if (ret < 0) {
trace_dai_error("ed0");
trace_error_value(cmd);
/* forced stop of DMA+DAI to avoid refcount issues */
dai_trigger(dd->dai, COMP_TRIGGER_STOP,
dev->params.direction);
ret = dma_stop(dd->dma, dd->chan);
}
break;
default:
Expand Down