From: Wesley Cheng <quic_wcheng@quicinc.com>
To: <mathias.nyman@intel.com>, <gregkh@linuxfoundation.org>,
<lgirdwood@gmail.com>, <broonie@kernel.org>, <perex@perex.cz>,
<tiwai@suse.com>, <agross@kernel.org>, <andersson@kernel.org>,
<konrad.dybcio@linaro.org>, <robh+dt@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>,
<srinivas.kandagatla@linaro.org>, <bgoswami@quicinc.com>,
<Thinh.Nguyen@synopsys.com>
Cc: <linux-kernel@vger.kernel.org>, <linux-usb@vger.kernel.org>,
<alsa-devel@alsa-project.org>, <linux-arm-msm@vger.kernel.org>,
<devicetree@vger.kernel.org>,
Wesley Cheng <quic_wcheng@quicinc.com>
Subject: [PATCH v7 06/33] ASoC: Add SOC USB APIs for adding an USB backend
Date: Thu, 21 Sep 2023 14:48:16 -0700 [thread overview]
Message-ID: <20230921214843.18450-7-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20230921214843.18450-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 | 48 +++++++++++
sound/soc/Makefile | 2 +-
sound/soc/soc-usb.c | 185 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 234 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..1fa671924018
--- /dev/null
+++ b/include/sound/soc-usb.h
@@ -0,0 +1,48 @@
+/* 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;
+};
+
+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_get_priv_data(struct device *usbdev);
+
+struct snd_soc_usb *snd_soc_usb_add_port(struct device *dev, void *priv,
+ int (*connection_cb)(struct snd_soc_usb *usb,
+ struct snd_soc_usb_device *sdev, bool connected));
+int snd_soc_usb_remove_port(struct device *dev);
+#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..b5ab2c1a6dd4
--- /dev/null
+++ b/sound/soc/soc-usb.c
@@ -0,0 +1,185 @@
+// 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 *dev)
+{
+ struct device_node *node;
+ struct snd_soc_usb *ctx;
+
+ node = snd_soc_find_phandle(dev);
+ if (IS_ERR(node))
+ return NULL;
+
+ mutex_lock(&ctx_mutex);
+ list_for_each_entry(ctx, &usb_ctx_list, list) {
+ if (ctx->dev->of_node == node) {
+ of_node_put(node);
+ mutex_unlock(&ctx_mutex);
+ return ctx;
+ }
+ }
+ of_node_put(node);
+ mutex_unlock(&ctx_mutex);
+
+ return NULL;
+}
+
+/**
+ * snd_soc_usb_get_priv_data() - Retrieve private data stored
+ * @dev: device reference
+ *
+ * Fetch the private data stored in the USB SND SOC structure.
+ *
+ */
+void *snd_soc_usb_get_priv_data(struct device *dev)
+{
+ struct snd_soc_usb *ctx;
+
+ ctx = snd_soc_find_usb_ctx(dev);
+ if (!ctx) {
+ /* Check if backend device */
+ mutex_lock(&ctx_mutex);
+ list_for_each_entry(ctx, &usb_ctx_list, list) {
+ if (dev->of_node == ctx->dev->of_node) {
+ mutex_unlock(&ctx_mutex);
+ goto out;
+ }
+ }
+ mutex_unlock(&ctx_mutex);
+ ctx = NULL;
+ }
+out:
+ return ctx ? ctx->priv_data : NULL;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_get_priv_data);
+
+/**
+ * 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.
+ *
+ */
+struct snd_soc_usb *snd_soc_usb_add_port(struct device *dev, void *priv,
+ int (*connection_cb)(struct snd_soc_usb *usb,
+ struct snd_soc_usb_device *sdev, bool connected))
+{
+ struct snd_soc_usb *usb;
+
+ usb = devm_kzalloc(dev, sizeof(*usb), GFP_KERNEL);
+ if (!usb)
+ return ERR_PTR(-ENOMEM);
+
+ usb->connection_status_cb = connection_cb;
+ usb->dev = dev;
+ usb->priv_data = priv;
+
+ mutex_lock(&ctx_mutex);
+ list_add_tail(&usb->list, &usb_ctx_list);
+ mutex_unlock(&ctx_mutex);
+
+ return usb;
+}
+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 device *dev)
+{
+ struct snd_soc_usb *ctx, *tmp;
+
+ mutex_lock(&ctx_mutex);
+ list_for_each_entry_safe(ctx, tmp, &usb_ctx_list, list) {
+ if (ctx->dev == dev) {
+ 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;
+
+ if (!usbdev)
+ return -ENODEV;
+
+ ctx = snd_soc_find_usb_ctx(usbdev);
+ if (!ctx)
+ return -ENODEV;
+
+ if (ctx->connection_status_cb)
+ ctx->connection_status_cb(ctx, sdev, true);
+
+ 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;
+
+ if (!usbdev)
+ return -ENODEV;
+
+ ctx = snd_soc_find_usb_ctx(usbdev);
+ if (!ctx)
+ return -ENODEV;
+
+ if (ctx->connection_status_cb)
+ ctx->connection_status_cb(ctx, sdev, false);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_usb_disconnect);
next prev parent reply other threads:[~2023-09-21 21:49 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 21:48 [PATCH v7 00/33] Introduce QC USB SND audio offloading support Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 01/33] xhci: add support to allocate several interrupters Wesley Cheng
2023-09-28 10:31 ` Mathias Nyman
2023-10-02 20:07 ` Wesley Cheng
2023-10-04 14:02 ` Mathias Nyman
2023-10-04 18:35 ` Wesley Cheng
2023-10-04 23:42 ` Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 02/33] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2023-09-28 13:31 ` Mathias Nyman
2023-09-28 22:10 ` Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 03/33] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 04/33] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 05/33] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2023-09-21 21:48 ` Wesley Cheng [this message]
2023-09-27 14:48 ` [PATCH v7 06/33] ASoC: Add SOC USB APIs for adding an USB backend Mark Brown
2023-09-27 19:57 ` Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 07/33] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 08/33] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 09/33] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2023-09-27 14:50 ` Mark Brown
2023-09-27 20:01 ` Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 10/33] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 11/33] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 12/33] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 13/33] dt-bindings: usb: dwc3: Limit num-hc-interrupters definition Wesley Cheng
2023-09-25 15:32 ` Rob Herring
2023-09-21 21:48 ` [PATCH v7 14/33] dt-bindings: usb: xhci: Add " Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 15/33] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 16/33] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 17/33] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 18/33] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 19/33] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 20/33] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 21/33] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 22/33] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 23/33] ASoC: dt-bindings: Add Q6USB backend Wesley Cheng
2023-09-25 15:34 ` Rob Herring
2023-09-21 21:48 ` [PATCH v7 24/33] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 25/33] ASoC: qcom: qdsp6: q6afe: Split USB AFE dev_token param into separate API Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 26/33] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 27/33] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 28/33] ASoC: qcom: qdsp6: Add SND kcontrol to select offload device Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 29/33] ASoC: qcom: qdsp6: Add SND kcontrol for fetching offload status Wesley Cheng
2023-09-27 15:02 ` Mark Brown
2023-09-27 20:10 ` Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 30/33] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 31/33] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 32/33] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2023-09-21 21:48 ` [PATCH v7 33/33] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2023-09-27 15:04 ` [PATCH v7 00/33] Introduce QC USB SND audio offloading support Mark Brown
2023-09-27 15:46 ` Greg KH
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=20230921214843.18450-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=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-kernel@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