ASoC: wm_adsp: Return an error on write to a disabled volatile control
Subsystems (3)
PATCH 1/2 ASoC: wm_adsp: Return an error on write to a disabled volatile control
Volatile controls should only be accessed when the firmware is active, currently however writes to these controls will succeed, but the data will be lost, if the firmware is powered down. Update this behaviour such that an error is returned the same as it is for reads.
--- sound/soc/codecs/wm_adsp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +6 -1
@@ -899,7 +899,10 @@ static int wm_coeff_put(struct snd_kcontrol *kctl,mutex_lock (&ctl->dsp->pwr_lock); -memcpy (ctl->cache, p, ctl->len); +if (ctl->flags &WMFW_CTL_FLAG_VOLATILE ) + ret = -EPERM ; +else +memcpy (ctl->cache, p, ctl->len); ctl->set =1 ;if (ctl->enabled && ctl->dsp->running)
@@ -926,6 +929,8 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, ctl->set =1 ;if (ctl->enabled && ctl->dsp->running) ret =wm_coeff_write_control (ctl, ctl->cache, size); +else if (ctl->flags &WMFW_CTL_FLAG_VOLATILE ) + ret = -EPERM ; }mutex_unlock (&ctl->dsp->pwr_lock);
Signature · 1 line
2.1.4
PATCH 2/2 ASoC: wm_adsp: Acknowledge controls should also check the DSP is running
We should not be writing acknowledge controls until the firmware is running, as in the case of preloaded firmwares the DSP memory may be unaccessible to whilst in the preloaded state. This means a write to the control during this time could be lost.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -952,7 +952,7 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kctl,mutex_lock (&ctl->dsp->pwr_lock); -if (ctl->enabled) +if (ctl->enabled && ctl->dsp->running) ret =wm_coeff_write_acked_control (ctl, val);else ret = -EPERM ;
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: wm_adsp: Acknowledge controls should also check the DSP is running" to the asoc tree
The patch
ASoC: wm_adsp: Acknowledge controls should also check the DSP is running
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
7b4af793a7a4f8e04175eb6600ba9c8ba855ad20Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 6 Mar 2017 16:54:34 +0000
Subject: [PATCH] ASoC: wm_adsp: Acknowledge controls should also check the DSP
is running
We should not be writing acknowledge controls until the firmware is running, as in the case of preloaded firmwares the DSP memory may be unaccessible to whilst in the preloaded state. This means a write to the control during this time could be lost.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -952,7 +952,7 @@ static int wm_coeff_put_acked(struct snd_kcontrol *kctl,mutex_lock (&ctl->dsp->pwr_lock); -if (ctl->enabled) +if (ctl->enabled && ctl->dsp->running) ret =wm_coeff_write_acked_control (ctl, val);else ret = -EPERM ;
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: wm_adsp: Return an error on write to a disabled volatile control" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Return an error on write to a disabled volatile control
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
67430a39ca7a6af28aade5acb92d43ee257c1014Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Mon, 6 Mar 2017 16:54:33 +0000
Subject: [PATCH] ASoC: wm_adsp: Return an error on write to a disabled
volatile control
Volatile controls should only be accessed when the firmware is active, currently however writes to these controls will succeed, but the data will be lost, if the firmware is powered down. Update this behaviour such that an error is returned the same as it is for reads.
--- sound/soc/codecs/wm_adsp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +6 -1
@@ -899,7 +899,10 @@ static int wm_coeff_put(struct snd_kcontrol *kctl,mutex_lock (&ctl->dsp->pwr_lock); -memcpy (ctl->cache, p, ctl->len); +if (ctl->flags &WMFW_CTL_FLAG_VOLATILE ) + ret = -EPERM ; +else +memcpy (ctl->cache, p, ctl->len); ctl->set =1 ;if (ctl->enabled && ctl->dsp->running)
@@ -926,6 +929,8 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, ctl->set =1 ;if (ctl->enabled && ctl->dsp->running) ret =wm_coeff_write_control (ctl, ctl->cache, size); +else if (ctl->flags &WMFW_CTL_FLAG_VOLATILE ) + ret = -EPERM ; }mutex_unlock (&ctl->dsp->pwr_lock);
Signature · 1 line
2.11.0