From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org,
vkoul@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com,
srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com,
Bard liao <yung-chuan.liao@linux.intel.com>,
Rander Wang <rander.wang@linux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
YueHaibing <yuehaibing@huawei.com>,
Zhu Yingjiang <yingjiang.zhu@linux.intel.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Arnd Bergmann <arnd@arndb.de>,
Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
Keyon Jie <yang.jie@linux.intel.com>,
Pan Xiuli <xiuli.pan@linux.intel.com>,
Fred Oh <fred.oh@linux.intel.com>,
Daniel Baluta <daniel.baluta@nxp.com>
Subject: [RFC PATCH 3/5] ASoC: SOF: Intel: hda: add SoundWire IP support
Date: Wed, 21 Aug 2019 15:17:18 -0500 [thread overview]
Message-ID: <20190821201720.17768-4-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190821201720.17768-1-pierre-louis.bossart@linux.intel.com>
The Core0 needs to be powered before the SoundWire IP is initialized.
Call sdw_intel_init/exit and store the context. We only have one
context, but depending on the hardware capabilities and BIOS settings
may enable multiple SoundWire links.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/sof/intel/hda.c | 40 +++++++++++++++++++++++++++++++++------
sound/soc/sof/intel/hda.h | 5 +++++
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index a968890d0754..e754058e3679 100644
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -57,6 +57,8 @@ static int hda_sdw_init(struct snd_sof_dev *sdev)
{
acpi_handle handle;
struct sdw_intel_res res;
+ struct sof_intel_hda_dev *hdev;
+ void *sdw;
handle = ACPI_HANDLE(sdev->dev);
@@ -66,23 +68,32 @@ static int hda_sdw_init(struct snd_sof_dev *sdev)
res.irq = sdev->ipc_irq;
res.parent = sdev->dev;
- hda_sdw_int_enable(sdev, true);
-
- sdev->sdw = sdw_intel_init(handle, &res);
- if (!sdev->sdw) {
+ sdw = sdw_intel_init(handle, &res);
+ if (!sdw) {
dev_err(sdev->dev, "SDW Init failed\n");
return -EIO;
}
+ hda_sdw_int_enable(sdev, true);
+
+ /* save context */
+ hdev = sdev->pdata->hw_pdata;
+ hdev->sdw = sdw;
+
return 0;
}
static int hda_sdw_exit(struct snd_sof_dev *sdev)
{
+ struct sof_intel_hda_dev *hdev;
+
+ hdev = sdev->pdata->hw_pdata;
+
hda_sdw_int_enable(sdev, false);
- if (sdev->sdw)
- sdw_intel_exit(sdev->sdw);
+ if (hdev->sdw)
+ sdw_intel_exit(hdev->sdw);
+ hdev->sdw = NULL;
return 0;
}
@@ -713,6 +724,21 @@ int hda_dsp_probe(struct snd_sof_dev *sdev)
/* set default mailbox offset for FW ready message */
sdev->dsp_box.offset = HDA_DSP_MBOX_UPLINK_OFFSET;
+ /* need to power-up core before setting-up capabilities */
+ ret = hda_dsp_core_power_up(sdev, HDA_DSP_CORE_MASK(0));
+ if (ret < 0) {
+ dev_err(sdev->dev, "error: could not power-up DSP subsystem\n");
+ goto free_ipc_irq;
+ }
+
+ /* initialize SoundWire capabilities */
+ ret = hda_sdw_init(sdev);
+ if (ret < 0) {
+ dev_err(sdev->dev, "error: SoundWire get caps error\n");
+ hda_dsp_core_power_down(sdev, HDA_DSP_CORE_MASK(0));
+ goto free_ipc_irq;
+ }
+
return 0;
free_ipc_irq:
@@ -744,6 +770,8 @@ int hda_dsp_remove(struct snd_sof_dev *sdev)
snd_hdac_ext_bus_device_remove(bus);
#endif
+ hda_sdw_exit(sdev);
+
if (!IS_ERR_OR_NULL(hda->dmic_dev))
platform_device_unregister(hda->dmic_dev);
diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h
index c8f93317aeb4..48e09b7daf0a 100644
--- a/sound/soc/sof/intel/hda.h
+++ b/sound/soc/sof/intel/hda.h
@@ -399,6 +399,11 @@ struct sof_intel_hda_dev {
/* DMIC device */
struct platform_device *dmic_dev;
+
+#if IS_ENABLED(CONFIG_SOUNDWIRE_INTEL)
+ /* sdw context */
+ void *sdw;
+#endif
};
static inline struct hdac_bus *sof_to_bus(struct snd_sof_dev *s)
--
2.20.1
next prev parent reply other threads:[~2019-08-21 20:18 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 20:17 [RFC PATCH 0/5] ASoC: SOF: Intel: SoundWire initial integration Pierre-Louis Bossart
2019-08-21 20:17 ` [RFC PATCH 1/5] ASoC: SOF: IPC: dai-intel: move ALH declarations in header file Pierre-Louis Bossart
2019-08-21 20:17 ` [RFC PATCH 2/5] ASoC: SOF: Intel: hda: add helper to initialize SoundWire IP Pierre-Louis Bossart
2019-08-21 20:17 ` Pierre-Louis Bossart [this message]
2019-09-04 7:21 ` [RFC PATCH 3/5] ASoC: SOF: Intel: hda: add SoundWire IP support Vinod Koul
2019-09-04 13:25 ` [alsa-devel] " Pierre-Louis Bossart
2019-09-04 16:51 ` Vinod Koul
2019-09-04 17:47 ` Pierre-Louis Bossart
2019-08-21 20:17 ` [RFC PATCH 4/5] ASoC: SOF: Intel: hda: add SoundWire stream config/free callbacks Pierre-Louis Bossart
2019-08-22 7:18 ` Guennadi Liakhovetski
2019-08-22 7:23 ` Guennadi Liakhovetski
2019-08-22 13:53 ` Pierre-Louis Bossart
2019-08-22 15:11 ` Guennadi Liakhovetski
2019-09-04 7:35 ` Vinod Koul
2019-09-04 13:31 ` [alsa-devel] " Pierre-Louis Bossart
2019-09-04 16:55 ` Vinod Koul
2019-09-04 17:49 ` Pierre-Louis Bossart
2019-08-21 20:17 ` [RFC PATCH 5/5] ASoC: SOF: Intel: add support for SoundWire suspend/resume Pierre-Louis Bossart
2019-08-22 15:19 ` [alsa-devel] [RFC PATCH 0/5] ASoC: SOF: Intel: SoundWire initial integration Guennadi Liakhovetski
2019-08-22 16:00 ` Pierre-Louis Bossart
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=20190821201720.17768-4-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=daniel.baluta@nxp.com \
--cc=fred.oh@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=guennadi.liakhovetski@linux.intel.com \
--cc=jank@cadence.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
--cc=xiuli.pan@linux.intel.com \
--cc=yang.jie@linux.intel.com \
--cc=yingjiang.zhu@linux.intel.com \
--cc=yuehaibing@huawei.com \
--cc=yung-chuan.liao@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;
as well as URLs for NNTP newsgroup(s).