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 10/21] ASoC: SOF: Intel: Add hda-bus support and initialization
Date: Fri, 12 Apr 2019 11:08:53 -0500	[thread overview]
Message-ID: <20190412160904.30418-11-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20190412160904.30418-1-pierre-louis.bossart@linux.intel.com>

From: Keyon Jie <yang.jie@linux.intel.com>

Use hdac_io_ops and configure all required spin_locks/mutex to use
hdac_hda_ext library. Keep the code conditional so that the HDA link
and audio codec support can be removed.

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-bus.c | 108 ++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 sound/soc/sof/intel/hda-bus.c

diff --git a/sound/soc/sof/intel/hda-bus.c b/sound/soc/sof/intel/hda-bus.c
new file mode 100644
index 000000000000..62cc9921bb55
--- /dev/null
+++ b/sound/soc/sof/intel/hda-bus.c
@@ -0,0 +1,108 @@
+// 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/io.h>
+#include <sound/hdaudio.h>
+#include "../sof-priv.h"
+#include "hda.h"
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+
+static const struct hdac_bus_ops bus_ops = {
+	.command = snd_hdac_bus_send_cmd,
+	.get_response = snd_hdac_bus_get_response,
+};
+
+#endif
+
+static void sof_hda_writel(u32 value, u32 __iomem *addr)
+{
+	writel(value, addr);
+}
+
+static u32 sof_hda_readl(u32 __iomem *addr)
+{
+	return readl(addr);
+}
+
+static void sof_hda_writew(u16 value, u16 __iomem *addr)
+{
+	writew(value, addr);
+}
+
+static u16 sof_hda_readw(u16 __iomem *addr)
+{
+	return readw(addr);
+}
+
+static void sof_hda_writeb(u8 value, u8 __iomem *addr)
+{
+	writeb(value, addr);
+}
+
+static u8 sof_hda_readb(u8 __iomem *addr)
+{
+	return readb(addr);
+}
+
+static int sof_hda_dma_alloc_pages(struct hdac_bus *bus, int type,
+				   size_t size, struct snd_dma_buffer *buf)
+{
+	return snd_dma_alloc_pages(type, bus->dev, size, buf);
+}
+
+static void sof_hda_dma_free_pages(struct hdac_bus *bus,
+				   struct snd_dma_buffer *buf)
+{
+	snd_dma_free_pages(buf);
+}
+
+static const struct hdac_io_ops io_ops = {
+	.reg_writel = sof_hda_writel,
+	.reg_readl = sof_hda_readl,
+	.reg_writew = sof_hda_writew,
+	.reg_readw = sof_hda_readw,
+	.reg_writeb = sof_hda_writeb,
+	.reg_readb = sof_hda_readb,
+	.dma_alloc_pages = sof_hda_dma_alloc_pages,
+	.dma_free_pages = sof_hda_dma_free_pages,
+};
+
+/*
+ * This can be used for both with/without hda link support.
+ */
+void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev,
+		      const struct hdac_ext_bus_ops *ext_ops)
+{
+	static int idx;
+
+	memset(bus, 0, sizeof(*bus));
+	bus->dev = dev;
+
+	bus->io_ops = &io_ops;
+	INIT_LIST_HEAD(&bus->stream_list);
+
+	bus->irq = -1;
+	bus->ext_ops = ext_ops;
+	bus->idx = idx++;
+
+	spin_lock_init(&bus->reg_lock);
+
+#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
+	INIT_LIST_HEAD(&bus->codec_list);
+	INIT_LIST_HEAD(&bus->hlink_list);
+
+	mutex_init(&bus->cmd_mutex);
+	mutex_init(&bus->lock);
+	bus->ops = &bus_ops;
+	INIT_WORK(&bus->unsol_work, snd_hdac_bus_process_unsol_events);
+	bus->cmd_dma_state = true;
+#endif
+
+}
-- 
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 ` Pierre-Louis Bossart [this message]
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add hda-bus support and initialization" " 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 ` [PATCH v5 13/21] ASoC: SOF: Intel: Add support for HDAudio codecs Pierre-Louis Bossart
2019-04-27 17:52   ` Applied "ASoC: SOF: Intel: Add support for HDAudio codecs" to the asoc tree 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-11-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.