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>,
	<lgirdwood@gmail.com>, <tiwai@suse.com>, <krzk+dt@kernel.org>,
	<Thinh.Nguyen@synopsys.com>, <broonie@kernel.org>,
	<bgoswami@quicinc.com>, <robh@kernel.org>,
	<gregkh@linuxfoundation.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 v22 28/38] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks
Date: Thu, 23 May 2024 17:10:33 -0700	[thread overview]
Message-ID: <20240524001043.10141-29-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240524001043.10141-1-quic_wcheng@quicinc.com>

In order for device selection to be supported, the Q6USB backend DAI link
will need to be notified about the device to start the offloading session
on. 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 | 115 +++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 4 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
index f1fa75c0ba5b..5877f132f5f5 100644
--- a/sound/soc/qcom/qdsp6/q6usb.c
+++ b/sound/soc/qcom/qdsp6/q6usb.c
@@ -36,9 +36,12 @@ struct q6usb_port_data {
 	struct q6afe_usb_cfg usb_cfg;
 	struct snd_soc_usb *usb;
 	struct q6usb_offload priv;
-	int active_usb_chip_idx;
+	struct mutex mutex;
 	unsigned long available_card_slot;
 	struct q6usb_status status[SNDRV_CARDS];
+	bool idx_valid;
+	int sel_card_idx;
+	int sel_pcm_idx;
 };
 
 static const struct snd_soc_dapm_widget q6usb_dai_widgets[] = {
@@ -54,10 +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 = snd_soc_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].sdev->chip_idx;
+
+	ret = snd_soc_usb_find_supported_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_supported_format(data->active_usb_chip_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 = {
@@ -88,6 +115,70 @@ 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,
+				 enum snd_soc_usb_kctl type)
+{
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct q6usb_port_data *data = dev_get_drvdata(component->dev);
+	int idx;
+
+	mutex_lock(&data->mutex);
+
+	if (!data->available_card_slot) {
+		idx = -1;
+	} else {
+		if (type == SND_SOC_USB_KCTL_CARD_ROUTE)
+			idx = data->sel_card_idx;
+		else
+			idx = data->sel_pcm_idx;
+	}
+
+	ucontrol->value.integer.value[0] = idx;
+	mutex_unlock(&data->mutex);
+
+	return 0;
+}
+
+static int q6usb_put_offload_dev(struct snd_kcontrol *kcontrol,
+				 struct snd_ctl_elem_value *ucontrol,
+				 enum snd_soc_usb_kctl type)
+{
+	struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
+	struct q6usb_port_data *data = dev_get_drvdata(component->dev);
+	int changed = 0;
+	int idx;
+
+	idx = ucontrol->value.integer.value[0];
+
+	mutex_lock(&data->mutex);
+	switch (type) {
+	case SND_SOC_USB_KCTL_CARD_ROUTE:
+		if (idx >= 0 && test_bit(idx, &data->available_card_slot)) {
+			data->sel_card_idx = idx;
+			changed = 1;
+		}
+		break;
+	case SND_SOC_USB_KCTL_PCM_ROUTE:
+		if (idx >= 0 && data->sel_card_idx >= 0 &&
+		    idx < data->status[data->sel_card_idx].sdev->num_playback) {
+			data->sel_pcm_idx = idx;
+			changed = 1;
+		}
+		break;
+	default:
+		break;
+	}
+
+	if (changed)
+		data->idx_valid = true;
+
+out:
+	mutex_unlock(&data->mutex);
+
+	return changed;
+}
+
 static int q6usb_audio_ports_of_xlate_dai_name(struct snd_soc_component *component,
 					const struct of_phandle_args *args,
 					const char **dai_name)
@@ -117,16 +208,28 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
 
 	data = dev_get_drvdata(usb->component->dev);
 
+	mutex_lock(&data->mutex);
 	if (connected) {
 		/* Selects the latest USB headset plugged in for offloading */
-		data->active_usb_chip_idx = sdev->card_idx;
+		if (!data->idx_valid) {
+			data->sel_card_idx = sdev->card_idx;
+			data->sel_pcm_idx = 0;
+		}
 
 		set_bit(sdev->card_idx, &data->available_card_slot);
 		data->status[sdev->card_idx].sdev = sdev;
 	} else {
 		clear_bit(sdev->card_idx, &data->available_card_slot);
 		data->status[sdev->card_idx].sdev = NULL;
+
+		if (data->sel_card_idx == sdev->card_idx) {
+			data->idx_valid = false;
+			data->sel_card_idx = data->available_card_slot ?
+					ffs(data->available_card_slot) - 1 : 0;
+			data->sel_pcm_idx = 0;
+		}
 	}
+	mutex_unlock(&data->mutex);
 
 	return 0;
 }
@@ -141,6 +244,8 @@ static int q6usb_component_probe(struct snd_soc_component *component)
 		return -ENOMEM;
 
 	usb->connection_status_cb = q6usb_alsa_connection_cb;
+	usb->put_offload_dev = q6usb_put_offload_dev;
+	usb->get_offload_dev = q6usb_get_offload_dev;
 
 	snd_soc_usb_add_port(usb);
 	data->usb = usb;
@@ -194,6 +299,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);
 

  parent reply	other threads:[~2024-05-24  0:11 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-24  0:10 [PATCH v22 00/38] Introduce QC USB SND audio offloading support Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 01/38] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 02/38] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 03/38] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-06-04 23:13   ` Jeff Johnson
2024-06-10 23:36     ` Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 04/38] usb: xhci: Allow for secondary interrupter to set IMOD Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 05/38] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 06/38] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 07/38] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 08/38] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 09/38] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 10/38] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 11/38] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 12/38] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 13/38] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 14/38] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 15/38] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 16/38] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 17/38] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 18/38] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 19/38] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 20/38] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 21/38] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 22/38] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 23/38] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 24/38] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 25/38] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 26/38] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 27/38] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2024-05-24  0:10 ` Wesley Cheng [this message]
2024-05-24  0:10 ` [PATCH v22 29/38] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 30/38] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 31/38] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 32/38] ASoC: qcom: qdsp6: Add headphone jack for offload connection status Wesley Cheng
2024-06-04 23:07   ` Jeff Johnson
2024-05-24  0:10 ` [PATCH v22 33/38] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 34/38] ALSA: usb-audio: Add USB offloading capable kcontrol Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 35/38] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 36/38] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 37/38] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-05-24  0:10 ` [PATCH v22 38/38] ASoC: doc: Add documentation for SOC USB Wesley Cheng
2024-06-03 23:15 ` [PATCH v22 00/38] Introduce QC USB SND audio offloading support 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=20240524001043.10141-29-quic_wcheng@quicinc.com \
    --to=quic_wcheng@quicinc.com \
    --cc=Thinh.Nguyen@synopsys.com \
    --cc=alsa-devel@alsa-project.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=krzk+dt@kernel.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

all inboxes | Powered by JetHome®