ASoC: wm_adsp: Show avail in bytes to match other messages
Subsystems (5)
PATCH 1/4 ASoC: wm_adsp: Show avail in bytes to match other messages
All other debug messages talk about data on the compressed stream in bytes except avail which is shown in words. To avoid confusion show avail in bytes as well.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -2805,7 +2805,7 @@ static int wm_adsp_buffer_update_avail(struct wm_adsp_compr_buf *buf) avail +=wm_adsp_buffer_size (buf);adsp_dbg (buf->dsp,"readindex=0x%x, writeindex=0x%x, avail=%d\n" , - buf->read_index, write_index, avail); + buf->read_index, write_index, avail *WM_ADSP_DATA_WORD_SIZE ); buf->avail = avail;
Signature · 1 line
2.1.4
PATCH 2/4 ASoC: wm_adsp: Fix some subtle races on compressed stream
Firstly, we should be locking the pwr_lock when we initialise the compressed buffer. Secondly, fixup a couple of places when we should be pulling pointers only under the pwr_lock as they may be affected by operations that take that lock.
--- sound/soc/codecs/wm_adsp.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +12 -3
@@ -2240,9 +2240,13 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,if (ret !=0 ) goto err; +mutex_lock (&dsp->pwr_lock); +if (wm_adsp_fw[dsp->fw].num_caps !=0 ) ret =wm_adsp_buffer_init (dsp); +mutex_unlock (&dsp->pwr_lock); +break ;case SND_SOC_DAPM_PRE_PMD :
@@ -2814,12 +2818,15 @@ static int wm_adsp_buffer_update_avail(struct wm_adsp_compr_buf *buf)int wm_adsp_compr_handle_irq (struct wm_adsp *dsp) { -struct wm_adsp_compr_buf *buf = dsp->buffer; -struct wm_adsp_compr *compr = dsp->compr; +struct wm_adsp_compr_buf *buf; +struct wm_adsp_compr *compr;int ret =0 ;mutex_lock (&dsp->pwr_lock); + buf = dsp->buffer; + compr = dsp->compr; +if (!buf) { ret = -ENODEV ; goto out;
@@ -2879,14 +2886,16 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream, struct snd_compr_tstamp *tstamp) {struct wm_adsp_compr *compr = stream->runtime->private_data; -struct wm_adsp_compr_buf *buf = compr->buf;struct wm_adsp *dsp = compr->dsp; +struct wm_adsp_compr_buf *buf;int ret =0 ;adsp_dbg (dsp,"Pointer request\n" );mutex_lock (&dsp->pwr_lock); + buf = compr->buf; +if (!compr->buf) { ret = -ENXIO ; goto out;
Signature · 1 line
2.1.4
Mark Brown
maintainerRe: [PATCH 2/4] ASoC: wm_adsp: Fix some subtle races on compressed stream
Quoted 4 lines · Charles Keepax
Firstly, we should be locking the
pwr_lockwhen we initialise the compressed buffer. Secondly, fixup a couple of places when we should be pulling pointers only under thepwr_lockas they may be affected by operations that take that lock.
This looks like it's a bug fix, it should be at the start of the series so it can be sent as a fix without depending on other changes.
Mark Brown
maintainerApplied "ASoC: wm_adsp: Fix some subtle races on compressed stream" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Fix some subtle races on compressed stream
has been applied to the asoc tree at
git://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
Quoted 1 line
From
612047f0baefe2aeef1bc5ad8c7107a532b7d957Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 28 Mar 2016 14:29:22 +0100
Subject: [PATCH] ASoC: wm_adsp: Fix some subtle races on compressed stream
Firstly, we should be locking the pwr_lock when we initialise the compressed buffer. Secondly, fixup a couple of places when we should be pulling pointers only under the pwr_lock as they may be affected by operations that take that lock.
--- sound/soc/codecs/wm_adsp.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
sound/soc/codecs/wm_adsp.c +12 -3
@@ -2240,9 +2240,13 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,if (ret !=0 ) goto err; +mutex_lock (&dsp->pwr_lock); +if (wm_adsp_fw[dsp->fw].num_caps !=0 ) ret =wm_adsp_buffer_init (dsp); +mutex_unlock (&dsp->pwr_lock); +break ;case SND_SOC_DAPM_PRE_PMD :
@@ -2814,12 +2818,15 @@ static int wm_adsp_buffer_update_avail(struct wm_adsp_compr_buf *buf)int wm_adsp_compr_handle_irq (struct wm_adsp *dsp) { -struct wm_adsp_compr_buf *buf = dsp->buffer; -struct wm_adsp_compr *compr = dsp->compr; +struct wm_adsp_compr_buf *buf; +struct wm_adsp_compr *compr;int ret =0 ;mutex_lock (&dsp->pwr_lock); + buf = dsp->buffer; + compr = dsp->compr; +if (!buf) { ret = -ENODEV ; goto out;
@@ -2879,14 +2886,16 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream, struct snd_compr_tstamp *tstamp) {struct wm_adsp_compr *compr = stream->runtime->private_data; -struct wm_adsp_compr_buf *buf = compr->buf;struct wm_adsp *dsp = compr->dsp; +struct wm_adsp_compr_buf *buf;int ret =0 ;adsp_dbg (dsp,"Pointer request\n" );mutex_lock (&dsp->pwr_lock); + buf = compr->buf; +if (!compr->buf) { ret = -ENXIO ; goto out;
Signature · 1 line
2.8.0.rc3
PATCH 3/4 ASoC: cs47l24: Fix a couple of small whitespace errors
In reply to Charles Keepax--- sound/soc/codecs/cs47l24.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/cs47l24.c +2 -1
@@ -1157,6 +1157,7 @@ static struct snd_compr_ops cs47l24_compr_ops = {static struct snd_soc_platform_driver cs47l24_compr_platform = { .compr_ops = &cs47l24_compr_ops, }; +static int cs47l24_probe (struct platform_device *pdev) {struct arizona *arizona =dev_get_drvdata (pdev->dev.parent);
@@ -1225,9 +1226,9 @@ static int cs47l24_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Failed to register platform: %d\n" , ret);return ret; } + ret =snd_soc_register_codec (&pdev->dev, &soc_codec_dev_cs47l24, cs47l24_dai,ARRAY_SIZE (cs47l24_dai)); -if (ret <0 ) {dev_err (&pdev->dev,"Failed to register codec: %d\n" , ret);snd_soc_unregister_platform (&pdev->dev);
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: cs47l24: Fix a couple of small whitespace errors" to the asoc tree
The patch
ASoC: cs47l24: Fix a couple of small whitespace errors
has been applied to the asoc tree at
git://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
Quoted 1 line
From
9abe3dc77ea7ccad1c2112257bb352435dcee0ffMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 28 Mar 2016 14:29:23 +0100
Subject: [PATCH] ASoC: cs47l24: Fix a couple of small whitespace errors
--- sound/soc/codecs/cs47l24.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/codecs/cs47l24.c +2 -1
@@ -1157,6 +1157,7 @@ static struct snd_compr_ops cs47l24_compr_ops = {static struct snd_soc_platform_driver cs47l24_compr_platform = { .compr_ops = &cs47l24_compr_ops, }; +static int cs47l24_probe (struct platform_device *pdev) {struct arizona *arizona =dev_get_drvdata (pdev->dev.parent);
@@ -1225,9 +1226,9 @@ static int cs47l24_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Failed to register platform: %d\n" , ret);return ret; } + ret =snd_soc_register_codec (&pdev->dev, &soc_codec_dev_cs47l24, cs47l24_dai,ARRAY_SIZE (cs47l24_dai)); -if (ret <0 ) {dev_err (&pdev->dev,"Failed to register codec: %d\n" , ret);snd_soc_unregister_platform (&pdev->dev);
Signature · 1 line
2.8.0.rc3
PATCH 4/4 ASoC: cs47l24: Add support for audio trace firmware
In reply to Charles Keepaxcs47l24 supports the audio trace firmware, this streams of audio to be captured from the CODEC over a compressed audio channel for analysis/debugging of audio processing firmwares.
--- sound/soc/codecs/cs47l24.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-)
sound/soc/codecs/cs47l24.c +35 -3
@@ -807,6 +807,9 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { { "IN2L PGA", NULL, "IN2L" }, { "IN2R PGA", NULL, "IN2R" }, + { "Audio Trace DSP", NULL, "DSP2" }, + { "Audio Trace DSP", NULL, "SYSCLK" }, +ARIZONA_MIXER_ROUTES ("OUT1L" ,"HPOUT1L" ), ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"),
@@ -1016,6 +1019,27 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { .formats = CS47L24_FORMATS, }, }, + { + .name = "cs47l24-cpu-trace", + .capture = { + .stream_name = "Audio Trace CPU", + .channels_min = 1, + .channels_max = 6, + .rates = CS47L24_RATES, + .formats = CS47L24_FORMATS, + }, + .compress_new = snd_soc_new_compress, + }, + { + .name = "cs47l24-dsp-trace", + .capture = { + .stream_name = "Audio Trace DSP", + .channels_min = 1, + .channels_max = 6, + .rates = CS47L24_RATES, + .formats = CS47L24_FORMATS, + }, + }, };static int cs47l24_open (struct snd_compr_stream *stream)
@@ -1027,6 +1051,8 @@ static int cs47l24_open(struct snd_compr_stream *stream)if (strcmp (rtd->codec_dai->name,"cs47l24-dsp-voicectrl" ) ==0 ) { n_adsp =2 ; + }else if (strcmp (rtd->codec_dai->name,"cs47l24-dsp-trace" ) ==0 ) { + n_adsp =1 ; }else { dev_err(arizona->dev, "No suitable compressed stream for DAI '%s'\n",
@@ -1041,10 +1067,16 @@ static irqreturn_t cs47l24_adsp2_irq(int irq, void *data) {struct cs47l24_priv *priv = data;struct arizona *arizona = priv->core.arizona; -int ret; +int serviced =0 ; +int i, ret; + +for (i =1 ; i <=2 ; ++i) { + ret =wm_adsp_compr_handle_irq (&priv->core.adsp[i]); +if (ret != -ENODEV ) + serviced++; + } - ret =wm_adsp_compr_handle_irq (&priv->core.adsp[2 ]); -if (ret == -ENODEV ) { +if (!serviced) {dev_err (arizona->dev,"Spurious compressed data IRQ\n" );return IRQ_NONE ; }
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: cs47l24: Add support for audio trace firmware" to the asoc tree
The patch
ASoC: cs47l24: Add support for audio trace firmware
has been applied to the asoc tree at
git://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
Quoted 1 line
From
c13202f7d7101a6f5542f3a31b9a6787ae7b746cMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 28 Mar 2016 14:29:24 +0100
Subject: [PATCH] ASoC: cs47l24: Add support for audio trace firmware
cs47l24 supports the audio trace firmware, this streams of audio to be captured from the CODEC over a compressed audio channel for analysis/debugging of audio processing firmwares.
--- sound/soc/codecs/cs47l24.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-)
sound/soc/codecs/cs47l24.c +35 -3
@@ -807,6 +807,9 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { { "IN2L PGA", NULL, "IN2L" }, { "IN2R PGA", NULL, "IN2R" }, + { "Audio Trace DSP", NULL, "DSP2" }, + { "Audio Trace DSP", NULL, "SYSCLK" }, +ARIZONA_MIXER_ROUTES ("OUT1L" ,"HPOUT1L" ), ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"),
@@ -1016,6 +1019,27 @@ static struct snd_soc_dai_driver cs47l24_dai[] = { .formats = CS47L24_FORMATS, }, }, + { + .name = "cs47l24-cpu-trace", + .capture = { + .stream_name = "Audio Trace CPU", + .channels_min = 1, + .channels_max = 6, + .rates = CS47L24_RATES, + .formats = CS47L24_FORMATS, + }, + .compress_new = snd_soc_new_compress, + }, + { + .name = "cs47l24-dsp-trace", + .capture = { + .stream_name = "Audio Trace DSP", + .channels_min = 1, + .channels_max = 6, + .rates = CS47L24_RATES, + .formats = CS47L24_FORMATS, + }, + }, };static int cs47l24_open (struct snd_compr_stream *stream)
@@ -1027,6 +1051,8 @@ static int cs47l24_open(struct snd_compr_stream *stream)if (strcmp (rtd->codec_dai->name,"cs47l24-dsp-voicectrl" ) ==0 ) { n_adsp =2 ; + }else if (strcmp (rtd->codec_dai->name,"cs47l24-dsp-trace" ) ==0 ) { + n_adsp =1 ; }else { dev_err(arizona->dev, "No suitable compressed stream for DAI '%s'\n",
@@ -1041,10 +1067,16 @@ static irqreturn_t cs47l24_adsp2_irq(int irq, void *data) {struct cs47l24_priv *priv = data;struct arizona *arizona = priv->core.arizona; -int ret; +int serviced =0 ; +int i, ret; + +for (i =1 ; i <=2 ; ++i) { + ret =wm_adsp_compr_handle_irq (&priv->core.adsp[i]); +if (ret != -ENODEV ) + serviced++; + } - ret =wm_adsp_compr_handle_irq (&priv->core.adsp[2 ]); -if (ret == -ENODEV ) { +if (!serviced) {dev_err (arizona->dev,"Spurious compressed data IRQ\n" );return IRQ_NONE ; }
Signature · 1 line
2.8.0.rc3
Mark Brown
maintainerApplied "ASoC: wm_adsp: Show avail in bytes to match other messages" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Show avail in bytes to match other messages
has been applied to the asoc tree at
git://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
Quoted 1 line
From
33d740e07d1f565e44d35e7f7756a619b4f1e4baMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 28 Mar 2016 14:29:21 +0100
Subject: [PATCH] ASoC: wm_adsp: Show avail in bytes to match other messages
All other debug messages talk about data on the compressed stream in bytes except avail which is shown in words. To avoid confusion show avail in bytes as well.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -2809,7 +2809,7 @@ static int wm_adsp_buffer_update_avail(struct wm_adsp_compr_buf *buf) avail +=wm_adsp_buffer_size (buf);adsp_dbg (buf->dsp,"readindex=0x%x, writeindex=0x%x, avail=%d\n" , - buf->read_index, write_index, avail); + buf->read_index, write_index, avail *WM_ADSP_DATA_WORD_SIZE ); buf->avail = avail;
Signature · 1 line
2.8.0.rc3