* [PATCH 0/2] ASoC: stm32: spdifrx: DMA management fixes @ 2017-11-06 15:18 Olivier Moysan 2017-11-06 15:18 ` [PATCH 1/2] ASoC: stm32: spdifrx: fix 16 bits capture Olivier Moysan 2017-11-06 15:18 ` [PATCH 2/2] ASoC: stm32: spdifrx: fix control DMA error management Olivier Moysan 0 siblings, 2 replies; 5+ messages in thread From: Olivier Moysan @ 2017-11-06 15:18 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, mcoquelin.stm32, alexandre.torgue, alsa-devel, robh, mark.rutland, devicetree, linux-arm-kernel, kernel, linux-kernel, olivier.moysan Cc: arnaud.pouliquen, benjamin.gaignard This patch-set gathers DMA management fixes for STM32 SPDIFRX. Olivier Moysan (2): ASoC: stm32: spdifrx: fix 16 bits capture ASoC: stm32: spdifrx: fix control DMA error management sound/soc/stm/stm32_spdifrx.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ASoC: stm32: spdifrx: fix 16 bits capture 2017-11-06 15:18 [PATCH 0/2] ASoC: stm32: spdifrx: DMA management fixes Olivier Moysan @ 2017-11-06 15:18 ` Olivier Moysan 2017-11-08 16:08 ` Applied "ASoC: stm32: spdifrx: fix 16 bits capture" to the asoc tree Mark Brown 2017-11-06 15:18 ` [PATCH 2/2] ASoC: stm32: spdifrx: fix control DMA error management Olivier Moysan 1 sibling, 1 reply; 5+ messages in thread From: Olivier Moysan @ 2017-11-06 15:18 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, mcoquelin.stm32, alexandre.torgue, alsa-devel, robh, mark.rutland, devicetree, linux-arm-kernel, kernel, linux-kernel, olivier.moysan Cc: arnaud.pouliquen, benjamin.gaignard Change DMA bus width to manage properly 16 bits packed format. Signed-off-by: Olivier Moysan <olivier.moysan@st.com> --- sound/soc/stm/stm32_spdifrx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index 84cc567..d7dbe84 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -750,17 +750,21 @@ static int stm32_spdifrx_hw_params(struct snd_pcm_substream *substream, switch (data_size) { case 16: fmt = SPDIFRX_DRFMT_PACKED; - spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; break; case 32: fmt = SPDIFRX_DRFMT_LEFT; - spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; break; default: dev_err(&spdifrx->pdev->dev, "Unexpected data format\n"); return -EINVAL; } + /* + * Set buswidth to 4 bytes for all data formats. + * Packed format: transfer 2 x 2 bytes samples + * Left format: transfer 1 x 3 bytes samples + 1 dummy byte + */ + spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; snd_soc_dai_init_dma_data(cpu_dai, NULL, &spdifrx->dma_params); return regmap_update_bits(spdifrx->regmap, STM32_SPDIFRX_CR, -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: stm32: spdifrx: fix 16 bits capture" to the asoc tree 2017-11-06 15:18 ` [PATCH 1/2] ASoC: stm32: spdifrx: fix 16 bits capture Olivier Moysan @ 2017-11-08 16:08 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2017-11-08 16:08 UTC (permalink / raw) Cc: Olivier Moysan, Mark Brown, lgirdwood The patch ASoC: stm32: spdifrx: fix 16 bits capture has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 9036e4acc81700a51e5f42820ba4570bea9b6f48 Mon Sep 17 00:00:00 2001 From: olivier moysan <olivier.moysan@st.com> Date: Mon, 6 Nov 2017 16:18:52 +0100 Subject: [PATCH] ASoC: stm32: spdifrx: fix 16 bits capture Change DMA bus width to manage properly 16 bits packed format. Signed-off-by: Olivier Moysan <olivier.moysan@st.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/stm/stm32_spdifrx.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index 84cc5678beba..d7dbe84d5eeb 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -750,17 +750,21 @@ static int stm32_spdifrx_hw_params(struct snd_pcm_substream *substream, switch (data_size) { case 16: fmt = SPDIFRX_DRFMT_PACKED; - spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; break; case 32: fmt = SPDIFRX_DRFMT_LEFT; - spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; break; default: dev_err(&spdifrx->pdev->dev, "Unexpected data format\n"); return -EINVAL; } + /* + * Set buswidth to 4 bytes for all data formats. + * Packed format: transfer 2 x 2 bytes samples + * Left format: transfer 1 x 3 bytes samples + 1 dummy byte + */ + spdifrx->dma_params.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; snd_soc_dai_init_dma_data(cpu_dai, NULL, &spdifrx->dma_params); return regmap_update_bits(spdifrx->regmap, STM32_SPDIFRX_CR, -- 2.15.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: stm32: spdifrx: fix control DMA error management 2017-11-06 15:18 [PATCH 0/2] ASoC: stm32: spdifrx: DMA management fixes Olivier Moysan 2017-11-06 15:18 ` [PATCH 1/2] ASoC: stm32: spdifrx: fix 16 bits capture Olivier Moysan @ 2017-11-06 15:18 ` Olivier Moysan 2017-11-08 16:08 ` Applied "ASoC: stm32: spdifrx: fix control DMA error management" to the asoc tree Mark Brown 1 sibling, 1 reply; 5+ messages in thread From: Olivier Moysan @ 2017-11-06 15:18 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, mcoquelin.stm32, alexandre.torgue, alsa-devel, robh, mark.rutland, devicetree, linux-arm-kernel, kernel, linux-kernel, olivier.moysan Cc: arnaud.pouliquen, benjamin.gaignard Fix DMA channel request error handling. Signed-off-by: Olivier Moysan <olivier.moysan@st.com> --- sound/soc/stm/stm32_spdifrx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index d7dbe84..b9bdefc 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -392,6 +392,12 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, { int ret; + spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl"); + if (IS_ERR(spdifrx->ctrl_chan)) { + dev_err(dev, "dma_request_slave_channel failed\n"); + return PTR_ERR(spdifrx->ctrl_chan); + } + spdifrx->dmab = devm_kzalloc(dev, sizeof(struct snd_dma_buffer), GFP_KERNEL); if (!spdifrx->dmab) @@ -406,12 +412,6 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, return ret; } - spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl"); - if (!spdifrx->ctrl_chan) { - dev_err(dev, "dma_request_slave_channel failed\n"); - return -EINVAL; - } - spdifrx->slave_config.direction = DMA_DEV_TO_MEM; spdifrx->slave_config.src_addr = (dma_addr_t)(spdifrx->phys_addr + STM32_SPDIFRX_CSR); @@ -423,7 +423,6 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, &spdifrx->slave_config); if (ret < 0) { dev_err(dev, "dmaengine_slave_config returned error %d\n", ret); - dma_release_channel(spdifrx->ctrl_chan); spdifrx->ctrl_chan = NULL; } @@ -962,7 +961,7 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) return 0; error: - if (spdifrx->ctrl_chan) + if (!IS_ERR(spdifrx->ctrl_chan)) dma_release_channel(spdifrx->ctrl_chan); if (spdifrx->dmab) snd_dma_free_pages(spdifrx->dmab); -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: stm32: spdifrx: fix control DMA error management" to the asoc tree 2017-11-06 15:18 ` [PATCH 2/2] ASoC: stm32: spdifrx: fix control DMA error management Olivier Moysan @ 2017-11-08 16:08 ` Mark Brown 0 siblings, 0 replies; 5+ messages in thread From: Mark Brown @ 2017-11-08 16:08 UTC (permalink / raw) Cc: mark.rutland, robh, alsa-devel, olivier.moysan, alexandre.torgue, devicetree, linux-kernel, arnaud.pouliquen, tiwai, lgirdwood, broonie, mcoquelin.stm32, benjamin.gaignard, linux-arm-kernel, kernel The patch ASoC: stm32: spdifrx: fix control DMA error management has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 98c8dc2fd59fdad77d26d7b0d7007776c5fbec16 Mon Sep 17 00:00:00 2001 From: olivier moysan <olivier.moysan@st.com> Date: Mon, 6 Nov 2017 16:18:53 +0100 Subject: [PATCH] ASoC: stm32: spdifrx: fix control DMA error management Fix DMA channel request error handling. Signed-off-by: Olivier Moysan <olivier.moysan@st.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/stm/stm32_spdifrx.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index d7dbe84d5eeb..b9bdefcd3e10 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -392,6 +392,12 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, { int ret; + spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl"); + if (IS_ERR(spdifrx->ctrl_chan)) { + dev_err(dev, "dma_request_slave_channel failed\n"); + return PTR_ERR(spdifrx->ctrl_chan); + } + spdifrx->dmab = devm_kzalloc(dev, sizeof(struct snd_dma_buffer), GFP_KERNEL); if (!spdifrx->dmab) @@ -406,12 +412,6 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, return ret; } - spdifrx->ctrl_chan = dma_request_chan(dev, "rx-ctrl"); - if (!spdifrx->ctrl_chan) { - dev_err(dev, "dma_request_slave_channel failed\n"); - return -EINVAL; - } - spdifrx->slave_config.direction = DMA_DEV_TO_MEM; spdifrx->slave_config.src_addr = (dma_addr_t)(spdifrx->phys_addr + STM32_SPDIFRX_CSR); @@ -423,7 +423,6 @@ static int stm32_spdifrx_dma_ctrl_register(struct device *dev, &spdifrx->slave_config); if (ret < 0) { dev_err(dev, "dmaengine_slave_config returned error %d\n", ret); - dma_release_channel(spdifrx->ctrl_chan); spdifrx->ctrl_chan = NULL; } @@ -962,7 +961,7 @@ static int stm32_spdifrx_probe(struct platform_device *pdev) return 0; error: - if (spdifrx->ctrl_chan) + if (!IS_ERR(spdifrx->ctrl_chan)) dma_release_channel(spdifrx->ctrl_chan); if (spdifrx->dmab) snd_dma_free_pages(spdifrx->dmab); -- 2.15.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-11-08 16:09 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-11-06 15:18 [PATCH 0/2] ASoC: stm32: spdifrx: DMA management fixes Olivier Moysan 2017-11-06 15:18 ` [PATCH 1/2] ASoC: stm32: spdifrx: fix 16 bits capture Olivier Moysan 2017-11-08 16:08 ` Applied "ASoC: stm32: spdifrx: fix 16 bits capture" to the asoc tree Mark Brown 2017-11-06 15:18 ` [PATCH 2/2] ASoC: stm32: spdifrx: fix control DMA error management Olivier Moysan 2017-11-08 16:08 ` Applied "ASoC: stm32: spdifrx: fix control DMA error management" to the asoc tree Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).