Skip to content

drivers: Intel: hda-dma: only check DGCS_BUSY with delayed stop #4938

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
keyonjie merged 1 commit into from
Nov 4, 2021
Merged

drivers: Intel: hda-dma: only check DGCS_BUSY with delayed stop #4938

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
15 changes: 9 additions & 6 deletions src/drivers/intel/hda/hda-dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ static int hda_dma_release(struct dma_chan_data *channel)

static int hda_dma_stop_common(struct dma_chan_data *channel)
{
struct dai_data *dd = channel->dev_data;
struct hda_chan_data *hda_chan;
uint32_t flags, dgcs;

Expand All @@ -668,12 +669,14 @@ static int hda_dma_stop_common(struct dma_chan_data *channel)
}

/* check if channel is idle. No need to wait after clearing the GEN bit */
dgcs = dma_chan_reg_read(channel, DGCS);
if (dgcs & DGCS_GBUSY) {
tr_err(&hdma_tr, "hda-dmac: %d channel %d not idle after stop",
channel->dma->plat_data.id, channel->index);
irq_local_enable(flags);
return -EBUSY;
if (dd && dd->delayed_dma_stop) {
dgcs = dma_chan_reg_read(channel, DGCS);
if (dgcs & DGCS_GBUSY) {
tr_err(&hdma_tr, "hda-dmac: %d channel %d not idle after stop",
channel->dma->plat_data.id, channel->index);
irq_local_enable(flags);
return -EBUSY;
}
}
channel->status = COMP_STATE_PREPARE;
hda_chan = dma_chan_get_data(channel);
Expand Down