ASoC: rsnd: DMA power fix and IOMMU support
Subsystems (3)
v2 cover ASoC: rsnd: DMA power fix and IOMMU support
Hi Mark
Cc Laurent
These are v2 remain of Renesas sound DMA patches. [1/4] [2/4] were accepted, [3/4] [4/4] are not.
1) patch controls Audio-DMAC power.
Current driver gets DMAEngile handle when .probe() timing, and release it on .remove() timing. But Audio-DMAC power ON/OFF are related to this timing. This means Audio-DMAC always ON Now.
Basically, this kind of DMAC power control should be handled by DMAEngile, but current DMAEngile can't handle pm_runtime_xxx on atomic context.
Because of this DMAEngile API issue, the *better* solution is get DMAEngile handle on every playback timing.
Kuninori Morimoto (2):
1) ASoC: rsnd: Request/Release DMA channel each time
2) ASoC: rsnd: use dma_sync_single_for_xxx() for IOMMU
sound/soc/sh/rcar/core.c | 4 +-- sound/soc/sh/rcar/dma.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------
Best regards
---
Kuninori Morimoto
PATCH RESEND v2 1/2 ASoC: rsnd: Request/Release DMA channel each time
From: Kuninori Morimoto <[email protected]>
Current Renesas Sound driver requests DMA channel when .probe timing, and release it when .remove timing. And use DMA on .start/.stop But, Audio DMAC power ON was handled when request timing (= .probe), and power OFF was when release timing (= .remove).
This means Audio DMAC power is always ON during driver was enabled. The best choice to solve this issue is that DMAEngine side handle this. But current DMAEngine API design can't solve atmic/non-atmic context issue for power ON/OFF. So next better choice is sound driver request/release DMA channel each time. This patch do it
--- sound/soc/sh/rcar/dma.c | 182 ++++++++++++++++++++++++++++-------------------- 1 file changed, 105 insertions(+), 77 deletions(-)
sound/soc/sh/rcar/dma.c +105 -77
@@ -34,6 +34,8 @@ struct rsnd_dmapp {struct rsnd_dma {struct rsnd_mod mod; +struct rsnd_mod *mod_from; +struct rsnd_mod *mod_to;dma_addr_t src_addr;dma_addr_t dst_addr;union {
@@ -92,6 +94,20 @@ static void rsnd_dmaen_complete(void *data)rsnd_mod_interrupt (mod, __rsnd_dmaen_complete); } +static struct dma_chan *rsnd_dmaen_request_channel (struct rsnd_dai_stream *io, +struct rsnd_mod *mod_from, +struct rsnd_mod *mod_to) +{ +if ((!mod_from && !mod_to) || + (mod_from && mod_to)) +return NULL ; + +if (mod_from) +return rsnd_mod_dma_req (io, mod_from); +else +return rsnd_mod_dma_req (io, mod_to); +} +static int rsnd_dmaen_stop (struct rsnd_mod *mod,struct rsnd_dai_stream *io,struct rsnd_priv *priv)
@@ -99,7 +115,59 @@ static int rsnd_dmaen_stop(struct rsnd_mod *mod,struct rsnd_dma *dma =rsnd_mod_to_dma (mod);struct rsnd_dmaen *dmaen =rsnd_dma_to_dmaen (dma); -dmaengine_terminate_all (dmaen->chan); +if (dmaen->chan) { +dmaengine_terminate_all (dmaen->chan); + } + +return 0 ; +} + +static int rsnd_dmaen_nolock_stop (struct rsnd_mod *mod, +struct rsnd_dai_stream *io, +struct rsnd_priv *priv) +{ +struct rsnd_dma *dma =rsnd_mod_to_dma (mod); +struct rsnd_dmaen *dmaen =rsnd_dma_to_dmaen (dma); + +/* +* DMAEngine release uses mutex lock. +* Thus, it shouldn't be called under spinlock. +* Let's call it under nolock_start +*/ +if (dmaen->chan) +dma_release_channel (dmaen->chan); + + dmaen->chan =NULL ; + +return 0 ; +} + +static int rsnd_dmaen_nolock_start (struct rsnd_mod *mod, +struct rsnd_dai_stream *io, +struct rsnd_priv *priv) +{ +struct rsnd_dma *dma =rsnd_mod_to_dma (mod); +struct rsnd_dmaen *dmaen =rsnd_dma_to_dmaen (dma); +struct device *dev =rsnd_priv_to_dev (priv); + +if (dmaen->chan) { +dev_err (dev,"it already has dma channel\n" ); +return -EIO ; + } + +/* +* DMAEngine request uses mutex lock. +* Thus, it shouldn't be called under spinlock. +* Let's call it under nolock_start +*/ + dmaen->chan =rsnd_dmaen_request_channel (io, + dma->mod_from, + dma->mod_to); +if (IS_ERR_OR_NULL (dmaen->chan)) { + dmaen->chan =NULL ; +dev_err (dev,"can't get dma channel\n" ); +return PTR_ERR (dmaen->chan); + }return 0 ; }
@@ -113,7 +181,23 @@ static int rsnd_dmaen_start(struct rsnd_mod *mod,struct snd_pcm_substream *substream = io->substream;struct device *dev =rsnd_priv_to_dev (priv);struct dma_async_tx_descriptor *desc; +struct dma_slave_config cfg = {};int is_play =rsnd_io_is_play (io); +int ret; + + cfg.direction = is_play ?DMA_MEM_TO_DEV :DMA_DEV_TO_MEM ; + cfg.src_addr = dma->src_addr; + cfg.dst_addr = dma->dst_addr; + cfg.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + cfg.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; + +dev_dbg (dev,"%s[%d] %pad -> %pad\n" , +rsnd_mod_name (mod),rsnd_mod_id (mod), + &cfg.src_addr, &cfg.dst_addr); + + ret =dmaengine_slave_config (dmaen->chan, &cfg); +if (ret <0 ) +return ret; desc = dmaengine_prep_dma_cyclic(dmaen->chan, substream->runtime->dma_addr,
@@ -159,97 +243,39 @@ struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node,return chan; } -static struct dma_chan *rsnd_dmaen_request_channel (struct rsnd_dai_stream *io, -struct rsnd_mod *mod_from, -struct rsnd_mod *mod_to) -{ -if ((!mod_from && !mod_to) || - (mod_from && mod_to)) -return NULL ; - -if (mod_from) -return rsnd_mod_dma_req (io, mod_from); -else -return rsnd_mod_dma_req (io, mod_to); -} - -static int rsnd_dmaen_remove (struct rsnd_mod *mod, -struct rsnd_dai_stream *io, -struct rsnd_priv *priv) -{ -struct rsnd_dma *dma =rsnd_mod_to_dma (mod); -struct rsnd_dmaen *dmaen =rsnd_dma_to_dmaen (dma); - -if (dmaen->chan) -dma_release_channel (dmaen->chan); - - dmaen->chan =NULL ; - -return 0 ; -} -static int rsnd_dmaen_attach (struct rsnd_dai_stream *io,struct rsnd_dma *dma,struct rsnd_mod *mod_from,struct rsnd_mod *mod_to) { -struct rsnd_mod *mod =rsnd_mod_get (dma); -struct rsnd_dmaen *dmaen =rsnd_dma_to_dmaen (dma);struct rsnd_priv *priv =rsnd_io_to_priv (io);struct rsnd_dma_ctrl *dmac =rsnd_priv_to_dmac (priv); -struct device *dev =rsnd_priv_to_dev (priv); -struct dma_slave_config cfg = {}; -int is_play =rsnd_io_is_play (io); -int ret; - -if (dmaen->chan) { -dev_err (dev,"it already has dma channel\n" ); -return -EIO ; - } - - dmaen->chan =rsnd_dmaen_request_channel (io, mod_from, mod_to); - -if (IS_ERR_OR_NULL (dmaen->chan)) { - dmaen->chan =NULL ; -dev_err (dev,"can't get dma channel\n" ); - goto rsnd_dma_channel_err; +struct dma_chan *chan; + +/* try to get DMAEngine channel */ + chan =rsnd_dmaen_request_channel (io, mod_from, mod_to); +if (IS_ERR_OR_NULL (chan)) { +/* +* DMA failed. try to PIO mode +* see +* rsnd_ssi_fallback() +* rsnd_rdai_continuance_probe() +*/ +return -EAGAIN ; } - cfg.direction = is_play ?DMA_MEM_TO_DEV :DMA_DEV_TO_MEM ; - cfg.src_addr = dma->src_addr; - cfg.dst_addr = dma->dst_addr; - cfg.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - cfg.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; - -dev_dbg (dev,"%s[%d] %pad -> %pad\n" , -rsnd_mod_name (mod),rsnd_mod_id (mod), - &cfg.src_addr, &cfg.dst_addr); - - ret =dmaengine_slave_config (dmaen->chan, &cfg); -if (ret <0 ) - goto rsnd_dma_attach_err; +dma_release_channel (chan); dmac->dmaen_num++;return 0 ; - -rsnd_dma_attach_err: -rsnd_dmaen_remove (mod, io, priv); -rsnd_dma_channel_err: - -/* -* DMA failed. try to PIO mode -* see -* rsnd_ssi_fallback() -* rsnd_rdai_continuance_probe() -*/ -return -EAGAIN ; }static struct rsnd_mod_ops rsnd_dmaen_ops = { .name ="audmac" , + .nolock_start = rsnd_dmaen_nolock_start, + .nolock_stop = rsnd_dmaen_nolock_stop, .start = rsnd_dmaen_start, .stop = rsnd_dmaen_stop, - .remove = rsnd_dmaen_remove, };/*
@@ -671,9 +697,6 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, *dma_mod =rsnd_mod_get (dma); - dma->src_addr =rsnd_dma_addr (io, mod_from, is_play,1 ); - dma->dst_addr =rsnd_dma_addr (io, mod_to, is_play,0 ); - ret =rsnd_mod_init (priv, *dma_mod, ops,NULL , rsnd_mod_get_status, type, dma_id);if (ret <0 )
@@ -687,6 +710,11 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, ret =attach (io, dma, mod_from, mod_to);if (ret <0 )return ret; + + dma->src_addr =rsnd_dma_addr (io, mod_from, is_play,1 ); + dma->dst_addr =rsnd_dma_addr (io, mod_to, is_play,0 ); + dma->mod_from = mod_from; + dma->mod_to = mod_to; } ret =rsnd_dai_connect (*dma_mod, io, type);
Signature · 1 line
1.9.1
kbuild test robot
build botRe: [PATCH 1/2 v2][resend] ASoC: rsnd: Request/Release DMA channel each time
coccinelle warnings: (new ones prefixed by >>)
Hi Kuninori,
[auto build test WARNING on asoc/for-next]
[also build test WARNING on next-20161111]
[cannot apply to v4.9-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Kuninori-Morimoto/ASoC-rsnd-DMA-power-fix-and-IOMMU-support/20161114-101334 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
coccinelle warnings: (new ones prefixed by >>)
>> sound/soc/sh/rcar/dma.c:169:9-16: ERROR: PTR_ERR applied after initialization to constant on line 167
vim +169 sound/soc/sh/rcar/dma.c
161 * Let's call it under nolock_start
162 */
163 dmaen->chan = rsnd_dmaen_request_channel(io,
164 dma->mod_from,
165 dma->mod_to);
166 if (IS_ERR_OR_NULL(dmaen->chan)) {
> 167 dmaen->chan = NULL; 168 dev_err(dev, "can't get dma channel\n"); > 169 return PTR_ERR(dmaen->chan);
170 }
171
172 return 0;
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 1/2 v2][resend] ASoC: rsnd: Request/Release DMA channel each time
Hi Mark
I will fixup and resend this patch, again
Quoted 33 lines
Hi Kuninori,
[auto build test WARNING on asoc/for-next]
[also build test WARNING on next-20161111]
[cannot apply to v4.9-rc5]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Kuninori-Morimoto/ASoC-rsnd-DMA-power-fix-and-IOMMU-support/20161114-101334 base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-nextcoccinelle warnings: (new ones prefixed by >>)
Quoted 1 line
Quoted 1 line
sound/soc/sh/rcar/dma.c:169:9-16: ERROR:
PTR_ERRapplied after initialization to constant on line 167vim +169
sound/soc/sh/rcar/dma.c161 * Let's call it under nolock_start 162 */ 163 dmaen->chan = rsnd_dmaen_request_channel(io, 164 dma->mod_from, 165 dma->mod_to); 166 if (IS_ERR_OR_NULL(dmaen->chan)) {Quoted 1 line
167
dmaen->chan= NULL;168
dev_err(dev, "can't get dma channel\n");Quoted 1 line
169 return
PTR_ERR(dmaen->chan);170 }
171
172 return 0;---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH RESEND v2 2/2 ASoC: rsnd: use dma_sync_single_for_xxx() for IOMMU
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
IOMMU needs DMA mapping function to use it. One solution is that we can use DMA mapped dev on snd_pcm_lib_preallocate_pages_for_all() for SNDRV_DMA_TYPE_DEV. But pcm_new and dma map timing are mismatched. Thus, this patch uses SNDRV_DMA_TYPE_CONTINUOUS for pcm_new, and use dma_sync_single_for_xxx() for each transfer.
--- sound/soc/sh/rcar/core.c | 4 +-- sound/soc/sh/rcar/dma.c | 84 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 82 insertions(+), 6 deletions(-)
sound/soc/sh/rcar/core.c +2 -2
@@ -1126,8 +1126,8 @@ static int rsnd_pcm_new(struct snd_soc_pcm_runtime *rtd)return snd_pcm_lib_preallocate_pages_for_all ( rtd->pcm, -SNDRV_DMA_TYPE_DEV , - rtd->card->snd_card->dev, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ),PREALLOC_BUFFER ,PREALLOC_BUFFER_MAX ); }
sound/soc/sh/rcar/dma.c +80 -4
135 lines not on this page · raw message
Signature · 1 line
1.9.1