korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-14 15:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: adau17x1: Handling of DSP_RUN register during fw setup

Browse Source 
DSP_RUN needs to be disabled during firmware write otherwise
we can end up with undefined behavior if writing to a dsp which
is already running firmware.

Signed-off-by: Danny Smith <dannys@axis.com>
Signed-off-by: Robert Rosengren <robert.rosengren@axis.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Danny Smith 2018-04-09 15:13:35 +02:00 committed by Mark Brown
parent 65030ff305
commit d0f8b9c5a3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sound/soc/codecs/adau17x1.c
View File

@ -502,7 +502,7 @@ static int adau17x1_hw_params(struct snd_pcm_substream *substream,
} }
if (adau->sigmadsp) { if (adau->sigmadsp) {
ret = adau17x1_setup_firmware(adau, params_rate(params)); ret = adau17x1_setup_firmware(component, params_rate(params));
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -835,26 +835,40 @@ bool adau17x1_volatile_register(struct device *dev, unsigned int reg)
} }
EXPORT_SYMBOL_GPL(adau17x1_volatile_register); EXPORT_SYMBOL_GPL(adau17x1_volatile_register);
int adau17x1_setup_firmware(struct adau *adau, unsigned int rate) int adau17x1_setup_firmware(struct snd_soc_component *component,
unsigned int rate)
{ {
int ret; int ret;
int dspsr; int dspsr, dsp_run;
struct adau *adau = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
snd_soc_dapm_mutex_lock(dapm);
ret = regmap_read(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, &dspsr); ret = regmap_read(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, &dspsr);
if (ret) if (ret)
return ret; goto err;
ret = regmap_read(adau->regmap, ADAU17X1_DSP_RUN, &dsp_run);
if (ret)
goto err;
regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 1); regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 1);
regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, 0xf); regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, 0xf);
regmap_write(adau->regmap, ADAU17X1_DSP_RUN, 0);
ret = sigmadsp_setup(adau->sigmadsp, rate); ret = sigmadsp_setup(adau->sigmadsp, rate);
if (ret) { if (ret) {
regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 0); regmap_write(adau->regmap, ADAU17X1_DSP_ENABLE, 0);
return ret; goto err;
} }
regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, dspsr); regmap_write(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, dspsr);
regmap_write(adau->regmap, ADAU17X1_DSP_RUN, dsp_run);
return 0; err:
snd_soc_dapm_mutex_unlock(dapm);
return ret;
} }
EXPORT_SYMBOL_GPL(adau17x1_setup_firmware); EXPORT_SYMBOL_GPL(adau17x1_setup_firmware);

3
sound/soc/codecs/adau17x1.h
View File

@ -68,7 +68,8 @@ int adau17x1_resume(struct snd_soc_component *component);
extern const struct snd_soc_dai_ops adau17x1_dai_ops; extern const struct snd_soc_dai_ops adau17x1_dai_ops;
int adau17x1_setup_firmware(struct adau *adau, unsigned int rate); int adau17x1_setup_firmware(struct snd_soc_component *component,
unsigned int rate);
bool adau17x1_has_dsp(struct adau *adau); bool adau17x1_has_dsp(struct adau *adau);
#define ADAU17X1_CLOCK_CONTROL 0x4000 #define ADAU17X1_CLOCK_CONTROL 0x4000