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 42/51] ASoC: qcom: qdsp6: Add PCM ops to track current state
Date: Fri, 16 Feb 2024 16:10:08 -0800	[thread overview]
Message-ID: <20240217001017.29969-43-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240217001017.29969-1-quic_wcheng@quicinc.com>

Register PCM callbacks so that the Q6USB DPCM backend dai link can track
and update the status of the PCM device.  Utilize the SOC USB state APIs to
ensure that the SND kcontrol for the offload status is updated properly.

Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
 sound/soc/qcom/qdsp6/q6usb.c | 52 +++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
index 72ec7d45f916..32971395ab13 100644
--- a/sound/soc/qcom/qdsp6/q6usb.c
+++ b/sound/soc/qcom/qdsp6/q6usb.c
@@ -30,6 +30,9 @@
 struct q6usb_status {
 	struct snd_soc_usb_device *sdev;
 	unsigned int pcm_index;
+	bool prepared;
+	bool running;
+	int session_id;
 };
 
 struct q6usb_port_data {
@@ -81,14 +84,48 @@ static int q6usb_hw_params(struct snd_pcm_substream *substream,
 		goto out;
 
 	data->status[data->sel_card_idx].pcm_index = data->sel_pcm_idx;
+	data->status[data->sel_card_idx].prepared = true;
+	data->status[data->sel_card_idx].session_id =
+		snd_soc_usb_prepare_session(data->usb, data->sel_card_idx,
+						data->sel_pcm_idx);
 out:
 	mutex_unlock(&data->mutex);
 
 	return ret;
 }
 
+static int q6usb_prepare(struct snd_pcm_substream *substream,
+		struct snd_soc_dai *dai)
+{
+	struct q6usb_port_data *data = dev_get_drvdata(dai->dev);
+
+	mutex_lock(&data->mutex);
+	data->status[data->sel_card_idx].running = true;
+	snd_soc_usb_set_session_state(data->usb,
+			data->status[data->sel_card_idx].session_id,
+			SND_SOC_USB_RUNNING);
+	mutex_unlock(&data->mutex);
+
+	return 0;
+}
+
+static void q6usb_shutdown(struct snd_pcm_substream *substream,
+				struct snd_soc_dai *dai)
+{
+	struct q6usb_port_data *data = dev_get_drvdata(dai->dev);
+
+	mutex_lock(&data->mutex);
+	data->status[data->sel_card_idx].running = false;
+	data->status[data->sel_card_idx].prepared = false;
+	snd_soc_usb_shutdown_session(data->usb,
+			data->status[data->sel_card_idx].session_id);
+	mutex_unlock(&data->mutex);
+}
+
 static const struct snd_soc_dai_ops q6usb_ops = {
 	.hw_params = q6usb_hw_params,
+	.prepare = q6usb_prepare,
+	.shutdown = q6usb_shutdown,
 };
 
 static struct snd_soc_dai_driver q6usb_be_dais[] = {
@@ -149,9 +186,14 @@ static int q6usb_put_offload_dev(struct snd_kcontrol *kcontrol,
 	int changed = 0;
 	int idx;
 
+	mutex_lock(&data->mutex);
+
+	/* Don't allow changes to the offloading devices if session is busy */
+	if (data->sel_card_idx >= 0 && data->status[data->sel_card_idx].prepared)
+		goto out;
+
 	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)) {
@@ -210,8 +252,12 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
 
 	mutex_lock(&data->mutex);
 	if (connected) {
-		/* We only track the latest USB headset plugged in */
-		if (!data->idx_valid) {
+		/*
+		 * Update the latest USB headset plugged in, if session is
+		 * idle.
+		 */
+		if (!data->idx_valid &&
+			!data->status[data->sel_card_idx].prepared) {
 			data->sel_card_idx = sdev->card_idx;
 			data->sel_pcm_idx = 0;
 		}

  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 ` [PATCH v17 39/51] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
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 ` Wesley Cheng [this message]
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-43-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.