Skip to content

hda-dma: refactor xrun handling #2512

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
Mar 11, 2020
Merged

hda-dma: refactor xrun handling #2512

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
23 changes: 10 additions & 13 deletions src/drivers/intel/cavs/hda-dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
#define DGCS_GEN BIT(26)
#define DGCS_FWCB BIT(23)
#define DGCS_BSC BIT(11)
#define DGCS_BOR BIT(10) /* buffer overrun */
/* NOTE: both XRUN bits are the same, just direction is different */
#define DGCS_BOR BIT(10) /* buffer overrun (input streams) */
#define DGCS_BUR BIT(10) /* buffer underrun (output streams) */

@lgirdwood lgirdwood Mar 10, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should both be bit 10 ?

@tlauda tlauda Mar 10, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@lgirdwood Yes, but have different names depends on the stream's direction. It's just cosmetic change.

@lgirdwood lgirdwood Mar 10, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ok, can you comment this otherwise it may confuse.

@tlauda tlauda Mar 10, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@lgirdwood Added additional comment.

#define DGCS_BF BIT(9) /* buffer full */
#define DGCS_BNE BIT(8) /* buffer not empty */
#define DGCS_FIFORDY BIT(5) /* enable FIFO */
Expand Down Expand Up @@ -778,19 +780,14 @@ static int hda_dma_remove(struct dma *dma)

static int hda_dma_link_check_xrun(struct dma_chan_data *chan)
{
uint32_t dgcs;
uint32_t dgcs = dma_chan_reg_read(chan, DGCS);

if (chan->direction == DMA_DIR_MEM_TO_DEV ||
chan->direction == DMA_DIR_DEV_TO_MEM) {
/* check for link xruns */
dgcs = dma_chan_reg_read(chan, DGCS);
if (dgcs & DGCS_BOR) {
trace_hddma_error("hda_dma_link_check_xrun() error: "
"xrun detected");
dma_chan_reg_update_bits(chan, DGCS, DGCS_BOR,
DGCS_BOR);
return -ENODATA;
}
if (chan->direction == DMA_DIR_MEM_TO_DEV && dgcs & DGCS_BUR) {
trace_hddma_error("hda_dma_link_check_xrun() error: underrun detected");
dma_chan_reg_update_bits(chan, DGCS, DGCS_BUR, DGCS_BUR);
} else if (chan->direction == DMA_DIR_DEV_TO_MEM && dgcs & DGCS_BOR) {
trace_hddma_error("hda_dma_link_check_xrun() error: overrun detected");
dma_chan_reg_update_bits(chan, DGCS, DGCS_BOR, DGCS_BOR);
}

return 0;
Expand Down