Skip to content

dai: assign link DMA channel at run-time #1354

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
jajanusz merged 1 commit into from
May 29, 2019
Merged

dai: assign link DMA channel at run-time #1354

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
43 changes: 30 additions & 13 deletions src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,6 +718,20 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
*/
dev->frame_bytes = 4;
channel = config->hda.link_dma_ch;
trace_dai_with_ids(dev, "dai_config(), channel = %d",
channel);

/*
* For HDA DAIs, the driver sends the DAI_CONFIG IPC
* during every link hw_params and hw_free, apart from the
* the first DAI_CONFIG IPC sent during topology parsing.
* Free the channel that is currently in use before
* assigning the new one.
*/
if (dd->chan != DMA_CHAN_INVALID) {
dma_channel_put(dd->dma, dd->chan);
dd->chan = DMA_CHAN_INVALID;
}
break;
default:
/* other types of DAIs not handled for now */
Expand All @@ -735,21 +749,24 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
return -EINVAL;
}

if (dd->chan == DMA_CHAN_INVALID)
/* get dma channel at first config only */
dd->chan = dma_channel_get(dd->dma, channel);
if (channel != DMA_CHAN_INVALID) {
if (dd->chan == DMA_CHAN_INVALID)
/* get dma channel at first config only */
dd->chan = dma_channel_get(dd->dma, channel);

if (dd->chan < 0) {
trace_dai_error_with_ids(dev, "dai_config() error: "
"dma_channel_get() failed");
return -EIO;
}

/* set up callback */
dma_set_cb(dd->dma, dd->chan, DMA_CB_TYPE_IRQ | DMA_CB_TYPE_COPY,
dai_dma_cb, dev);
if (dd->chan < 0) {
trace_dai_error_with_ids(dev, "dai_config() error: "
"dma_channel_get() failed");
dd->chan = DMA_CHAN_INVALID;
return -EIO;
Copy link

@mmaka1 mmaka1 May 10, 2019

Choose a reason for hiding this comment

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

Another issue with inconsistent dd->chan value in case of failure.

Copy link
Member

@plbossart plbossart May 28, 2019

Choose a reason for hiding this comment

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

@ranj063 did you address Marcin's comment?

Copy link
Collaborator Author

@ranj063 ranj063 May 28, 2019

Choose a reason for hiding this comment

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

@plbossart yes. he has already approved the PR as well.

}

dev->is_dma_connected = 1;
/* set up callback */
dma_set_cb(dd->dma, dd->chan,
DMA_CB_TYPE_IRQ | DMA_CB_TYPE_COPY,
dai_dma_cb, dev);
dev->is_dma_connected = 1;
}

return 0;
}
Expand Down