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>

diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index 4bb9636..94be024 100644 (file)
--- 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 000d576..cb8f02e 100644 (file)
--- 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)