From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, patches@opensource.wolfsonmicro.com,
lgirdwood@gmail.com
Subject: [PATCH 5/7] ASoC: wm_adsp: Put DSP into low power state between loading and running
Date: Tue, 20 Sep 2016 13:52:34 +0100 [thread overview]
Message-ID: <1474375956-10443-6-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1474375956-10443-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>
Between when we load the DSP and when it actually starts running put the
core into a lower power state where the memory is retained but nothing
is clocked.
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
sound/soc/codecs/wm_adsp.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 24485ec..e0cd4fe 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2223,6 +2223,11 @@ static int wm_adsp2_ena(struct wm_adsp *dsp)
unsigned int val;
int ret, count;
+ ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
+ ADSP2_MEM_ENA, ADSP2_MEM_ENA);
+ if (ret != 0)
+ return ret;
+
ret = regmap_update_bits_async(dsp->regmap, dsp->base + ADSP2_CONTROL,
ADSP2_SYS_ENA, ADSP2_SYS_ENA);
if (ret != 0)
@@ -2282,6 +2287,12 @@ static void wm_adsp2_boot_work(struct work_struct *work)
dsp->booted = true;
+ /* Turn DSP back off until we are ready to run */
+ ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
+ ADSP2_SYS_ENA, 0);
+ if (ret != 0)
+ goto err_ena;
+
mutex_unlock(&dsp->pwr_lock);
return;
@@ -2344,6 +2355,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
if (!dsp->booted)
return -EIO;
+ ret = regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
+ ADSP2_SYS_ENA, ADSP2_SYS_ENA);
+ if (ret != 0)
+ goto err;
+
/* Sync set controls */
ret = wm_coeff_sync_controls(dsp);
if (ret != 0)
@@ -2382,7 +2398,8 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
dsp->booted = false;
regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL,
- ADSP2_CORE_ENA | ADSP2_START, 0);
+ ADSP2_MEM_ENA | ADSP2_CORE_ENA | ADSP2_START,
+ 0);
/* Make sure DMAs are quiesced */
regmap_write(dsp->regmap, dsp->base + ADSP2_RDMA_CONFIG_1, 0);
--
2.1.4
next prev parent reply other threads:[~2016-09-20 12:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 12:52 [PATCH 0/7] Allow ADSPs to be preloaded with firmware Charles Keepax
2016-09-20 12:52 ` [PATCH 1/7] ASoC: arizona: Attach SYSCLK to DSP preloaders Charles Keepax
2016-09-25 5:58 ` Applied "ASoC: arizona: Attach SYSCLK to DSP preloaders" to the asoc tree Mark Brown
2016-09-20 12:52 ` [PATCH 2/7] ASoC: wm_adsp: Make DSP preloader a supply widget Charles Keepax
2016-09-25 5:58 ` Applied "ASoC: wm_adsp: Make DSP preloader a supply widget" to the asoc tree Mark Brown
2016-09-20 12:52 ` [PATCH 3/7] ASoC: wm_adsp: Separate concept of booted and running Charles Keepax
2016-09-25 5:58 ` Applied "ASoC: wm_adsp: Separate concept of booted and running" to the asoc tree Mark Brown
2016-09-20 12:52 ` [PATCH 4/7] ASoC: wm_adsp: Move control cache sync out of preloader Charles Keepax
2016-09-25 5:58 ` Applied "ASoC: wm_adsp: Move control cache sync out of preloader" to the asoc tree Mark Brown
2016-09-20 12:52 ` Charles Keepax [this message]
2016-09-21 16:14 ` [PATCH 5/7] ASoC: wm_adsp: Put DSP into low power state between loading and running Charles Keepax
2016-09-20 12:52 ` [PATCH 6/7] ASoC: wm_adsp: Allow preloader to do the final shutdown of the DSP Charles Keepax
2016-09-20 12:52 ` [PATCH 7/7] ASoC: wm_adsp: Add mechanism to preload firmware on a core Charles Keepax
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474375956-10443-6-git-send-email-ckeepax@opensource.wolfsonmicro.com \
--to=ckeepax@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.