[PoC] ASoC: SOF: Move audio support as sof-client (support for multiple cards)

include/sound/soc-acpi.h

@@ -74,6 +74,9 @@ static inline struct snd_soc_acpi_mach *snd_soc_acpi_codec_list(void *arg)
  * @subsystem_id_set: true if a value has been written to
  *		      subsystem_vendor and subsystem_device.
  * @bt_link_mask: BT offload link enabled on the board
+ * @card_name: optional card name to be used by the machine driver
+ * @dai_type_mask: optional mask of the DAI types the machine driver is
+ *		   restricted to, all DAI types are used when it is not set
  */
 struct snd_soc_acpi_mach_params {
 	u32 acpi_ipc_irq_index;
@@ -90,6 +93,8 @@ struct snd_soc_acpi_mach_params {
 	unsigned short subsystem_rev;
 	bool subsystem_id_set;
 	u32 bt_link_mask;
+	const char *card_name;
+	u32 dai_type_mask;
 };
 
 /**

include/sound/sof.h

@@ -17,6 +17,7 @@
 
 struct snd_sof_dsp_ops;
 struct snd_sof_dev;
+struct sof_audio_ops;
 
 /**
  * enum sof_fw_state - DSP firmware state definitions
@@ -57,6 +58,22 @@ enum sof_ipc_type {
 	SOF_IPC_TYPE_COUNT
 };
 
+/* mailbox descriptor, used for host <-> DSP IPC */
+struct snd_sof_mailbox {
+	size_t size;
+	u32 offset;
+};
+
+/* DSP mailbox types */
+enum snd_sof_mailbox_type {
+	SOF_MAILBOX_FW_INFO,
+	SOF_MAILBOX_DSP,
+	SOF_MAILBOX_HOST,
+	SOF_MAILBOX_STREAM,
+	SOF_MAILBOX_DEBUG,
+	SOF_MAILBOX_COUNT
+};
+
 struct sof_loadable_file_profile {
 	enum sof_ipc_type ipc_type;
 
@@ -171,6 +188,7 @@ struct sof_dev_desc {
 	const char *default_fw_filename[SOF_IPC_TYPE_COUNT];
 
 	const struct snd_sof_dsp_ops *ops;
+	const struct sof_audio_ops *audio_ops;
 	int (*ops_init)(struct snd_sof_dev *sdev);
 	void (*ops_free)(struct snd_sof_dev *sdev);
 };

include/trace/events/sof.h

@@ -12,79 +12,7 @@
 #define _TRACE_SOF_H
 #include <linux/tracepoint.h>
 #include <linux/types.h>
-#include <sound/sof/stream.h>
-#include "../../../sound/soc/sof/sof-audio.h"
-
-DECLARE_EVENT_CLASS(sof_widget_template,
-	TP_PROTO(struct snd_sof_widget *swidget),
-	TP_ARGS(swidget),
-	TP_STRUCT__entry(
-		__string(name, swidget->widget->name)
-		__field(int, use_count)
-	),
-	TP_fast_assign(
-		__assign_str(name);
-		__entry->use_count = swidget->use_count;
-	),
-	TP_printk("name=%s use_count=%d", __get_str(name), __entry->use_count)
-);
-
-DEFINE_EVENT(sof_widget_template, sof_widget_setup,
-	TP_PROTO(struct snd_sof_widget *swidget),
-	TP_ARGS(swidget)
-);
-
-DEFINE_EVENT(sof_widget_template, sof_widget_free,
-	TP_PROTO(struct snd_sof_widget *swidget),
-	TP_ARGS(swidget)
-);
-
-TRACE_EVENT(sof_ipc3_period_elapsed_position,
-	TP_PROTO(struct snd_sof_dev *sdev, struct sof_ipc_stream_posn *posn),
-	TP_ARGS(sdev, posn),
-	TP_STRUCT__entry(
-		__string(device_name, dev_name(sdev->dev))
-		__field(u64, host_posn)
-		__field(u64, dai_posn)
-		__field(u64, wallclock)
-	),
-	TP_fast_assign(
-		__assign_str(device_name);
-		__entry->host_posn = posn->host_posn;
-		__entry->dai_posn = posn->dai_posn;
-		__entry->wallclock = posn->wallclock;
-	),
-	TP_printk("device_name=%s host_posn=%#llx dai_posn=%#llx wallclock=%#llx",
-		  __get_str(device_name), __entry->host_posn, __entry->dai_posn,
-		  __entry->wallclock)
-);
-
-TRACE_EVENT(sof_pcm_pointer_position,
-	TP_PROTO(struct snd_sof_dev *sdev,
-		struct snd_sof_pcm *spcm,
-		struct snd_pcm_substream *substream,
-		snd_pcm_uframes_t dma_posn,
-		snd_pcm_uframes_t dai_posn
-	),
-	TP_ARGS(sdev, spcm, substream, dma_posn, dai_posn),
-	TP_STRUCT__entry(
-		__string(device_name, dev_name(sdev->dev))
-		__field(u32, pcm_id)
-		__field(int, stream)
-		__field(unsigned long, dma_posn)
-		__field(unsigned long, dai_posn)
-	),
-	TP_fast_assign(
-		__assign_str(device_name);
-		__entry->pcm_id = le32_to_cpu(spcm->pcm.pcm_id);
-		__entry->stream = substream->stream;
-		__entry->dma_posn = dma_posn;
-		__entry->dai_posn = dai_posn;
-	),
-	TP_printk("device_name=%s pcm_id=%d stream=%d dma_posn=%lu dai_posn=%lu",
-		  __get_str(device_name), __entry->pcm_id, __entry->stream,
-		  __entry->dma_posn, __entry->dai_posn)
-);
+#include "../../../sound/soc/sof/sof-priv.h"
 
 TRACE_EVENT(sof_stream_position_ipc_rx,
 	TP_PROTO(struct device *dev),

include/trace/events/sof_audio.h

@@ -0,0 +1,94 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright(c) 2022 Intel Corporation
+ *
+ * Author: Noah Klayman <noah.klayman@intel.com>
+ */
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM sof
+
+#if !defined(_TRACE_SOF_AUDIO_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SOF_AUDIO_H
+#include <linux/tracepoint.h>
+#include <linux/types.h>
+#include <sound/sof/stream.h>
+#include "../../../sound/soc/sof/sof-audio.h"
+
+DECLARE_EVENT_CLASS(sof_widget_template,
+	TP_PROTO(struct snd_sof_widget *swidget),
+	TP_ARGS(swidget),
+	TP_STRUCT__entry(
+		__string(name, swidget->widget->name)
+		__field(int, use_count)
+	),
+	TP_fast_assign(
+		__assign_str(name);
+		__entry->use_count = swidget->use_count;
+	),
+	TP_printk("name=%s use_count=%d", __get_str(name), __entry->use_count)
+);
+
+DEFINE_EVENT(sof_widget_template, sof_widget_setup,
+	TP_PROTO(struct snd_sof_widget *swidget),
+	TP_ARGS(swidget)
+);
+
+DEFINE_EVENT(sof_widget_template, sof_widget_free,
+	TP_PROTO(struct snd_sof_widget *swidget),
+	TP_ARGS(swidget)
+);
+
+TRACE_EVENT(sof_ipc3_period_elapsed_position,
+	TP_PROTO(struct snd_sof_dev *sdev, struct sof_ipc_stream_posn *posn),
+	TP_ARGS(sdev, posn),
+	TP_STRUCT__entry(
+		__string(device_name, dev_name(sdev->dev))
+		__field(u64, host_posn)
+		__field(u64, dai_posn)
+		__field(u64, wallclock)
+	),
+	TP_fast_assign(
+		__assign_str(device_name);
+		__entry->host_posn = posn->host_posn;
+		__entry->dai_posn = posn->dai_posn;
+		__entry->wallclock = posn->wallclock;
+	),
+	TP_printk("device_name=%s host_posn=%#llx dai_posn=%#llx wallclock=%#llx",
+		  __get_str(device_name), __entry->host_posn, __entry->dai_posn,
+		  __entry->wallclock)
+);
+
+TRACE_EVENT(sof_pcm_pointer_position,
+	TP_PROTO(struct snd_sof_dev *sdev,
+		struct snd_sof_pcm *spcm,
+		struct snd_pcm_substream *substream,
+		snd_pcm_uframes_t dma_posn,
+		snd_pcm_uframes_t dai_posn
+	),
+	TP_ARGS(sdev, spcm, substream, dma_posn, dai_posn),
+	TP_STRUCT__entry(
+		__string(device_name, dev_name(sdev->dev))
+		__field(u32, pcm_id)
+		__field(int, stream)
+		__field(unsigned long, dma_posn)
+		__field(unsigned long, dai_posn)
+	),
+	TP_fast_assign(
+		__assign_str(device_name);
+		__entry->pcm_id = le32_to_cpu(spcm->pcm.pcm_id);
+		__entry->stream = substream->stream;
+		__entry->dma_posn = dma_posn;
+		__entry->dai_posn = dai_posn;
+	),
+	TP_printk("device_name=%s pcm_id=%d stream=%d dma_posn=%lu dai_posn=%lu",
+		  __get_str(device_name), __entry->pcm_id, __entry->stream,
+		  __entry->dma_posn, __entry->dai_posn)
+);
+
+#endif /* _TRACE_SOF_AUDIO_H */
+
+/* This part must be outside protection */
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE sof_audio
+#include <trace/define_trace.h>

sound/soc/intel/boards/skl_hda_dsp_generic.c

@@ -109,7 +109,8 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
 	if (!card)
 		return -ENOMEM;
 
-	card->name = "hda-dsp";
+	card->name = mach->mach_params.card_name ?
+		     mach->mach_params.card_name : "hda-dsp";
 	card->owner = THIS_MODULE;
 	card->fully_routed = true;
 	card->late_probe = skl_hda_card_late_probe;
@@ -128,6 +129,8 @@ static int skl_hda_audio_probe(struct platform_device *pdev)
 	if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)
 		ctx->hdmi.idisp_codec = true;
 
+	ctx->dmic_be_num = mach->mach_params.dmic_num;
+
 	ctx->link_order_overwrite = HDA_LINK_ORDER;
 	ctx->link_id_overwrite = HDA_LINK_IDS;
 

sound/soc/intel/boards/sof_sdw.c

@@ -1485,7 +1485,8 @@ static int mc_probe(struct platform_device *pdev)
 	ctx->codec_info_list_count = asoc_sdw_get_codec_info_list_count();
 	card = &ctx->card;
 	card->dev = &pdev->dev;
-	card->name = "soundwire";
+	card->name = mach->mach_params.card_name ?
+		    mach->mach_params.card_name : "soundwire";
 	card->owner = THIS_MODULE;
 	card->late_probe = sof_sdw_card_late_probe;
 	card->add_dai_link = sof_sdw_add_dai_link;

sound/soc/intel/common/sof-function-topology-lib.c

@@ -183,6 +183,11 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_
 	int ret;
 	int i;
 
+	if (!mach || !mach->sof_tplg_filename) {
+		dev_err(card->dev, "Missing base topology filename for function topology\n");
+		return -EINVAL;
+	}
+
 	ret = get_platform_name(card, mach, platform);
 	if (ret < 0)
 		return ret;
@@ -228,10 +233,7 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_
 			dev_dbg(card->dev,
 				"dai_link %s is not supported by separated tplg yet\n",
 				dai_link->name);
-			if (best_effort)
-				continue;
-
-			return 0;
+			continue;
 		}
 		if (tplg_mask & BIT(tplg_dev))
 			continue;