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>,
<lgirdwood@gmail.com>, <andersson@kernel.org>,
<krzysztof.kozlowski+dt@linaro.org>, <gregkh@linuxfoundation.org>,
<Thinh.Nguyen@synopsys.com>, <broonie@kernel.org>,
<bgoswami@quicinc.com>, <tiwai@suse.com>, <robh@kernel.org>,
<konrad.dybcio@linaro.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 v20 36/41] ALSA: usb-audio: Add USB offloading capable kcontrol
Date: Thu, 25 Apr 2024 14:51:20 -0700 [thread overview]
Message-ID: <20240425215125.29761-37-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240425215125.29761-1-quic_wcheng@quicinc.com>
In order to allow userspace/applications know about USB offloading status,
expose a sound kcontrol that fetches information about which sound card
index is associated with the ASoC platform card supporting offloading. In
the USB audio offloading framework, the ASoC BE DAI link is the entity
responsible for registering to the SOC USB layer. SOC USB will expose more
details about the current offloading status, which includes the USB sound
card and USB PCM device indexes currently being used.
It is expected for the USB offloading driver to add the kcontrol to the
sound card associated with the USB audio device. An example output would
look like:
tinymix -D 1 get 'USB Offload Playback Capable Card'
0 (range -1->32)
Ths example signifies that card#0 has an USB offload capable path
available.
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
sound/usb/Kconfig | 10 +++++
sound/usb/qcom/Makefile | 6 ++-
sound/usb/qcom/mixer_usb_offload.c | 65 ++++++++++++++++++++++++++++++
sound/usb/qcom/mixer_usb_offload.h | 17 ++++++++
sound/usb/qcom/qc_audio_offload.c | 3 ++
5 files changed, 100 insertions(+), 1 deletion(-)
create mode 100644 sound/usb/qcom/mixer_usb_offload.c
create mode 100644 sound/usb/qcom/mixer_usb_offload.h
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 5cc3eaf53e6b..1228be3c1f83 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -176,6 +176,16 @@ config SND_BCD2000
To compile this driver as a module, choose M here: the module
will be called snd-bcd2000.
+config SND_USB_QC_OFFLOAD_MIXER
+ bool "Qualcomm USB Audio Offload mixer control"
+ help
+ Say Y to enable the Qualcomm USB audio offloading mixer controls.
+ This exposes an USB offload capable kcontrol to signal to
+ applications about which platform sound card can support USB
+ audio offload. This can potentially be used to fetch further
+ information about the offloading status from the platform sound
+ card.
+
config SND_USB_AUDIO_QMI
tristate "Qualcomm Audio Offload driver"
depends on QCOM_QMI_HELPERS && SND_USB_AUDIO && USB_XHCI_SIDEBAND && SND_SOC_USB
diff --git a/sound/usb/qcom/Makefile b/sound/usb/qcom/Makefile
index a81c9b28d484..eada5cd7b71f 100644
--- a/sound/usb/qcom/Makefile
+++ b/sound/usb/qcom/Makefile
@@ -1,2 +1,6 @@
snd-usb-audio-qmi-objs := usb_audio_qmi_v01.o qc_audio_offload.o
-obj-$(CONFIG_SND_USB_AUDIO_QMI) += snd-usb-audio-qmi.o
\ No newline at end of file
+obj-$(CONFIG_SND_USB_AUDIO_QMI) += snd-usb-audio-qmi.o
+
+ifneq ($(CONFIG_SND_USB_QC_OFFLOAD_MIXER),)
+snd-usb-audio-qmi-objs += mixer_usb_offload.o
+endif
\ No newline at end of file
diff --git a/sound/usb/qcom/mixer_usb_offload.c b/sound/usb/qcom/mixer_usb_offload.c
new file mode 100644
index 000000000000..cd6e5600e795
--- /dev/null
+++ b/sound/usb/qcom/mixer_usb_offload.c
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include <linux/usb.h>
+
+#include <sound/core.h>
+#include <sound/control.h>
+#include <sound/soc-usb.h>
+
+#include "../card.h"
+#include "../mixer.h"
+#include "../usbaudio.h"
+
+#include "mixer_usb_offload.h"
+
+static int
+snd_usb_offload_available_get(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct device *sysdev = snd_kcontrol_chip(kcontrol);
+ int ret;
+
+ ret = snd_soc_usb_device_offload_available(sysdev);
+ ucontrol->value.integer.value[0] = ret < 0 ? -1 : ret;
+
+ return ret < 0 ? ret : 0;
+}
+
+static int snd_usb_offload_available_info(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_info *uinfo)
+{
+ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ uinfo->count = 1;
+ uinfo->value.integer.min = -1;
+ uinfo->value.integer.max = SNDRV_CARDS;
+
+ return 0;
+}
+
+static const struct snd_kcontrol_new snd_usb_offload_available_ctl = {
+ .iface = SNDRV_CTL_ELEM_IFACE_CARD,
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
+ .name = "USB Offload Playback Capable Card",
+ .info = snd_usb_offload_available_info,
+ .get = snd_usb_offload_available_get,
+};
+
+/**
+ * snd_usb_offload_create_ctl() - Add USB offload bounded mixer
+ * @chip - USB SND chip device
+ *
+ * Creates a sound control for a USB audio device, so that applications can
+ * query for if there is an available USB audio offload path, and which
+ * card is managing it.
+ */
+int snd_usb_offload_create_ctl(struct snd_usb_audio *chip)
+{
+ struct usb_device *udev = chip->dev;
+
+ return snd_ctl_add(chip->card,
+ snd_ctl_new1(&snd_usb_offload_available_ctl,
+ udev->bus->sysdev));
+}
diff --git a/sound/usb/qcom/mixer_usb_offload.h b/sound/usb/qcom/mixer_usb_offload.h
new file mode 100644
index 000000000000..0efda52e92b6
--- /dev/null
+++ b/sound/usb/qcom/mixer_usb_offload.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#ifndef __USB_OFFLOAD_MIXER_H
+#define __USB_OFFLOAD_MIXER_H
+
+#if IS_ENABLED(CONFIG_SND_USB_QC_OFFLOAD_MIXER)
+int snd_usb_offload_create_ctl(struct snd_usb_audio *chip);
+#else
+static inline int snd_usb_offload_create_ctl(struct snd_usb_audio *chip)
+{
+ return -ENODEV;
+}
+#endif
+#endif /* __USB_OFFLOAD_MIXER_H */
diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c
index 4deec0b6fc08..6a25a390f8ae 100644
--- a/sound/usb/qcom/qc_audio_offload.c
+++ b/sound/usb/qcom/qc_audio_offload.c
@@ -37,6 +37,7 @@
#include "../pcm.h"
#include "../power.h"
+#include "mixer_usb_offload.h"
#include "usb_audio_qmi_v01.h"
/* Stream disable request timeout during USB device disconnect */
@@ -1660,6 +1661,8 @@ static void qc_usb_audio_offload_probe(struct snd_usb_audio *chip)
uaudio_qdev->last_card_num = chip->card->number;
snd_soc_usb_connect(usb_get_usb_backend(udev), sdev);
+ snd_usb_offload_create_ctl(chip);
+
mutex_unlock(&chip->mutex);
mutex_unlock(&qdev_mutex);
next prev parent reply other threads:[~2024-04-25 21:52 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 21:50 [PATCH v20 00/41] Introduce QC USB SND audio offloading support Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 01/41] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 02/41] usb: host: xhci: Export enable and disable interrupter APIs Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 03/41] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-04-30 11:02 ` Mathias Nyman
2024-04-30 21:57 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 04/41] xhci: export XHCI IMOD setting helper for interrupters Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 05/41] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 06/41] usb: host: xhci-sideband: Expose a sideband interrupter enable API Wesley Cheng
2024-05-02 11:07 ` Mathias Nyman
2024-05-02 23:37 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 07/41] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 08/41] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-04-26 13:24 ` Amadeusz Sławiński
2024-04-26 20:03 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 09/41] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-04-26 13:25 ` Amadeusz Sławiński
2024-04-26 21:55 ` Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 10/41] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 11/41] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 12/41] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 13/41] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 14/41] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-04-25 21:50 ` [PATCH v20 15/41] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 16/41] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 17/41] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 18/41] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 19/41] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 20/41] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 21/41] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 22/41] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-04-26 13:25 ` Amadeusz Sławiński
2024-04-30 8:01 ` Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 23/41] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 24/41] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 25/41] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 26/41] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 27/41] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 28/41] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 29/41] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 30/41] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 31/41] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 32/41] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 33/41] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-04-26 13:26 ` Amadeusz Sławiński
2024-05-01 0:32 ` Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 34/41] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 35/41] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-04-25 21:51 ` Wesley Cheng [this message]
2024-04-25 21:51 ` [PATCH v20 37/41] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 38/41] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 39/41] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 40/41] ASoC: qcom: Populate SoC components string Wesley Cheng
2024-04-25 21:51 ` [PATCH v20 41/41] ASoC: doc: Add documentation for SOC USB Wesley Cheng
2024-04-26 3:36 ` Bagas Sanjaya
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=20240425215125.29761-37-quic_wcheng@quicinc.com \
--to=quic_wcheng@quicinc.com \
--cc=Thinh.Nguyen@synopsys.com \
--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@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).