From: Mark Brown <broonie@kernel.org>
To: Daniel Baluta <daniel.baluta@nxp.com>
Cc: tiwai@suse.de, alsa-devel@alsa-project.org,
Mark Brown <broonie@kernel.org>,
Keyon Jie <yang.jie@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: Applied "ASoC: SOF: Remove call to snd_sof_dsp_mailbox_init" to the asoc tree
Date: Fri, 9 Aug 2019 13:31:52 +0100 (BST) [thread overview]
Message-ID: <20190809123152.2DA1F27430D6@ypsilon.sirena.org.uk> (raw)
In-Reply-To: <20190807150203.26359-2-pierre-louis.bossart@linux.intel.com>
The patch
ASoC: SOF: Remove call to snd_sof_dsp_mailbox_init
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
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
>From 0b76f512c206dd7c3f7761b24826887af80204c6 Mon Sep 17 00:00:00 2001
From: Daniel Baluta <daniel.baluta@nxp.com>
Date: Wed, 7 Aug 2019 10:01:58 -0500
Subject: [PATCH] ASoC: SOF: Remove call to snd_sof_dsp_mailbox_init
This is reserved for some historical reason, we didn't enable memory
windows for byt/bdw at the beginning, to make it compatible, we get
those mailbox offsets from fw_ready struct firstly, and then update them
if they existed in the following memory windows, to make sure the
mailbox still can be used if no memory windows are created.
With this change all platforms have the same implementation for
xxx_fw_ready function so that we can refactor it in a common file.
Suggested-by: Keyon Jie <yang.jie@linux.intel.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190807150203.26359-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sof/intel/bdw.c | 5 -----
sound/soc/sof/intel/byt.c | 5 -----
2 files changed, 10 deletions(-)
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index 4bb9636da990..94be024a99eb 100644
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -455,11 +455,6 @@ static int bdw_fw_ready(struct snd_sof_dev *sdev, u32 msg_id)
sof_block_read(sdev, sdev->mmio_bar, offset, fw_ready,
sizeof(*fw_ready));
- snd_sof_dsp_mailbox_init(sdev, fw_ready->dspbox_offset,
- fw_ready->dspbox_size,
- fw_ready->hostbox_offset,
- fw_ready->hostbox_size);
-
/* make sure ABI version is compatible */
ret = snd_sof_ipc_valid(sdev);
if (ret < 0)
diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index 000d576f6a8d..cb8f02ee09f2 100644
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -237,11 +237,6 @@ static int byt_fw_ready(struct snd_sof_dev *sdev, u32 msg_id)
sof_block_read(sdev, sdev->mmio_bar, offset, fw_ready,
sizeof(*fw_ready));
- snd_sof_dsp_mailbox_init(sdev, fw_ready->dspbox_offset,
- fw_ready->dspbox_size,
- fw_ready->hostbox_offset,
- fw_ready->hostbox_size);
-
/* make sure ABI version is compatible */
ret = snd_sof_ipc_valid(sdev);
if (ret < 0)
--
2.20.1
next prev parent reply other threads:[~2019-08-09 12:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 15:01 [PATCH 0/6] ASoC: SOF: refactor duplicated code between Intel and i.MX8 Pierre-Louis Bossart
2019-08-07 15:01 ` [PATCH 1/6] ASoC: SOF: Remove call to snd_sof_dsp_mailbox_init Pierre-Louis Bossart
2019-08-09 12:31 ` Mark Brown [this message]
2019-08-07 15:01 ` [PATCH 2/6] ASoC: SOF: Introduce snd_sof_dsp_get_mailbox_offset Pierre-Louis Bossart
2019-08-09 12:31 ` Applied "ASoC: SOF: Introduce snd_sof_dsp_get_mailbox_offset" to the asoc tree Mark Brown
2019-08-07 15:02 ` [PATCH 3/6] ASoC: SOF: Introduce snd_sof_dsp_get_window_offset Pierre-Louis Bossart
2019-08-09 12:31 ` Applied "ASoC: SOF: Introduce snd_sof_dsp_get_window_offset" to the asoc tree Mark Brown
2019-08-07 15:02 ` [PATCH 4/6] ASoC: SOF: Intel: byt: Refactor fw ready / mem windows creation Pierre-Louis Bossart
2019-08-07 19:07 ` Cezary Rojewski
2019-08-07 19:20 ` Pierre-Louis Bossart
2019-08-09 12:31 ` Applied "ASoC: SOF: Intel: byt: Refactor fw ready / mem windows creation" to the asoc tree Mark Brown
2019-08-07 15:02 ` [PATCH 5/6] ASoC: SOF: Intel: bdw: Use generic function for fw ready / mem windows creation Pierre-Louis Bossart
2019-08-09 12:31 ` Applied "ASoC: SOF: Intel: bdw: Use generic function for fw ready / mem windows creation" to the asoc tree Mark Brown
2019-08-07 15:02 ` [PATCH 6/6] ASoC: SOF: Intel: hda: Use generic function for fw ready / mem windows creation Pierre-Louis Bossart
2019-08-09 12:31 ` Applied "ASoC: SOF: Intel: hda: Use generic function for fw ready / mem windows creation" to the asoc tree 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=20190809123152.2DA1F27430D6@ypsilon.sirena.org.uk \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=daniel.baluta@nxp.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.de \
--cc=yang.jie@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