ASoC: wm_adsp: Move compr_attach/attached functions
Subsystems (3)
PATCH 2/2 ASoC: wm_adsp: Detach compressed stream on free
In reply to Charles KeepaxIf someone powers down the DSP core (through routing changes say) whilst a compressed record is in progress we can end up using a freed pointer to the buffer object. When a compressed audio stream is triggered we attach it to a buffer on a physical DSP. This patch adds a detach of the buffer from the stream when the stream is freed or when the DSP is powered down which avoids the situation where we use a buffer when it is no longer valid.
--- sound/soc/codecs/wm_adsp.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
sound/soc/codecs/wm_adsp.c +22 -0
@@ -273,8 +273,11 @@ struct wm_adsp_buffer {__be32 words_written[2 ];/* total words written (64 bit) */ }; +struct wm_adsp_compr ; +struct wm_adsp_compr_buf {struct wm_adsp *dsp; +struct wm_adsp_compr *compr;struct wm_adsp_buffer_region *regions;u32 host_buf_ptr;
@@ -2467,10 +2470,26 @@ static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)return -EINVAL ; compr->buf = compr->dsp->buffer; + compr->buf->compr = compr;return 0 ; } +static void wm_adsp_compr_detach (struct wm_adsp_compr *compr) +{ +if (!compr) +return ; + +/* Wake the poll so it can see buffer is no longer attached */ +if (compr->stream) +snd_compr_fragment_elapsed (compr->stream); + +if (wm_adsp_compr_attached (compr)) { + compr->buf->compr =NULL ; + compr->buf =NULL ; + } +} +int wm_adsp_compr_open (struct wm_adsp *dsp,struct snd_compr_stream *stream) {struct wm_adsp_compr *compr;
@@ -2524,6 +2543,7 @@ int wm_adsp_compr_free(struct snd_compr_stream *stream)mutex_lock (&dsp->pwr_lock); +wm_adsp_compr_detach (compr); dsp->compr =NULL ;kfree (compr->raw_buf);
@@ -2820,6 +2840,8 @@ err_buffer:static int wm_adsp_buffer_free (struct wm_adsp *dsp) {if (dsp->buffer) { +wm_adsp_compr_detach (dsp->buffer->compr); +kfree (dsp->buffer->regions);kfree (dsp->buffer);
Signature · 1 line
2.1.4
PATCH 1/2 ASoC: wm_adsp: Move compr_attach/attached functions
Move wm_adsp_compr_attach and wm_adsp_compr_attached functions so they will stay logically grouped with similar functions after some additional changes.
--- sound/soc/codecs/wm_adsp.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
sound/soc/codecs/wm_adsp.c +19 -19
@@ -2452,6 +2452,25 @@ void wm_adsp2_remove(struct wm_adsp *dsp) }EXPORT_SYMBOL_GPL (wm_adsp2_remove); +static inline int wm_adsp_compr_attached (struct wm_adsp_compr *compr) +{ +return compr->buf !=NULL ; +} + +static int wm_adsp_compr_attach (struct wm_adsp_compr *compr) +{ +/* +* Note this will be more complex once each DSP can support multiple +* streams +*/ +if (!compr->dsp->buffer) +return -EINVAL ; + + compr->buf = compr->dsp->buffer; + +return 0 ; +} +int wm_adsp_compr_open (struct wm_adsp *dsp,struct snd_compr_stream *stream) {struct wm_adsp_compr *compr;
@@ -2810,25 +2829,6 @@ static int wm_adsp_buffer_free(struct wm_adsp *dsp)return 0 ; } -static inline int wm_adsp_compr_attached (struct wm_adsp_compr *compr) -{ -return compr->buf !=NULL ; -} - -static int wm_adsp_compr_attach (struct wm_adsp_compr *compr) -{ -/* -* Note this will be more complex once each DSP can support multiple -* streams -*/ -if (!compr->dsp->buffer) -return -EINVAL ; - - compr->buf = compr->dsp->buffer; - -return 0 ; -} -int wm_adsp_compr_trigger (struct snd_compr_stream *stream,int cmd) {struct wm_adsp_compr *compr = stream->runtime->private_data;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: wm_adsp: Detach compressed stream on free" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Detach compressed stream on free
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
721be3be2f75c69cf0f2d7826007a6eefee7dac3Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 4 May 2016 17:11:56 +0100
Subject: [PATCH] ASoC: wm_adsp: Detach compressed stream on free
If someone powers down the DSP core (through routing changes say) whilst a compressed record is in progress we can end up using a freed pointer to the buffer object. When a compressed audio stream is triggered we attach it to a buffer on a physical DSP. This patch adds a detach of the buffer from the stream when the stream is freed or when the DSP is powered down which avoids the situation where we use a buffer when it is no longer valid.
--- sound/soc/codecs/wm_adsp.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
sound/soc/codecs/wm_adsp.c +22 -0
@@ -273,8 +273,11 @@ struct wm_adsp_buffer {__be32 words_written[2 ];/* total words written (64 bit) */ }; +struct wm_adsp_compr ; +struct wm_adsp_compr_buf {struct wm_adsp *dsp; +struct wm_adsp_compr *compr;struct wm_adsp_buffer_region *regions;u32 host_buf_ptr;
@@ -2467,10 +2470,26 @@ static int wm_adsp_compr_attach(struct wm_adsp_compr *compr)return -EINVAL ; compr->buf = compr->dsp->buffer; + compr->buf->compr = compr;return 0 ; } +static void wm_adsp_compr_detach (struct wm_adsp_compr *compr) +{ +if (!compr) +return ; + +/* Wake the poll so it can see buffer is no longer attached */ +if (compr->stream) +snd_compr_fragment_elapsed (compr->stream); + +if (wm_adsp_compr_attached (compr)) { + compr->buf->compr =NULL ; + compr->buf =NULL ; + } +} +int wm_adsp_compr_open (struct wm_adsp *dsp,struct snd_compr_stream *stream) {struct wm_adsp_compr *compr;
@@ -2524,6 +2543,7 @@ int wm_adsp_compr_free(struct snd_compr_stream *stream)mutex_lock (&dsp->pwr_lock); +wm_adsp_compr_detach (compr); dsp->compr =NULL ;kfree (compr->raw_buf);
@@ -2820,6 +2840,8 @@ err_buffer:static int wm_adsp_buffer_free (struct wm_adsp *dsp) {if (dsp->buffer) { +wm_adsp_compr_detach (dsp->buffer->compr); +kfree (dsp->buffer->regions);kfree (dsp->buffer);
Signature · 1 line
2.8.1
Mark Brown
maintainerApplied "ASoC: wm_adsp: Move compr_attach/attached functions" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Move compr_attach/attached functions
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
edd713509ae46ffcf178e3b1431af1ca202be8baMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 4 May 2016 17:11:55 +0100
Subject: [PATCH] ASoC: wm_adsp: Move compr_attach/attached functions
Move wm_adsp_compr_attach and wm_adsp_compr_attached functions so they will stay logically grouped with similar functions after some additional changes.
--- sound/soc/codecs/wm_adsp.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
sound/soc/codecs/wm_adsp.c +19 -19
@@ -2452,6 +2452,25 @@ void wm_adsp2_remove(struct wm_adsp *dsp) }EXPORT_SYMBOL_GPL (wm_adsp2_remove); +static inline int wm_adsp_compr_attached (struct wm_adsp_compr *compr) +{ +return compr->buf !=NULL ; +} + +static int wm_adsp_compr_attach (struct wm_adsp_compr *compr) +{ +/* +* Note this will be more complex once each DSP can support multiple +* streams +*/ +if (!compr->dsp->buffer) +return -EINVAL ; + + compr->buf = compr->dsp->buffer; + +return 0 ; +} +int wm_adsp_compr_open (struct wm_adsp *dsp,struct snd_compr_stream *stream) {struct wm_adsp_compr *compr;
@@ -2810,25 +2829,6 @@ static int wm_adsp_buffer_free(struct wm_adsp *dsp)return 0 ; } -static inline int wm_adsp_compr_attached (struct wm_adsp_compr *compr) -{ -return compr->buf !=NULL ; -} - -static int wm_adsp_compr_attach (struct wm_adsp_compr *compr) -{ -/* -* Note this will be more complex once each DSP can support multiple -* streams -*/ -if (!compr->dsp->buffer) -return -EINVAL ; - - compr->buf = compr->dsp->buffer; - -return 0 ; -} -int wm_adsp_compr_trigger (struct snd_compr_stream *stream,int cmd) {struct wm_adsp_compr *compr = stream->runtime->private_data;
Signature · 1 line
2.8.1