Skip to content

dma channel management fixes #786

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
Jan 8, 2019
Merged

dma channel management fixes #786

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
0933bdd
dai: only get dma channel at first config
keyonjie Jan 2, 2019
572ea83
host: reset dma channel to invalid by default
keyonjie Jan 2, 2019
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
7 changes: 5 additions & 2 deletions src/audio/dai.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ static struct comp_dev *dai_new(struct sof_ipc_comp *comp)
dd->dai_pos_blks = 0;
dd->xrun = 0;
dd->pointer_init = 0;
dd->chan = DMA_CHAN_INVALID;

dev->state = COMP_STATE_READY;
return dev;
Expand Down Expand Up @@ -747,8 +748,10 @@ static int dai_config(struct comp_dev *dev, struct sof_ipc_dai_config *config)
return -EINVAL;
}

/* channel is ignored by GP dma get function */
dd->chan = dma_channel_get(dd->dma, channel);
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("dai_config() error: dma_channel_get() failed");
return -EIO;
Expand Down
5 changes: 5 additions & 0 deletions src/audio/host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,8 @@ static struct comp_dev *host_new(struct sof_ipc_comp *comp)
goto error;
#endif

hd->chan = DMA_CHAN_INVALID;

/* init posn data. TODO: other fields */
hd->posn.comp_id = comp->id;
hd->pointer_init = 0;
Expand Down Expand Up @@ -644,6 +646,9 @@ static int host_reset(struct comp_dev *dev)
dma_sg_free(&hd->config.elem_array);
#endif

/* reset dma channel as we have put it */
hd->chan = DMA_CHAN_INVALID;

host_pointer_reset(dev);
hd->pointer_init = 0;
#if !defined CONFIG_DMA_GW
Expand Down
2 changes: 2 additions & 0 deletions src/include/sof/dma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@
#define DMA_RELOAD_END 0
#define DMA_RELOAD_LLI 0xFFFFFFFF

#define DMA_CHAN_INVALID 0xFFFFFFFF

struct dma;

/**
Expand Down