All of lore.kernel.org
 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>,
	<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+dt@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 v17 39/51] ASoC: Introduce SND kcontrols to select sound card and PCM device
Date: Fri, 16 Feb 2024 16:10:05 -0800	[thread overview]
Message-ID: <20240217001017.29969-40-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240217001017.29969-1-quic_wcheng@quicinc.com>

Add SND kcontrol to SOC USB, which will allow for userpsace to determine
which USB card number and PCM device to offload.  This allows for userspace
to potentially tag an alternate path for a specific USB SND card and PCM
device.  Previously, control was absent, and the offload path would be
enabled on the last USB SND device which was connected.  This logic will
continue to be applicable if no mixer input is received for specific device
selection.

An example to configure the offload device using tinymix:
tinymix -D 0 set 'USB Offload Playback Route Select' 1 0

The above command will configure the offload path to utilize card#1 and PCM
stream#0.

Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
 include/sound/soc-usb.h |  16 ++++
 sound/soc/soc-usb.c     | 157 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/include/sound/soc-usb.h b/include/sound/soc-usb.h
index 8f2d3064b520..18cdc59df9aa 100644
--- a/include/sound/soc-usb.h
+++ b/include/sound/soc-usb.h
@@ -6,6 +6,12 @@
 #ifndef __LINUX_SND_SOC_USB_H
 #define __LINUX_SND_SOC_USB_H
 
+enum snd_soc_usb_kctl {
+	SND_SOC_USB_KCTL_CARD_ROUTE,
+	SND_SOC_USB_KCTL_PCM_ROUTE,
+	SND_SOC_USB_KCTL_MAX,
+};
+
 /**
  * struct snd_soc_usb_device
  * @card_idx - sound card index associated with USB device
@@ -24,16 +30,26 @@ struct snd_soc_usb_device {
  * struct snd_soc_usb
  * @list - list head for SND SOC struct list
  * @component - reference to ASoC component
+ * @kctl - list of kcontrols created
  * @num_supported_streams - number of supported concurrent sessions
  * @connection_status_cb - callback to notify connection events
+ * @put_offload_dev - callback to select USB sound card/PCM device
+ * @get_offload_dev - callback to fetch selected USB sound card/PCM device
  * @priv_data - driver data
  **/
 struct snd_soc_usb {
 	struct list_head list;
 	struct snd_soc_component *component;
+	struct snd_kcontrol *kctl[SND_SOC_USB_KCTL_MAX];
 	unsigned int num_supported_streams;
 	int (*connection_status_cb)(struct snd_soc_usb *usb,
 			struct snd_soc_usb_device *sdev, bool connected);
+	int (*put_offload_dev)(struct snd_kcontrol *kcontrol,
+			       struct snd_ctl_elem_value *ucontrol,
+			       enum snd_soc_usb_kctl type);
+	int (*get_offload_dev)(struct snd_kcontrol *kcontrol,
+			       struct snd_ctl_elem_value *ucontrol,
+			       enum snd_soc_usb_kctl type);
 	void *priv_data;
 };
 
diff --git a/sound/soc/soc-usb.c b/sound/soc/soc-usb.c
index bc77204fd2db..ade09b416d45 100644
--- a/sound/soc/soc-usb.c
+++ b/sound/soc/soc-usb.c
@@ -15,6 +15,9 @@ static struct device_node *snd_soc_find_phandle(struct device *dev)
 {
 	struct device_node *node;
 
+	if (!dev)
+		return ERR_PTR(-ENODEV);
+
 	node = of_parse_phandle(dev->of_node, "usb-soc-be", 0);
 	if (!node)
 		return ERR_PTR(-ENODEV);
@@ -38,6 +41,152 @@ static struct snd_soc_usb *snd_soc_find_usb_ctx(struct device_node *node)
 	return NULL;
 }
 
+/* SOC USB sound kcontrols */
+static int soc_usb_put_offload_pcm_dev(struct snd_kcontrol *kcontrol,
+			      struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_usb *ctx = snd_soc_find_usb_ctx(component->dev->of_node);
+	int ret = 0;
+
+	mutex_lock(&ctx_mutex);
+	if (ctx && ctx->put_offload_dev)
+		ret = ctx->put_offload_dev(kcontrol, ucontrol,
+						SND_SOC_USB_KCTL_PCM_ROUTE);
+	mutex_unlock(&ctx_mutex);
+
+	return ret;
+}
+
+static int soc_usb_get_offload_pcm_dev(struct snd_kcontrol *kcontrol,
+				   struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_usb *ctx = snd_soc_find_usb_ctx(component->dev->of_node);
+	int ret = 0;
+
+	ucontrol->value.integer.value[0] = -1;
+
+	mutex_lock(&ctx_mutex);
+	if (ctx && ctx->get_offload_dev)
+		ret = ctx->get_offload_dev(kcontrol, ucontrol,
+						SND_SOC_USB_KCTL_PCM_ROUTE);
+	mutex_unlock(&ctx_mutex);
+
+	return ret;
+
+}
+
+static int soc_usb_put_offload_card_dev(struct snd_kcontrol *kcontrol,
+			      struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_usb *ctx = snd_soc_find_usb_ctx(component->dev->of_node);
+	int ret = 0;
+
+	mutex_lock(&ctx_mutex);
+	if (ctx && ctx->put_offload_dev)
+		ret = ctx->put_offload_dev(kcontrol, ucontrol,
+						SND_SOC_USB_KCTL_CARD_ROUTE);
+	mutex_unlock(&ctx_mutex);
+
+	return ret;
+}
+
+static int soc_usb_get_offload_card_dev(struct snd_kcontrol *kcontrol,
+				   struct snd_ctl_elem_value *ucontrol)
+{
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct snd_soc_usb *ctx = snd_soc_find_usb_ctx(component->dev->of_node);
+	int ret = 0;
+
+	ucontrol->value.integer.value[0] = -1;
+
+	mutex_lock(&ctx_mutex);
+	if (ctx && ctx->get_offload_dev)
+		ret = ctx->get_offload_dev(kcontrol, ucontrol,
+						SND_SOC_USB_KCTL_CARD_ROUTE);
+	mutex_unlock(&ctx_mutex);
+
+	return ret;
+
+}
+
+static int soc_usb_offload_pcm_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;
+	/* Arbitrary max value, as there is no 'limit' on number of PCM devices */
+	uinfo->value.integer.max = 0xff;
+
+	return 0;
+}
+
+static int soc_usb_offload_card_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 soc_usb_kcontrols[] = {
+	[SND_SOC_USB_KCTL_CARD_ROUTE] = {
+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+		.name = "USB Offload Playback Route Card Select",
+		.info = soc_usb_offload_card_info,
+		.get = soc_usb_get_offload_card_dev,
+		.put = soc_usb_put_offload_card_dev,
+	},
+	[SND_SOC_USB_KCTL_PCM_ROUTE] = {
+		.iface = SNDRV_CTL_ELEM_IFACE_CARD,
+		.access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+		.name = "USB Offload Playback Route PCM Select",
+		.info = soc_usb_offload_pcm_info,
+		.get = soc_usb_get_offload_pcm_dev,
+		.put = soc_usb_put_offload_pcm_dev,
+	},
+};
+
+static int snd_soc_usb_control_remove(struct snd_soc_usb *usb)
+{
+	struct snd_soc_component *component = usb->component;
+	int i;
+
+	for (i = 0; i < SND_SOC_USB_KCTL_MAX; i++) {
+		if (usb->kctl[i]) {
+			snd_ctl_remove(component->card->snd_card,
+					usb->kctl[i]);
+			snd_ctl_free_one(usb->kctl[i]);
+			usb->kctl[i] = NULL;
+		}
+	}
+
+	return 0;
+}
+
+static int snd_soc_usb_control_init(struct snd_soc_usb *usb)
+{
+	struct snd_soc_component *component = usb->component;
+	int ret;
+	int i;
+
+	for (i = 0; i < SND_SOC_USB_KCTL_MAX; i++) {
+		usb->kctl[i] = snd_ctl_new1(&soc_usb_kcontrols[i], component);
+		ret = snd_ctl_add(component->card->snd_card, usb->kctl[i]);
+		if (ret < 0)
+			return ret;
+	}
+
+	return ret;
+}
+
 /**
  * snd_soc_usb_get_components_tag() - Retrieve SOC USB component tag
  * @playback: direction of audio stream
@@ -158,6 +307,12 @@ EXPORT_SYMBOL_GPL(snd_soc_usb_free_port);
  */
 int snd_soc_usb_add_port(struct snd_soc_usb *usb)
 {
+	int ret;
+
+	ret = snd_soc_usb_control_init(usb);
+	if (ret < 0)
+		return ret;
+
 	mutex_lock(&ctx_mutex);
 	list_add_tail(&usb->list, &usb_ctx_list);
 	mutex_unlock(&ctx_mutex);
@@ -187,6 +342,8 @@ int snd_soc_usb_remove_port(struct snd_soc_usb *usb)
 	}
 	mutex_unlock(&ctx_mutex);
 
+	snd_soc_usb_control_remove(usb);
+
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_usb_remove_port);

  parent reply	other threads:[~2024-02-17  0:11 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-17  0:09 [PATCH v17 00/51] Introduce QC USB SND audio offloading support Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 01/51] xhci: Add interrupt pending autoclear flag to each interrupter Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 02/51] xhci: Add helper to set an interrupters interrupt moderation interval Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 03/51] xhci: make isoc_bei_interval variable interrupter specific Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 04/51] xhci: remove unnecessary event_ring_deq parameter from xhci_handle_event() Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 05/51] xhci: update event ring dequeue pointer position to controller correctly Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 06/51] xhci: move event processing for one interrupter to a separate function Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 07/51] xhci: add helper that checks for unhandled events on a event ring Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 08/51] xhci: Don't check if the event ring is valid before every event TRB Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 09/51] xhci: Decouple handling an event from checking for unhandled events Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 10/51] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 11/51] usb: host: xhci: Export enable and disable interrupter APIs Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 12/51] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 13/51] xhci: export XHCI IMOD setting helper for interrupters Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 14/51] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 15/51] usb: host: xhci-sideband: Expose a sideband interrupter enable API Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 16/51] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 17/51] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 18/51] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 19/51] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 20/51] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 21/51] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 22/51] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 23/51] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 24/51] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 25/51] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 26/51] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 27/51] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 28/51] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 29/51] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 30/51] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 31/51] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 32/51] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-02-17  0:09 ` [PATCH v17 33/51] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 34/51] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 35/51] ASoC: dt-bindings: Add Q6USB backend Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 36/51] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-02-22 16:24   ` Krzysztof Kozlowski
2024-02-22 16:50     ` Mark Brown
2024-02-23  5:59       ` Greg KH
2024-02-23  6:23         ` Greg KH
2024-02-17  0:10 ` [PATCH v17 37/51] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 38/51] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-02-17  0:10 ` Wesley Cheng [this message]
2024-02-17  0:10 ` [PATCH v17 40/51] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 41/51] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 42/51] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 43/51] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 44/51] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 45/51] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 46/51] ALSA: usb-audio: Add USB offloading capable kcontrol Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 47/51] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 48/51] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 49/51] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 50/51] ASoC: qcom: Populate SoC components string Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 51/51] ASoC: doc: Add documentation for SOC USB Wesley Cheng
2024-02-17 15:25 ` [PATCH v17 00/51] Introduce QC USB SND audio offloading support Greg KH
2024-02-19 10:27   ` Mathias Nyman
2024-02-19 10:38     ` Greg KH
2024-02-19 11:03       ` Mathias Nyman
2024-02-19 19:56         ` Greg KH
2024-02-21 23:56     ` 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=20240217001017.29969-40-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+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 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.