mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wesley Cheng <quic_wcheng@quicinc.com>
To: <srinivas.kandagatla@linaro.org>, <mathias.nyman@intel.com>,
	<perex@perex.cz>, <conor+dt@kernel.org>, <corbet@lwn.net>,
	<gregkh@linuxfoundation.org>, <lgirdwood@gmail.com>,
	<andersson@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>,
	<konrad.dybcio@linaro.org>, <Thinh.Nguyen@synopsys.com>,
	<broonie@kernel.org>, <bgoswami@quicinc.com>, <tiwai@suse.com>,
	<robh+dt@kernel.org>, <agross@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<linux-sound@vger.kernel.org>, <linux-usb@vger.kernel.org>,
	<linux-arm-msm@vger.kernel.org>, <linux-doc@vger.kernel.org>,
	<alsa-devel@alsa-project.org>,
	Wesley Cheng <quic_wcheng@quicinc.com>
Subject: [PATCH v10 06/41] ASoC: Add SOC USB APIs for adding an USB backend
Date: Fri, 15 Dec 2023 13:49:20 -0800	[thread overview]
Message-ID: <20231215214955.12110-7-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20231215214955.12110-1-quic_wcheng@quicinc.com>

Some platforms may have support for offloading USB audio devices to a
dedicated audio DSP.  Introduce a set of APIs that allow for management of
USB sound card and PCM devices enumerated by the USB SND class driver.
This allows for the ASoC components to be aware of what USB devices are
available for offloading.

Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
 include/sound/soc-usb.h |  51 +++++++++
 sound/soc/Makefile      |   2 +-
 sound/soc/soc-usb.c     | 238 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 290 insertions(+), 1 deletion(-)
 create mode 100644 include/sound/soc-usb.h
 create mode 100644 sound/soc/soc-usb.c

diff --git a/include/sound/soc-usb.h b/include/sound/soc-usb.h
new file mode 100644
index 000000000000..71e2e69ae3a2
--- /dev/null
+++ b/include/sound/soc-usb.h
@@ -0,0 +1,51 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef __LINUX_SND_SOC_USB_H
+#define __LINUX_SND_SOC_USB_H
+
+/**
+ * struct snd_soc_usb_device
+ * @card_idx - sound card index associated with USB device
+ * @chip_idx - USB sound chip array index
+ * @num_playback - number of playback streams
+ * @num_capture - number of capture streams
+ **/
+struct snd_soc_usb_device {
+	int card_idx;
+	int chip_idx;
+	int num_playback;
+	int num_capture;
+};
+
+/**
+ * struct snd_soc_usb
+ * @list - list head for SND SOC struct list
+ * @dev - USB backend device reference
+ * @component - reference to ASoC component
+ * @connection_status_cb - callback to notify connection events
+ * @priv_data - driver data
+ **/
+struct snd_soc_usb {
+	struct list_head list;
+	struct device *dev;
+	struct snd_soc_component *component;
+	int (*connection_status_cb)(struct snd_soc_usb *usb,
+			struct snd_soc_usb_device *sdev, bool connected);
+	void *priv_data;
+};
+
+const char *snd_soc_usb_get_components_tag(bool playback);
+
+int snd_soc_usb_connect(struct device *usbdev, struct snd_soc_usb_device *sdev);
+int snd_soc_usb_disconnect(struct device *usbdev, struct snd_soc_usb_device *sdev);
+void *snd_soc_usb_find_priv_data(struct device *dev);
+
+struct snd_soc_usb *snd_soc_usb_allocate_port(struct snd_soc_component *component,
+			int num_supported_streams, void *data);
+void snd_soc_usb_free_port(struct snd_soc_usb *usb);
+int snd_soc_usb_add_port(struct snd_soc_usb *usb);
+int snd_soc_usb_remove_port(struct snd_soc_usb *usb);
+#endif
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index 8376fdb217ed..d597cda11abc 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-utils.o soc-dai.o soc-component.o
+snd-soc-core-objs := soc-core.o soc-dapm.o soc-jack.o soc-usb.o soc-utils.o soc-dai.o soc-component.o
 snd-soc-core-objs += soc-pcm.o soc-devres.o soc-ops.o soc-link.o soc-card.o
 snd-soc-core-$(CONFIG_SND_SOC_COMPRESS) += soc-compress.o
 
