ASoC: fsi/rsnd: cyclic transfer support
Subsystems (6)
cover ASoC: fsi/rsnd: cyclic transfer support
Hi Mark
Current Renesas sound driver (= FSI/RSND) is not using ALSA common DMAEngine method for some reasons. The 1st reason was that Renesas DMA didn't support cyclic transfer mode.
But now, it is supported !
These patches support cyclic transfer for FSI/RSND
It needs this branch
git://git.infradead.org/users/vkoul/slave-dma.git :: next
especiallydfbb85cab5f0819d0424a3637b03e7892704fa42
(DMA: shdma: add cyclic transfer support)
These are based on mark/topic/rcar branch
But, #4 patch needs mark/fix/rcar merge
Kuninori Morimoto (4):
ASoC: fsi: use SNDRV_DMA_TYPE_DEV for sound buffer
ASoC: fsi: add fsi_pointer_update() for common pointer method
ASoC: fsi: use dmaengine_prep_dma_cyclic() for DMA transfer
ASoC: rsnd: use dmaengine_prep_dma_cyclic() instead of original method
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 + arch/arm/mach-shmobile/board-kzm9g.c | 2 + arch/arm/mach-shmobile/board-mackerel.c | 4 + arch/sh/boards/mach-ecovec24/setup.c | 2 + sound/soc/sh/fsi.c | 189 +++++++----------------- sound/soc/sh/rcar/core.c | 76 +++------- sound/soc/sh/rcar/rsnd.h | 4 - 7 files changed, 82 insertions(+), 199 deletions(-)
Best regards
---
Kuninori Morimoto
PATCH 1/4 ASoC: fsi: use SNDRV_DMA_TYPE_DEV for sound buffer
From: Kuninori Morimoto <[email protected]>
Current fsi driver is using SNDRV_DMA_TYPE_CONTINUOUS for snd_pcm_lib_preallocate_pages_for_all(). But, it came from original dma-sh7760.c,
and no longer needed.
This patch exchange its parameter, and removed original dma mapping and un-needed dma_sync_single_xxx() from driver.
---
Quoted 1 line
Quoted 1 line
Simon
This patch exchange mach-shmobile port Can you check this patch ?
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++ arch/arm/mach-shmobile/board-kzm9g.c | 2 ++ arch/arm/mach-shmobile/board-mackerel.c | 4 +++ arch/sh/boards/mach-ecovec24/setup.c | 2 ++ sound/soc/sh/fsi.c | 42 +++--------------------- 5 files changed, 17 insertions(+), 37 deletions(-)
arch/arm/mach-shmobile/board-armadillo800eva.c +4 -0
@@ -1005,6 +1005,8 @@ static struct platform_device fsi_wm8978_device = { .id = 0, .dev = { .platform_data = &fsi_wm8978_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_wm8978_device.dev.coherent_dma_mask, }, };
@@ -1028,6 +1030,8 @@ static struct platform_device fsi_hdmi_device = { .id = 1, .dev = { .platform_data = &fsi2_hdmi_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask, }, };
arch/arm/mach-shmobile/board-kzm9g.c +2 -0
@@ -603,6 +603,8 @@ static struct platform_device fsi_ak4648_device = { .name = "asoc-simple-card", .dev = { .platform_data = &fsi2_ak4648_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_ak4648_device.dev.coherent_dma_mask, }, };
arch/arm/mach-shmobile/board-mackerel.c +4 -0
@@ -523,6 +523,8 @@ static struct platform_device fsi_hdmi_device = { .id = 1, .dev = { .platform_data = &fsi2_hdmi_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_hdmi_device.dev.coherent_dma_mask, }, };
@@ -919,6 +921,8 @@ static struct platform_device fsi_ak4643_device = { .name = "asoc-simple-card", .dev = { .platform_data = &fsi2_ak4643_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_ak4643_device.dev.coherent_dma_mask, }, };
arch/sh/boards/mach-ecovec24/setup.c +2 -0
@@ -874,6 +874,8 @@ static struct platform_device fsi_da7210_device = { .name = "asoc-simple-card", .dev = { .platform_data = &fsi_da7210_info, + .coherent_dma_mask = DMA_BIT_MASK(32), + .dma_mask = &fsi_da7210_device.dev.coherent_dma_mask, }, };
sound/soc/sh/fsi.c +5 -37
92 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/4 ASoC: fsi: add fsi_pointer_update() for common pointer method
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
fsi PIO/DMA handler are using each own pointer update method, but these can be share.
--- sound/soc/sh/fsi.c | 57 ++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 35 deletions(-)
sound/soc/sh/fsi.c +22 -35
@@ -1041,6 +1041,26 @@ static int fsi_clk_set_rate_cpg(struct device *dev,return ret; } +static void fsi_pointer_update (struct fsi_stream *io,int size) +{ + io->buff_sample_pos += size; + +if (io->buff_sample_pos >= + io->period_samples * (io->period_pos +1 )) { +struct snd_pcm_substream *substream = io->substream; +struct snd_pcm_runtime *runtime = substream->runtime; + + io->period_pos++; + +if (io->period_pos >= runtime->periods) { + io->buff_sample_pos =0 ; + io->period_pos =0 ; + } + +snd_pcm_period_elapsed (substream); + } +} +/* * pio data transfer handler */
@@ -1107,31 +1127,11 @@ static int fsi_pio_transfer(struct fsi_priv *fsi, struct fsi_stream *io, void (*run32)(struct fsi_priv *fsi, u8 *buf, int samples), int samples) { -struct snd_pcm_runtime *runtime; -struct snd_pcm_substream *substream;u8 *buf; -int over_period;if (!fsi_stream_is_working (fsi, io))return -EINVAL ; - over_period =0 ; - substream = io->substream; - runtime = substream->runtime; - -/* FSI FIFO has limit. -* So, this driver can not send periods data at a time -*/ -if (io->buff_sample_pos >= - io->period_samples * (io->period_pos +1 )) { - - over_period =1 ; - io->period_pos = (io->period_pos +1 ) % runtime->periods; - -if (0 == io->period_pos) - io->buff_sample_pos =0 ; - } - buf =fsi_pio_get_area (fsi, io);switch (io->sample_width) {
@@ -1145,11 +1145,7 @@ static int fsi_pio_transfer(struct fsi_priv *fsi, struct fsi_stream *io,return -EINVAL ; } -/* update buff_sample_pos */ - io->buff_sample_pos += samples; - -if (over_period) -snd_pcm_period_elapsed (substream); +fsi_pointer_update (io, samples);return 0 ; }
@@ -1307,20 +1303,11 @@ static void fsi_dma_complete(void *data) {struct fsi_stream *io = (struct fsi_stream *)data;struct fsi_priv *fsi =fsi_stream_to_priv (io); -struct snd_pcm_runtime *runtime = io->substream->runtime; - io->buff_sample_pos += io->period_samples; - io->period_pos++; - -if (io->period_pos >= runtime->periods) { - io->period_pos =0 ; - io->buff_sample_pos =0 ; - } +fsi_pointer_update (io, io->period_samples);fsi_count_fifo_err (fsi);fsi_stream_transfer (io); - -snd_pcm_period_elapsed (io->substream); }static void fsi_dma_do_work (struct work_struct *work)
Signature · 1 line
1.7.9.5
PATCH 3/4 ASoC: fsi: use dmaengine_prep_dma_cyclic() for DMA transfer
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
Current FSI driver is using DMAEngine directly, but, ASoC is requesting to use common DMA transfer method, like snd_dmaengine_pcm_trigger() or dmaengine_pcm_ops. It is difficult to switch at this point, since Renesas driver is also supporting PIO transfer.
This patch uses dmaengine_prep_dma_cyclic() instead of dmaengine_prep_slave_single().
It is used in requested method,
and is good first step to switch over.
--- sound/soc/sh/fsi.c | 94 +++++++++++++++------------------------------------- 1 file changed, 27 insertions(+), 67 deletions(-)
sound/soc/sh/fsi.c +27 -67
@@ -232,10 +232,7 @@ struct fsi_stream {* these are for DMAEngine */ struct dma_chan *chan; -struct work_struct work;int dma_id; -int loop_cnt; -int additional_pos; };struct fsi_clk {
@@ -1281,24 +1278,9 @@ static int fsi_dma_init(struct fsi_priv *fsi, struct fsi_stream *io) io->bus_option =BUSOP_SET (24 ,PACKAGE_24BITBUS_BACK ) |BUSOP_SET (16 ,PACKAGE_16BITBUS_STREAM ); - io->loop_cnt =2 ;/* push 1st, 2nd period first, then 3rd, 4th... */ - io->additional_pos =0 ; -return 0 ; } -static dma_addr_t fsi_dma_get_area (struct fsi_stream *io,int additional) -{ -struct snd_pcm_runtime *runtime = io->substream->runtime; -int period = io->period_pos + additional; - -if (period >= runtime->periods) - period =0 ; - -return runtime->dma_addr + -samples_to_bytes (runtime, period * io->period_samples); -} -static void fsi_dma_complete (void *data) {struct fsi_stream *io = (struct fsi_stream *)data;
@@ -1307,53 +1289,37 @@ static void fsi_dma_complete(void *data)fsi_pointer_update (io, io->period_samples);fsi_count_fifo_err (fsi); -fsi_stream_transfer (io); } -static void fsi_dma_do_work (struct work_struct *work) +static int fsi_dma_transfer (struct fsi_priv *fsi,struct fsi_stream *io) { - struct fsi_stream *io = container_of(work, struct fsi_stream, work); -struct fsi_priv *fsi =fsi_stream_to_priv (io); -struct snd_soc_dai *dai; +struct snd_soc_dai *dai =fsi_get_dai (io->substream); +struct snd_pcm_substream *substream = io->substream;struct dma_async_tx_descriptor *desc; -struct snd_pcm_runtime *runtime; -enum dma_data_direction dir;int is_play =fsi_stream_is_play (fsi, io); -int len, i; -dma_addr_t buf; - -if (!fsi_stream_is_working (fsi, io)) -return ; - - dai =fsi_get_dai (io->substream); - runtime = io->substream->runtime; - dir = is_play ?DMA_TO_DEVICE :DMA_FROM_DEVICE ; - len =samples_to_bytes (runtime, io->period_samples); - -for (i =0 ; i < io->loop_cnt; i++) { - buf =fsi_dma_get_area (io, io->additional_pos); - - desc =dmaengine_prep_slave_single (io->chan, buf, len, dir, -DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); -if (!desc) { -dev_err (dai->dev,"dmaengine_prep_slave_sg() fail\n" ); -return ; - } - - desc->callback = fsi_dma_complete; - desc->callback_param = io; - -if (dmaengine_submit (desc) <0 ) { -dev_err (dai->dev,"tx_submit() fail\n" ); -return ; - } +enum dma_data_direction dir = is_play ?DMA_TO_DEVICE :DMA_FROM_DEVICE ; +int ret = -EIO ; + + desc =dmaengine_prep_dma_cyclic (io->chan, + substream->runtime->dma_addr, +snd_pcm_lib_buffer_bytes (substream), +snd_pcm_lib_period_bytes (substream), + dir, +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); +if (!desc) { +dev_err (dai->dev,"dmaengine_prep_dma_cyclic() fail\n" ); + goto fsi_dma_transfer_err; + } -dma_async_issue_pending (io->chan); + desc->callback = fsi_dma_complete; + desc->callback_param = io; - io->additional_pos =1 ; +if (dmaengine_submit (desc) <0 ) { +dev_err (dai->dev,"tx_submit() fail\n" ); + goto fsi_dma_transfer_err; } - io->loop_cnt =1 ; +dma_async_issue_pending (io->chan);/* * FIXME
@@ -1370,13 +1336,11 @@ static void fsi_dma_do_work(struct work_struct *work)fsi_reg_write (fsi,DIFF_ST ,0 ); } } -} -static int fsi_dma_transfer (struct fsi_priv *fsi,struct fsi_stream *io) -{ -schedule_work (&io->work); + ret =0 ; -return 0 ; +fsi_dma_transfer_err: +return ret; } static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
@@ -1437,15 +1401,11 @@ static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct devreturn fsi_stream_probe (fsi, dev); } -INIT_WORK (&io->work, fsi_dma_do_work); -return 0 ; }static int fsi_dma_remove (struct fsi_priv *fsi,struct fsi_stream *io) { -cancel_work_sync (&io->work); -fsi_stream_stop (fsi, io);if (io->chan)
@@ -1618,9 +1578,9 @@ static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,if (!ret) ret =fsi_hw_startup (fsi, io, dai->dev);if (!ret) - ret =fsi_stream_transfer (io); + ret =fsi_stream_start (fsi, io);if (!ret) -fsi_stream_start (fsi, io); + ret =fsi_stream_transfer (io);break ;case SNDRV_PCM_TRIGGER_STOP :if (!ret)
Signature · 1 line
1.7.9.5
PATCH 4/4 ASoC: rsnd: use dmaengine_prep_dma_cyclic() instead of original method
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
Current R-Car sound driver is using DMAEngine directly, but, ASoC is requesting to use common DMA transfer method, like snd_dmaengine_pcm_trigger() or dmaengine_pcm_ops. It is difficult to switch at this point, since Renesas driver is also supporting PIO transfer.
This patch uses dmaengine_prep_dma_cyclic() instead of dmaengine_prep_slave_single().
It is used in requested method,
and is good first step to switch over.
--- sound/soc/sh/rcar/core.c | 76 +++++++++++----------------------------------- sound/soc/sh/rcar/rsnd.h | 4 --- 2 files changed, 18 insertions(+), 62 deletions(-)
sound/soc/sh/rcar/core.c +18 -58
@@ -153,26 +153,8 @@ void rsnd_mod_init(struct rsnd_priv *priv,/* * rsnd_dma functions */ -static void __rsnd_dma_start (struct rsnd_dma *dma); -static void rsnd_dma_continue (struct rsnd_dma *dma) -{ -/* push next A or B plane */ - dma->submit_loop =1 ; -schedule_work (&dma->work); -} - -void rsnd_dma_start (struct rsnd_dma *dma) -{ -/* push both A and B plane*/ - dma->offset =0 ; - dma->submit_loop =2 ; -__rsnd_dma_start (dma); -} -void rsnd_dma_stop (struct rsnd_dma *dma) { - dma->submit_loop =0 ; -cancel_work_sync (&dma->work);dmaengine_terminate_all (dma->chan); }
@@ -180,11 +162,7 @@ static void rsnd_dma_complete(void *data) {struct rsnd_dma *dma = (struct rsnd_dma *)data;struct rsnd_mod *mod =rsnd_dma_to_mod (dma); -struct rsnd_priv *priv =rsnd_mod_to_priv (rsnd_dma_to_mod (dma));struct rsnd_dai_stream *io =rsnd_mod_to_io (mod); -unsigned long flags; - -rsnd_lock (priv, flags);/* * Renesas sound Gen1 needs 1 DMAC,
@@ -197,57 +175,40 @@ static void rsnd_dma_complete(void *data)* rsnd_dai_pointer_update() will be called twice, * ant it will breaks io->byte_pos */ -if (dma->submit_loop) -rsnd_dma_continue (dma); - -rsnd_unlock (priv, flags);rsnd_dai_pointer_update (io, io->byte_per_period); } -static void __rsnd_dma_start (struct rsnd_dma *dma) +void rsnd_dma_start (struct rsnd_dma *dma) {struct rsnd_mod *mod =rsnd_dma_to_mod (dma);struct rsnd_priv *priv =rsnd_mod_to_priv (mod);struct rsnd_dai_stream *io =rsnd_mod_to_io (mod); -struct snd_pcm_runtime *runtime =rsnd_io_to_runtime (io); +struct snd_pcm_substream *substream = io->substream;struct device *dev =rsnd_priv_to_dev (priv);struct dma_async_tx_descriptor *desc; -dma_addr_t buf; -size_t len = io->byte_per_period; -int i; - -for (i =0 ; i < dma->submit_loop; i++) { - buf = runtime->dma_addr + -rsnd_dai_pointer_offset (io, dma->offset + len); - dma->offset = len; + desc =dmaengine_prep_dma_cyclic (dma->chan, + substream->runtime->dma_addr, +snd_pcm_lib_buffer_bytes (substream), +snd_pcm_lib_period_bytes (substream), + dma->dir, +DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); - desc =dmaengine_prep_slave_single ( - dma->chan, buf, len, dma->dir, -DMA_PREP_INTERRUPT |DMA_CTRL_ACK ); -if (!desc) { -dev_err (dev,"dmaengine_prep_slave_sg() fail\n" ); -return ; - } - - desc->callback = rsnd_dma_complete; - desc->callback_param = dma; +if (!desc) { +dev_err (dev,"dmaengine_prep_slave_sg() fail\n" ); +return ; + } -if (dmaengine_submit (desc) <0 ) { -dev_err (dev,"dmaengine_submit() fail\n" ); -return ; - } + desc->callback = rsnd_dma_complete; + desc->callback_param = dma; -dma_async_issue_pending (dma->chan); +if (dmaengine_submit (desc) <0 ) { +dev_err (dev,"dmaengine_submit() fail\n" ); +return ; } -} - -static void rsnd_dma_do_work (struct work_struct *work) -{ - struct rsnd_dma *dma = container_of(work, struct rsnd_dma, work); -__rsnd_dma_start (dma); +dma_async_issue_pending (dma->chan); }int rsnd_dma_available (struct rsnd_dma *dma)
@@ -364,7 +325,6 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma, goto rsnd_dma_init_err; dma->dir = is_play ?DMA_TO_DEVICE :DMA_FROM_DEVICE ; -INIT_WORK (&dma->work, rsnd_dma_do_work);return 0 ;
sound/soc/sh/rcar/rsnd.h +0 -4
@@ -156,12 +156,8 @@ u32 rsnd_get_adinr(struct rsnd_mod *mod);*/ struct rsnd_dma {struct sh_dmae_slave slave; -struct work_struct work;struct dma_chan *chan;enum dma_data_direction dir; - -int submit_loop; -int offset;/* it cares A/B plane */ };void rsnd_dma_start (struct rsnd_dma *dma);
Signature · 1 line
1.7.9.5
Hi Mark
I re-post these patches.
Please ignore these patches
Quoted 36 lines
Current Renesas sound driver (= FSI/RSND) is not using ALSA common DMAEngine method for some reasons. The 1st reason was that Renesas DMA didn't support cyclic transfer mode.
But now, it is supported !
These patches support cyclic transfer for FSI/RSNDIt needs this branch
git://git.infradead.org/users/vkoul/slave-dma.git:: nextespecially
dfbb85cab5f0819d0424a3637b03e7892704fa42
(DMA: shdma: add cyclic transfer support)These are based on mark/topic/rcar branch
But, #4 patch needs mark/fix/rcar mergeKuninori Morimoto (4):
ASoC: fsi: useSNDRV_DMA_TYPE_DEVfor sound buffer
ASoC: fsi: addfsi_pointer_update()for common pointer method
ASoC: fsi: usedmaengine_prep_dma_cyclic()for DMA transfer
ASoC: rsnd: usedmaengine_prep_dma_cyclic()instead of original methodarch/arm/mach-shmobile/board-armadillo800eva.c | 4 + arch/arm/mach-shmobile/board-kzm9g.c | 2 + arch/arm/mach-shmobile/board-mackerel.c | 4 + arch/sh/boards/mach-ecovec24/setup.c | 2 + sound/soc/sh/fsi.c | 189 +++++++----------------- sound/soc/sh/rcar/core.c | 76 +++------- sound/soc/sh/rcar/rsnd.h | 4 - 7 files changed, 82 insertions(+), 199 deletions(-)Best regards
---
Kuninori Morimoto