github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-02 13:22:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: wm_adsp: Add locking to DSP firmware controls

Browse Source 
Locking is currently missing from the DSP firmware controls, which can
lead to some race conditions if the controls are accessed as the DSP
powers up or down. This patch adds them to the new power lock.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2015-12-08 16:08:27 +00:00 committed by Mark Brown
parent 7585a5b0ab
commit 168d10e74c
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/codecs/wm_adsp.c
View File

@ -597,14 +597,19 @@ static int wm_coeff_put(struct snd_kcontrol *kctl,
{
struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;
char *p = ucontrol->value.bytes.data;
int ret = 0;
mutex_lock(&ctl->dsp->pwr_lock);
memcpy(ctl->cache, p, ctl->len);
ctl->set = 1;
if (!ctl->enabled)
return 0;
if (ctl->enabled)
ret = wm_coeff_write_control(ctl, p, ctl->len);
return wm_coeff_write_control(ctl, p, ctl->len);
mutex_unlock(&ctl->dsp->pwr_lock);
return ret;
}
static int wm_coeff_read_control(struct wm_coeff_ctl *ctl,
@ -651,17 +656,22 @@ static int wm_coeff_get(struct snd_kcontrol *kctl,
{
struct wm_coeff_ctl *ctl = (struct wm_coeff_ctl *)kctl->private_value;
char *p = ucontrol->value.bytes.data;
int ret = 0;
mutex_lock(&ctl->dsp->pwr_lock);
if (ctl->flags & WMFW_CTL_FLAG_VOLATILE) {
if (ctl->enabled)
return wm_coeff_read_control(ctl, p, ctl->len);
ret = wm_coeff_read_control(ctl, p, ctl->len);
else
return -EPERM;
ret = -EPERM;
} else {
memcpy(p, ctl->cache, ctl->len);
}
memcpy(p, ctl->cache, ctl->len);
mutex_unlock(&ctl->dsp->pwr_lock);
return 0;
return ret;
}
struct wmfw_ctl_work {