diff --git a/sound/soc/soc-usb.c b/sound/soc/soc-usb.c
new file mode 100644
index 000000000000..ae87b424783d
--- /dev/null
+++ b/sound/soc/soc-usb.c
@@ -0,0 +1,238 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include <linux/of.h>
+#include <linux/usb.h>
+#include <sound/soc.h>
+#include <sound/soc-usb.h>
+#include "../usb/card.h"
+
+static DEFINE_MUTEX(ctx_mutex);
+static LIST_HEAD(usb_ctx_list);
+
+static struct device_node *snd_soc_find_phandle(struct device *dev)
+{
+	struct device_node *node;
+
+	node = of_parse_phandle(dev->of_node, "usb-soc-be", 0);
+	if (!node)
+		return ERR_PTR(-ENODEV);
+
+	return node;
+}
+
+static struct snd_soc_usb *snd_soc_find_usb_ctx(struct device_node *node)
+{
+	struct snd_soc_usb *ctx;
+
+	mutex_lock(&ctx_mutex);
+	list_for_each_entry(ctx, &usb_ctx_list, list) {
+		if (ctx->component->dev->of_node == node) {
+			mutex_unlock(&ctx_mutex);
+			return ctx;
+		}
+	}
+	mutex_unlock(&ctx_mutex);
+
+	return NULL;
+}
+
+/**
+ * snd_soc_usb_get_components_tag() - Retrieve SOC USB component tag
+ * @playback: direction of audio stream
+ *
+ * Returns the USB offload component tag used in the ASoC components
+ * string.
+ *
+ */
+const char *snd_soc_usb_get_components_tag(bool playback)
+{
+	if (playback)
+		return "usbplybkoffld: 1";
+	else
+		return "usbcapoffld: 1";
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_get_components_tag);
+
+/**
+ * snd_soc_usb_find_priv_data() - Retrieve private data stored
+ * @dev: device reference
+ *
+ * Fetch the private data stored in the USB SND SOC structure.
+ *
+ */
+void *snd_soc_usb_find_priv_data(struct device *dev)
+{
+	struct snd_soc_usb *ctx;
+	struct device_node *node;
+
+	node = snd_soc_find_phandle(dev);
+	if (!IS_ERR(node)) {
+		ctx = snd_soc_find_usb_ctx(node);
+		of_node_put(node);
+	} else {
+		/* Check if backend device */
+		ctx = snd_soc_find_usb_ctx(dev->of_node);
+	}
+
+	return ctx ? ctx->priv_data : NULL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_find_priv_data);
+
+/**
+ * snd_soc_usb_allocate_port() - allocate a SOC USB device
+ * @component: USB DPCM backend DAI component
+ * @num_streams: number of supported offload streams
+ * @data: private data
+ *
+ * Allocate and initialize a SOC USB device.  This will populate parameters that
+ * are used in subsequent sequences.
+ *
+ */
+struct snd_soc_usb *snd_soc_usb_allocate_port(struct snd_soc_component *component,
+			int num_streams, void *data)
+{
+	struct snd_soc_usb *usb;
+
+	usb = kzalloc(sizeof(*usb), GFP_KERNEL);
+	if (!usb)
+		return ERR_PTR(-ENOMEM);
+
+	usb->component = component;
+	usb->priv_data = data;
+	usb->num_supported_streams = num_streams;
+
+	return usb;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_allocate_port);
+
+/**
+ * snd_soc_usb_free_port() - free a SOC USB device
+ * @usb: allocated SOC USB device
+
+ * Free and remove the SOC USB device from the available list of devices.
+ *
+ */
+void snd_soc_usb_free_port(struct snd_soc_usb *usb)
+{
+	snd_soc_usb_remove_port(usb);
+	kfree(usb);
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_free_port);
+
+/**
+ * snd_soc_usb_add_port() - Add a USB backend port
+ * @dev: USB backend device
+ * @priv: private data
+ * @connection_cb: connection status callback
+ *
+ * Register a USB backend device to the SND USB SOC framework.  Memory is
+ * allocated as part of the USB backend device.
+ *
+ */
+int snd_soc_usb_add_port(struct snd_soc_usb *usb)
+{
+
+
+	mutex_lock(&ctx_mutex);
+	list_add_tail(&usb->list, &usb_ctx_list);
+	mutex_unlock(&ctx_mutex);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_add_port);
+
+/**
+ * snd_soc_usb_remove_port() - Remove a USB backend port
+ * @dev: USB backend device
+ *
+ * Remove a USB backend device from USB SND SOC.  Memory is freed when USB
+ * backend is removed.
+ *
+ */
+int snd_soc_usb_remove_port(struct snd_soc_usb *usb)
+{
+	struct snd_soc_usb *ctx, *tmp;
+
+	mutex_lock(&ctx_mutex);
+	list_for_each_entry_safe(ctx, tmp, &usb_ctx_list, list) {
+		if (ctx == usb) {
+			list_del(&ctx->list);
+			break;
+		}
+	}
+	mutex_unlock(&ctx_mutex);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_remove_port);
+
+/**
+ * snd_soc_usb_connect() - Notification of USB device connection
+ * @usbdev: USB bus device
+ * @card_idx: USB SND card instance
+ *
+ * Notify of a new USB SND device connection.  The card_idx can be used to
+ * handle how the DPCM backend selects, which device to enable USB offloading
+ * on.
+ *
+ */
+int snd_soc_usb_connect(struct device *usbdev, struct snd_soc_usb_device *sdev)
+{
+	struct snd_soc_usb *ctx;
+	struct device_node *node;
+
+	if (!usbdev)
+		return -ENODEV;
+
+	node = snd_soc_find_phandle(usbdev);
+	if (IS_ERR(node))
+		return -ENODEV;
+
+	ctx = snd_soc_find_usb_ctx(node);
+	of_node_put(node);
+	if (!ctx)
+		return -ENODEV;
+
+	mutex_lock(&ctx_mutex);
+	if (ctx->connection_status_cb)
+		ctx->connection_status_cb(ctx, sdev, true);
+	mutex_unlock(&ctx_mutex);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_connect);
+
+/**
+ * snd_soc_usb_disconnect() - Notification of USB device disconnection
+ * @usbdev: USB bus device
+ *
+ * Notify of a new USB SND device disconnection to the USB backend.
+ *
+ */
+int snd_soc_usb_disconnect(struct device *usbdev, struct snd_soc_usb_device *sdev)
+{
+	struct snd_soc_usb *ctx;
+	struct device_node *node;
+
+	if (!usbdev)
+		return -ENODEV;
+
+	node = snd_soc_find_phandle(usbdev);
+	if (IS_ERR(node))
+		return -ENODEV;
+
+	ctx = snd_soc_find_usb_ctx(node);
+	of_node_put(node);
+	if (!ctx)
+		return -ENODEV;
+
+	mutex_lock(&ctx_mutex);
+	if (ctx->connection_status_cb)
+		ctx->connection_status_cb(ctx, sdev, false);
+	mutex_unlock(&ctx_mutex);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_disconnect);

  parent reply	other threads:[~2023-12-15 21:50 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-15 21:49 [PATCH v10 00/41] Introduce QC USB SND audio offloading support Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 01/41] xhci: add support to allocate several interrupters Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 02/41] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 03/41] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 04/41] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 05/41] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2023-12-15 21:49 ` Wesley Cheng [this message]
2023-12-15 21:49 ` [PATCH v10 07/41] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 08/41] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 09/41] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 10/41] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 11/41] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 12/41] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 13/41] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 14/41] dt-bindings: usb: xhci: Add num-hc-interrupters definition Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 15/41] dt-bindings: usb: dwc3: Limit " Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 16/41] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 17/41] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 18/41] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2023-12-15 22:38   ` Jeff Johnson
2023-12-18 19:58     ` Wesley Cheng
2023-12-19 12:01   ` Konrad Dybcio
2023-12-19 12:01     ` Konrad Dybcio
2023-12-15 21:49 ` [PATCH v10 19/41] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 20/41] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 21/41] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 22/41] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 23/41] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 24/41] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 25/41] ASoC: dt-bindings: Add Q6USB backend Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 26/41] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 27/41] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 28/41] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 29/41] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 30/41] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 31/41] ASoC: Add SND kcontrol for fetching USB offload status Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 32/41] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 33/41] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 34/41] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 35/41] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 36/41] ALSA: usb-audio: mixer: Add USB offloading mixer control Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 37/41] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 38/41] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 39/41] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 40/41] ASoC: qcom: Populate SoC components string Wesley Cheng
2023-12-15 21:49 ` [PATCH v10 41/41] ASoC: doc: Add documentation for SOC USB Wesley Cheng

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=20231215214955.12110-7-quic_wcheng@quicinc.com \
    --to=quic_wcheng@quicinc.com \
    --cc=Thinh.Nguyen@synopsys.com \
    --cc=agross@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=andersson@kernel.org \
    --cc=bgoswami@quicinc.com \
    --cc=broonie@kernel.org \
    --cc=conor+dt@kernel.org \
    --cc=corbet@lwn.net \
    --cc=devicetree@vger.kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=konrad.dybcio@linaro.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=mathias.nyman@intel.com \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=tiwai@suse.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

all inboxes | Powered by JetHome®