ASoC: wm_adsp: Add mechanism to preload firmware on a core
Subsystems (5)
PATCH 1/1 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.
--- sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/cs47l24.c | 3 +++ sound/soc/codecs/wm5102.c | 2 ++ sound/soc/codecs/wm5110.c | 5 +++++ sound/soc/codecs/wm_adsp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm_adsp.h | 11 +++++++++++ 6 files changed, 66 insertions(+), 1 deletion(-)
sound/soc/codecs/arizona.h +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
60 lines not on this page · raw message
sound/soc/codecs/wm_adsp.h +11 -0
@@ -62,6 +62,7 @@ struct wm_adsp {int fw;int fw_ver; +bool preloaded;bool booted;bool running;
@@ -86,7 +87,12 @@ struct wm_adsp {SND_SOC_DAPM_PGA_E (wname,SND_SOC_NOPM , num,0 ,NULL ,0 , \ wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD) +#define WM_ADSP2_PRELOAD_SWITCH (wname, num) \ + SOC_SINGLE_EXT(wname " Preload Switch", SND_SOC_NOPM, num, 1, 0, \ + wm_adsp2_preloader_get, wm_adsp2_preloader_put) +#define WM_ADSP2 (wname, num, event_fn) \ + SND_SOC_DAPM_SPK(wname " Preload", NULL), \ { .id = snd_soc_dapm_supply, .name = wname " Preloader", \ .reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \ .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
@@ -110,6 +116,11 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,int wm_adsp2_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event); +int wm_adsp2_preloader_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +int wm_adsp2_preloader_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +int wm_adsp_compr_open (struct wm_adsp *dsp,struct snd_compr_stream *stream);int wm_adsp_compr_free (struct snd_compr_stream *stream); int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
Signature · 1 line
2.1.4
Mark Brown
maintainerApplied "ASoC: wm_adsp: Add mechanism to preload firmware on a core" to the asoc tree
The patch
ASoC: wm_adsp: Add mechanism to preload firmware on a core
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
af813a6fd8740537bfa5801768e90cc95d9262a3Mon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Fri, 6 Jan 2017 14:24:41 +0000
Subject: [PATCH] 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.
--- sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/cs47l24.c | 3 +++ sound/soc/codecs/wm5102.c | 2 ++ sound/soc/codecs/wm5110.c | 5 +++++ sound/soc/codecs/wm_adsp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm_adsp.h | 11 +++++++++++ 6 files changed, 66 insertions(+), 1 deletion(-)
sound/soc/codecs/arizona.h +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
60 lines not on this page · raw message
sound/soc/codecs/wm_adsp.h +11 -0
@@ -62,6 +62,7 @@ struct wm_adsp {int fw;int fw_ver; +bool preloaded;bool booted;bool running;
@@ -86,7 +87,12 @@ struct wm_adsp {SND_SOC_DAPM_PGA_E (wname,SND_SOC_NOPM , num,0 ,NULL ,0 , \ wm_adsp1_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD) +#define WM_ADSP2_PRELOAD_SWITCH (wname, num) \ + SOC_SINGLE_EXT(wname " Preload Switch", SND_SOC_NOPM, num, 1, 0, \ + wm_adsp2_preloader_get, wm_adsp2_preloader_put) +#define WM_ADSP2 (wname, num, event_fn) \ + SND_SOC_DAPM_SPK(wname " Preload", NULL), \ { .id = snd_soc_dapm_supply, .name = wname " Preloader", \ .reg = SND_SOC_NOPM, .shift = num, .event = event_fn, \ .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD, \
@@ -110,6 +116,11 @@ int wm_adsp2_early_event(struct snd_soc_dapm_widget *w,int wm_adsp2_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event); +int wm_adsp2_preloader_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +int wm_adsp2_preloader_put (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol); +int wm_adsp_compr_open (struct wm_adsp *dsp,struct snd_compr_stream *stream);int wm_adsp_compr_free (struct snd_compr_stream *stream); int wm_adsp_compr_set_params(struct snd_compr_stream *stream,
Signature · 1 line
2.11.0