Commit af813a6f authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Add mechanism to preload firmware on a core 



As requirements to bring up audio paths are continuous getting tighter
and the DSP download to most ADSP devices happens over an external bus
it can become an important factor in the path bring up time. As such
sometimes it is a reasonable trade off to download the firmware ahead of
when it will be required and take a small hit on power consumption for
keeping the core powered up.

This "preloading" adds an additional control for each DSP core "DSPx
Preload Switch" that when set to true will power up the DSP core and
download the firmware currently selected in the "DSPx Firmware" control.
Whilst the core is preloaded the current firmware can not be changed and
the CODEC will be kept powered up and SYSCLK held on. Although future
improvements may allow the SYSCLK to be powered down as well because
the hardware only requires SYSCLK whilst the download is actually taking
place, but this is not covered in this series.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a5de5b74

sound/soc/codecs/arizona.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ extern unsigned int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 
#define ARIZONA_DSP_ROUTES(name) \

	{ name, NULL, name " Preloader"}, \

	{ name " Preloader", NULL, "SYSCLK" }, \

	{ name " Preload", NULL, name " Preloader"}, \

	{ name, NULL, name " Aux 1" }, \

	{ name, NULL, name " Aux 2" }, \

	{ name, NULL, name " Aux 3" }, \

sound/soc/codecs/cs47l24.c

+3 −0
Original line number Diff line number Diff line
@@ -173,6 +173,9 @@ SOC_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]), 
SOC_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]),

SOC_ENUM("ASRC RATE 1", arizona_asrc_rate1),



WM_ADSP2_PRELOAD_SWITCH("DSP2", 2),

WM_ADSP2_PRELOAD_SWITCH("DSP3", 3),



ARIZONA_MIXER_CONTROLS("DSP2L", ARIZONA_DSP2LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP2R", ARIZONA_DSP2RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP3L", ARIZONA_DSP3LMIX_INPUT_1_SOURCE),

sound/soc/codecs/wm5102.c

+2 −0
Original line number Diff line number Diff line
@@ -855,6 +855,8 @@ ARIZONA_LHPF_CONTROL("LHPF2 Coefficients", ARIZONA_HPLPF2_2), 
ARIZONA_LHPF_CONTROL("LHPF3 Coefficients", ARIZONA_HPLPF3_2),

ARIZONA_LHPF_CONTROL("LHPF4 Coefficients", ARIZONA_HPLPF4_2),



WM_ADSP2_PRELOAD_SWITCH("DSP1", 1),



ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),

sound/soc/codecs/wm5110.c

+5 −0
Original line number Diff line number Diff line
@@ -778,6 +778,11 @@ SOC_ENUM("ISRC2 FSH", arizona_isrc_fsh[1]), 
SOC_ENUM("ISRC3 FSH", arizona_isrc_fsh[2]),

SOC_ENUM("ASRC RATE 1", arizona_asrc_rate1),



WM_ADSP2_PRELOAD_SWITCH("DSP1", 1),

WM_ADSP2_PRELOAD_SWITCH("DSP2", 2),

WM_ADSP2_PRELOAD_SWITCH("DSP3", 3),

WM_ADSP2_PRELOAD_SWITCH("DSP4", 4),



ARIZONA_MIXER_CONTROLS("DSP1L", ARIZONA_DSP1LMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),

ARIZONA_MIXER_CONTROLS("DSP2L", ARIZONA_DSP2LMIX_INPUT_1_SOURCE),

sound/soc/codecs/wm_adsp.c

+44 −1
Original line number Diff line number Diff line
@@ -2500,6 +2500,43 @@ static void wm_adsp2_set_dspclk(struct wm_adsp *dsp, unsigned int freq) 
		adsp_err(dsp, "Failed to set clock rate: %d\n", ret);

}



int wm_adsp2_preloader_get(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);



	ucontrol->value.integer.value[0] = dsp->preloaded;



	return 0;

}

EXPORT_SYMBOL_GPL(wm_adsp2_preloader_get);



int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct wm_adsp *dsp = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	char preload[32];



	snprintf(preload, ARRAY_SIZE(preload), "DSP%d Preload", mc->shift);



	dsp->preloaded = ucontrol->value.integer.value[0];



	if (ucontrol->value.integer.value[0])

		snd_soc_dapm_force_enable_pin(dapm, preload);

	else

		snd_soc_dapm_disable_pin(dapm, preload);



	snd_soc_dapm_sync(dapm);



	return 0;

}

EXPORT_SYMBOL_GPL(wm_adsp2_preloader_put);



int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,

			 struct snd_kcontrol *kcontrol, int event,

			 unsigned int freq)
@@ -2631,10 +2668,16 @@ EXPORT_SYMBOL_GPL(wm_adsp2_event); 


int wm_adsp2_codec_probe(struct wm_adsp *dsp, struct snd_soc_codec *codec)

{

	dsp->codec = codec;

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	char preload[32];



	snprintf(preload, ARRAY_SIZE(preload), "DSP%d Preload", dsp->num);

	snd_soc_dapm_disable_pin(dapm, preload);



	wm_adsp2_init_debugfs(dsp, codec);



	dsp->codec = codec;



	return snd_soc_add_codec_controls(codec,

					  &wm_adsp_fw_controls[dsp->num - 1],

					  1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE