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 28/33] ASoC: qcom: qdsp6: Add SND kcontrol to select offload device
Date: Thu, 21 Sep 2023 14:48:38 -0700 [thread overview]
Message-ID: <20230921214843.18450-29-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20230921214843.18450-1-quic_wcheng@quicinc.com>
Expose a kcontrol on the platform sound card, which will allow for
userspace 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 'Q6USB offload SND device select' 1 0
The above will set the Q6AFE device token to choose offload on card#1 and
pcm#0. Device selection is made possible by setting the Q6AFE device
token. The audio DSP utilizes this parameter, and will pass this field
back to the USB offload driver within the QMI stream requests.
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
sound/soc/qcom/qdsp6/q6usb.c | 125 ++++++++++++++++++++++++++++++++++-
1 file changed, 122 insertions(+), 3 deletions(-)
diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
index d697cbe7f184..a95276b7d91d 100644
--- a/sound/soc/qcom/qdsp6/q6usb.c
+++ b/sound/soc/qcom/qdsp6/q6usb.c
@@ -14,6 +14,7 @@
#include <linux/dma-map-ops.h>
#include <sound/pcm.h>
+#include <sound/control.h>
#include <sound/soc.h>
#include <sound/soc-usb.h>
#include <sound/pcm_params.h>
@@ -35,9 +36,12 @@ struct q6usb_port_data {
struct q6afe_usb_cfg usb_cfg;
struct snd_soc_usb *usb;
struct q6usb_offload priv;
+ struct mutex mutex;
unsigned long available_card_slot;
struct q6usb_status status[SNDRV_CARDS];
- int active_idx;
+ bool idx_valid;
+ int sel_card_idx;
+ int sel_pcm_idx;
};
static const struct snd_soc_dapm_widget q6usb_dai_widgets[] = {
@@ -53,9 +57,34 @@ static int q6usb_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct q6usb_port_data *data = dev_get_drvdata(dai->dev);
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
+ struct q6afe_port *q6usb_afe;
int direction = substream->stream;
+ int chip_idx;
+ int ret;
+
+ mutex_lock(&data->mutex);
+ chip_idx = data->status[data->sel_card_idx].chip_index;
+
+ ret = snd_soc_usb_find_format(chip_idx, params, direction);
+ if (ret < 0)
+ goto out;
+
+ q6usb_afe = q6afe_port_get_from_id(cpu_dai->dev, USB_RX);
+ if (IS_ERR(q6usb_afe))
+ goto out;
- return snd_soc_usb_find_format(data->active_idx, params, direction);
+ ret = afe_port_send_usb_dev_param(q6usb_afe, data->sel_card_idx,
+ data->sel_pcm_idx);
+ if (ret < 0)
+ goto out;
+
+ data->status[data->sel_card_idx].pcm_index = data->sel_pcm_idx;
+out:
+ mutex_unlock(&data->mutex);
+
+ return ret;
}
static const struct snd_soc_dai_ops q6usb_ops = {
@@ -86,6 +115,89 @@ static struct snd_soc_dai_driver q6usb_be_dais[] = {
},
};
+static int q6usb_get_offload_dev(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+ struct q6usb_port_data *data = dev_get_drvdata(component->dev);
+ int pcm_idx;
+ int card_idx;
+
+ mutex_lock(&data->mutex);
+ if (!data->idx_valid) {
+ card_idx = -1;
+ pcm_idx = -1;
+ } else {
+ card_idx = data->sel_card_idx;
+ pcm_idx = data->sel_pcm_idx;
+ }
+
+ ucontrol->value.integer.value[0] = card_idx;
+ ucontrol->value.integer.value[1] = pcm_idx;
+ mutex_unlock(&data->mutex);
+
+ return 0;
+}
+
+static int q6usb_put_offload_dev(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_value *ucontrol)
+{
+ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+ struct q6usb_port_data *data = dev_get_drvdata(component->dev);
+ int changed = 0;
+ int pcmidx;
+ int cardidx;
+
+ cardidx = ucontrol->value.integer.value[0];
+ pcmidx = ucontrol->value.integer.value[1];
+
+ mutex_lock(&data->mutex);
+ if ((cardidx >= 0 && test_bit(cardidx, &data->available_card_slot))) {
+ data->sel_card_idx = cardidx;
+ changed = 1;
+ }
+
+ if ((pcmidx >= 0 && pcmidx < data->status[cardidx].num_pcm)) {
+ data->sel_pcm_idx = pcmidx;
+ data->idx_valid = true;
+ changed = 1;
+ }
+ mutex_unlock(&data->mutex);
+
+ return changed;
+}
+
+static int q6usb_offload_dev_info(struct snd_kcontrol *kcontrol,
+ struct snd_ctl_elem_info *uinfo)
+{
+ uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+ uinfo->count = 2;
+ uinfo->value.integer.min = -1;
+ uinfo->value.integer.max = SNDRV_CARDS;
+
+ return 0;
+}
+
+static const struct snd_kcontrol_new q6usb_offload_dev_ctrl = {
+ .iface = SNDRV_CTL_ELEM_IFACE_CARD,
+ .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+ .name = "Q6USB offload SND device select",
+ .info = q6usb_offload_dev_info,
+ .get = q6usb_get_offload_dev,
+ .put = q6usb_put_offload_dev,
+};
+
+/* Build a mixer control for a UAC connector control (jack-detect) */
+static void q6usb_connector_control_init(struct snd_soc_component *component)
+{
+ int ret;
+
+ ret = snd_ctl_add(component->card->snd_card,
+ snd_ctl_new1(&q6usb_offload_dev_ctrl, component));
+ if (ret < 0)
+ return;
+}
+
static int q6usb_audio_ports_of_xlate_dai_name(struct snd_soc_component *component,
const struct of_phandle_args *args,
const char **dai_name)
@@ -115,9 +227,11 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
data = dev_get_drvdata(usb->component->dev);
+ mutex_lock(&data->mutex);
if (connected) {
/* We only track the latest USB headset plugged in */
- data->active_idx = sdev->card_idx;
+ if (!data->idx_valid || data->sel_card_idx < 0)
+ data->sel_card_idx = sdev->card_idx;
set_bit(sdev->card_idx, &data->available_card_slot);
data->status[sdev->card_idx].num_pcm = sdev->num_playback;
@@ -127,6 +241,7 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
data->status[sdev->card_idx].num_pcm = 0;
data->status[sdev->card_idx].chip_index = 0;
}
+ mutex_unlock(&data->mutex);
return 0;
}
@@ -135,6 +250,8 @@ static int q6usb_component_probe(struct snd_soc_component *component)
{
struct q6usb_port_data *data = dev_get_drvdata(component->dev);
+ q6usb_connector_control_init(component);
+
data->usb = snd_soc_usb_add_port(component->dev, &data->priv, q6usb_alsa_connection_cb);
if (IS_ERR(data->usb)) {
dev_err(component->dev, "failed to add usb port\n");
@@ -189,6 +306,8 @@ static int q6usb_dai_dev_probe(struct platform_device *pdev)
data->priv.domain = iommu_get_domain_for_dev(&pdev->dev);
+ mutex_init(&data->mutex);
+
data->priv.dev = dev;
dev_set_drvdata(dev, data);
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 ` [PATCH v7 06/33] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2023-09-27 14:48 ` 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 ` Wesley Cheng [this message]
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-29-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