All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Dragos Tarcatu <dragos_tarcatu@mentor.com>,
	Daniel Baluta <daniel.baluta@gmail.com>,
	Alan Cox <alan@linux.intel.com>,
	tiwai@suse.de, Keyon Jie <yang.jie@linux.intel.com>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
	liam.r.girdwood@linux.intel.com, vkoul@kernel.org,
	broonie@kernel.org, andriy.shevchenko@linux.intel.com,
	sound-open-firmware@alsa-project.org
Subject: [PATCH v5 13/21] ASoC: SOF: Intel: Add support for HDAudio codecs
Date: Fri, 12 Apr 2019 11:08:56 -0500	[thread overview]
Message-ID: <20190412160904.30418-14-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190412160904.30418-1-pierre-louis.bossart@linux.intel.com>

Add probe, init and cleanup routines for HDaudio.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/intel/hda-codec.c | 171 ++++++++++++++++++++++++++++++++
 1 file changed, 171 insertions(+)
 create mode 100644 sound/soc/sof/intel/hda-codec.c

diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c
new file mode 100644
index 000000000000..b8b37f082309
--- /dev/null
+++ b/sound/soc/sof/intel/hda-codec.c
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause)
+//
+// This file is provided under a dual BSD/GPLv2 license.  When using or
+// redistributing this file, you may do so under either license.
+//
+// Copyright(c) 2018 Intel Corporation. All rights reserved.
+//
+// Authors: Keyon Jie <yang.jie@linux.intel.com>
+//
+
+#include <linux/module.h>
+#include <sound/hdaudio_ext.h>
+#include <sound/hda_codec.h>
+#include <sound/hda_i915.h>
+#include <sound/sof.h>
+#include "../ops.h"
+#include "hda.h"
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
+#include "../../codecs/hdac_hda.h"
+#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
+#define IDISP_VID_INTEL	0x80860000
+
+/* load the legacy HDA codec driver */
+#ifdef MODULE
+static void hda_codec_load_module(struct hda_codec *codec)
+{
+	char alias[MODULE_NAME_LEN];
+	const char *module = alias;
+
+	snd_hdac_codec_modalias(&codec->core, alias, sizeof(alias));
+	dev_dbg(&codec->core.dev, "loading codec module: %s\n", module);
+	request_module(module);
+}
+#else
+static void hda_codec_load_module(struct hda_codec *codec) {}
+#endif
+
+#endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */
+
+/* probe individual codec */
+static int hda_codec_probe(struct snd_sof_dev *sdev, int address)
+{
+	struct hda_bus *hbus = sof_to_hbus(sdev);
+	struct hdac_device *hdev;
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
+	struct hdac_hda_priv *hda_priv;
+#endif
+	u32 hda_cmd = (address << 28) | (AC_NODE_ROOT << 20) |
+		(AC_VERB_PARAMETERS << 8) | AC_PAR_VENDOR_ID;
+	u32 resp = -1;
+	int ret;
+
+	mutex_lock(&hbus->core.cmd_mutex);
+	snd_hdac_bus_send_cmd(&hbus->core, hda_cmd);
+	snd_hdac_bus_get_response(&hbus->core, address, &resp);
+	mutex_unlock(&hbus->core.cmd_mutex);
+	if (resp == -1)
+		return -EIO;
+	dev_dbg(sdev->dev, "HDA codec #%d probed OK: response: %x\n",
+		address, resp);
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
+	/* snd_hdac_ext_bus_device_exit will use kfree to free hdev */
+	hda_priv = kzalloc(sizeof(*hda_priv), GFP_KERNEL);
+	if (!hda_priv)
+		return -ENOMEM;
+
+	hda_priv->codec.bus = hbus;
+	hdev = &hda_priv->codec.core;
+
+	ret = snd_hdac_ext_bus_device_init(&hbus->core, address, hdev);
+	if (ret < 0)
+		return ret;
+
+	/* use legacy bus only for HDA codecs, idisp uses ext bus */
+	if ((resp & 0xFFFF0000) != IDISP_VID_INTEL) {
+		hdev->type = HDA_DEV_LEGACY;
+		hda_codec_load_module(&hda_priv->codec);
+	}
+
+	return 0;
+#else
+	/* snd_hdac_ext_bus_device_exit will use kfree to free hdev */
+	hdev = kzalloc(sizeof(*hdev), GFP_KERNEL);
+	if (!hdev)
+		return -ENOMEM;
+
+	ret = snd_hdac_ext_bus_device_init(&hbus->core, address, hdev);
+
+	return ret;
+#endif
+}
+
+/* Codec initialization */
+int hda_codec_probe_bus(struct snd_sof_dev *sdev)
+{
+	struct hdac_bus *bus = sof_to_bus(sdev);
+	int i, ret;
+
+	/* probe codecs in avail slots */
+	for (i = 0; i < HDA_MAX_CODECS; i++) {
+
+		if (!(bus->codec_mask & (1 << i)))
+			continue;
+
+		ret = hda_codec_probe(sdev, i);
+		if (ret < 0) {
+			dev_err(bus->dev, "error: codec #%d probe error, ret: %d\n",
+				i, ret);
+			return ret;
+		}
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL(hda_codec_probe_bus);
+
+#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
+
+void hda_codec_i915_get(struct snd_sof_dev *sdev)
+{
+	struct hdac_bus *bus = sof_to_bus(sdev);
+
+	dev_dbg(bus->dev, "Turning i915 HDAC power on\n");
+	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true);
+}
+EXPORT_SYMBOL(hda_codec_i915_get);
+
+void hda_codec_i915_put(struct snd_sof_dev *sdev)
+{
+	struct hdac_bus *bus = sof_to_bus(sdev);
+
+	dev_dbg(bus->dev, "Turning i915 HDAC power off\n");
+	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, false);
+}
+EXPORT_SYMBOL(hda_codec_i915_put);
+
+int hda_codec_i915_init(struct snd_sof_dev *sdev)
+{
+	struct hdac_bus *bus = sof_to_bus(sdev);
+	int ret;
+
+	/* i915 exposes a HDA codec for HDMI audio */
+	ret = snd_hdac_i915_init(bus);
+	if (ret < 0)
+		return ret;
+
+	hda_codec_i915_get(sdev);
+
+	return 0;
+}
+EXPORT_SYMBOL(hda_codec_i915_init);
+
+int hda_codec_i915_exit(struct snd_sof_dev *sdev)
+{
+	struct hdac_bus *bus = sof_to_bus(sdev);
+	int ret;
+
+	hda_codec_i915_put(sdev);
+
+	ret = snd_hdac_i915_exit(bus);
+
+	return ret;
+}
+EXPORT_SYMBOL(hda_codec_i915_exit);
+
+#endif /* CONFIG_SND_SOC_HDAC_HDMI */
+
+MODULE_LICENSE("Dual BSD/GPL");
-- 
2.17.1

  parent reply	other threads:[~2019-04-12 16:08 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-12 16:08 [PATCH v5 00/21] ASoC: Sound Open Firmware (SOF) - Intel support Pierre-Louis Bossart
2019-04-12 16:08 ` [PATCH v5 01/21] ASoC: SOF: Intel: Add BYT, CHT and BSW DSP HW support Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add BYT, CHT and BSW DSP HW support." to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 02/21] ASoC: SOF: Intel: Add BDW HW DSP support Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add BDW HW DSP support" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 03/21] ASoC: SOF: Intel: Add legacy IPC support Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add legacy IPC support" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 04/21] ASoC: SOF: Intel: Add APL/CNL HW DSP support Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add APL/CNL HW DSP support" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 05/21] ASoC: SOF: Intel: Add HDA controller for Intel DSP Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add HDA controller for Intel DSP" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 06/21] ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 07/21] ASoC: SOF: Intel: Add Intel specific HDA IPC mechanisms Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add Intel specific HDA IPC mechanisms." to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 08/21] ASoC: SOF: Intel: Add Intel specific HDA firmware loader Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add Intel specific HDA firmware loader" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 09/21] ASoC: SOF: Intel: Add Intel specific HDA PCM operations Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add Intel specific HDA PCM operations" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 10/21] ASoC: SOF: Intel: Add hda-bus support and initialization Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add hda-bus support and initialization" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 11/21] ASoC: SOF: Intel: Add Intel specific HDA stream operations Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add Intel specific HDA stream operations" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 12/21] ASoC: SOF: Intel: Add Intel specific HDA trace operations Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add Intel specific HDA trace operations" to the asoc tree Mark Brown
2019-04-12 16:08 ` Pierre-Louis Bossart [this message]
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add support for HDAudio codecs" " Mark Brown
2019-04-12 16:08 ` [PATCH v5 14/21] ASoC: SOF: Intel: add SKL+ platform DAIs Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: add SKL+ platform DAIs" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 15/21] ASoC: SOF: Intel: Add platform differentiation for APL and CNL Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add platform differentiation for APL and CNL" to the asoc tree Mark Brown
2019-04-12 16:08 ` [PATCH v5 16/21] ASoC: SOF: Add ACPI device support Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Add ACPI device support" to the asoc tree Mark Brown
2019-04-12 16:09 ` [PATCH v5 17/21] ASoC: SOF: Add PCI device support Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Add PCI device support" to the asoc tree Mark Brown
2019-04-12 16:09 ` [PATCH v5 18/21] ASoC: Intel: Kconfig: expose common option between SST and SOF drivers Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: Intel: Kconfig: expose common option between SST and SOF drivers" to the asoc tree Mark Brown
2019-04-12 16:09 ` [PATCH v5 19/21] ASoC: SOF: Add Build support for SOF core and Intel drivers Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Add Build support for SOF core and Intel drivers" to the asoc tree Mark Brown
2019-04-12 16:09 ` [PATCH v5 20/21] ASoC: Intel: Make sure BDW based machine drivers build for SOF Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: Intel: Make sure BDW based machine drivers build for SOF" to the asoc tree Mark Brown
2019-04-12 16:09 ` [PATCH v5 21/21] ASoC: Intel: select relevant machine drivers for SOF Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: Intel: select relevant machine drivers for SOF" to the asoc tree Mark Brown
2019-04-23 15:42 ` [PATCH v5 00/21] ASoC: Sound Open Firmware (SOF) - Intel support Takashi Iwai

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=20190412160904.30418-14-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alan@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=broonie@kernel.org \
    --cc=daniel.baluta@gmail.com \
    --cc=dragos_tarcatu@mentor.com \
    --cc=liam.r.girdwood@linux.intel.com \
    --cc=sound-open-firmware@alsa-project.org \
    --cc=tiwai@suse.de \
    --cc=vkoul@kernel.org \
    --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 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.