From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 4/7] ASoC: Intel: Move Baytrail extended fw address saving to sst_byt_boot()
Date: Thu, 8 May 2014 16:07:24 +0300 [thread overview]
Message-ID: <1399554447-16297-5-git-send-email-jarkko.nikula@linux.intel.com> (raw)
In-Reply-To: <1399554447-16297-1-git-send-email-jarkko.nikula@linux.intel.com>
We have to save the physical address of extended firmware block in the
beginning of mailbox every time when we boot the DSP firmware since that
mailbox address is re-used after DSP firmware is running. Otherwise DSP
firmware will get bogus extended firmware block address during next DSP
boot.
Currently this is not problem but becomes when DSP runtime rebooting is
implemented. Prepare for that by moving extended firmware address saving
from sst_byt_init() to sst_byt_boot().
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
sound/soc/intel/sst-baytrail-dsp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/intel/sst-baytrail-dsp.c b/sound/soc/intel/sst-baytrail-dsp.c
index a50bf7fc0e3a..4a5d489e520b 100644
--- a/sound/soc/intel/sst-baytrail-dsp.c
+++ b/sound/soc/intel/sst-baytrail-dsp.c
@@ -214,6 +214,13 @@ static void sst_byt_boot(struct sst_dsp *sst)
{
int tries = 10;
+ /*
+ * save the physical address of extended firmware block in the first
+ * 4 bytes of the mailbox
+ */
+ memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
+ &sst->pdata->fw_base, sizeof(u32));
+
/* release stall and wait to unstall */
sst_dsp_shim_update_bits64(sst, SST_CSR, SST_BYT_CSR_STALL, 0x0);
while (tries--) {
@@ -317,13 +324,6 @@ static int sst_byt_init(struct sst_dsp *sst, struct sst_pdata *pdata)
return ret;
}
- /*
- * save the physical address of extended firmware block in the first
- * 4 bytes of the mailbox
- */
- memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
- &pdata->fw_base, sizeof(u32));
-
ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
if (ret)
return ret;
--
2.0.0.rc0
next prev parent reply other threads:[~2014-05-08 13:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 13:07 [PATCH 0/7] ASoC: Intel: Baytrail SST suspend/resume support Jarkko Nikula
2014-05-08 13:07 ` [PATCH 1/7] ASoC: Intel: Sample Baytrail DSP DMA pointer only after each period Jarkko Nikula
2014-05-08 13:07 ` [PATCH 2/7] ASoC: Intel: Simplify Baytrail stream control IPC construction Jarkko Nikula
2014-05-08 13:07 ` [PATCH 3/7] ASoC: Intel: Pass stream start position to sst_byt_stream_start() Jarkko Nikula
2014-05-08 13:07 ` Jarkko Nikula [this message]
2014-05-08 13:07 ` [PATCH 5/7] ASoC: Intel: Allow Rx/Tx message list can be cleared prior to suspend Jarkko Nikula
2014-05-08 13:07 ` [PATCH 6/7] ASoC: Intel: Add Baytrail suspend/resume support Jarkko Nikula
2014-05-08 13:07 ` [PATCH 7/7] ASoC: Intel: Allow byt-5640 machine driver and SST core go to suspend Jarkko Nikula
2014-05-12 21:02 ` [PATCH 0/7] ASoC: Intel: Baytrail SST suspend/resume support Mark Brown
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=1399554447-16297-5-git-send-email-jarkko.nikula@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=liam.r.girdwood@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox