From: Wesley Cheng <quic_wcheng@quicinc.com> To: <srinivas.kandagatla@linaro.org>, <mathias.nyman@intel.com>, <perex@perex.cz>, <broonie@kernel.org>, <lgirdwood@gmail.com>, <krzysztof.kozlowski+dt@linaro.org>, <agross@kernel.org>, <Thinh.Nguyen@synopsys.com>, <bgoswami@quicinc.com>, <andersson@kernel.org>, <robh+dt@kernel.org>, <gregkh@linuxfoundation.org>, <tiwai@suse.com> Cc: <linux-kernel@vger.kernel.org>, <linux-arm-msm@vger.kernel.org>, <alsa-devel@alsa-project.org>, <devicetree@vger.kernel.org>, <linux-usb@vger.kernel.org>, <quic_jackp@quicinc.com>, <quic_plai@quicinc.com>, Wesley Cheng <quic_wcheng@quicinc.com> Subject: [PATCH v3 19/28] sound: usb: Prevent starting of audio stream if in use Date: Wed, 8 Mar 2023 15:57:42 -0800 [thread overview] Message-ID: <20230308235751.495-20-quic_wcheng@quicinc.com> (raw) In-Reply-To: <20230308235751.495-1-quic_wcheng@quicinc.com> With USB audio offloading, an audio session is started from the ASoC platform sound card and PCM devices. Likewise, the USB SND path is still readily available for use, in case the non-offload path is desired. In order to prevent the two entities from attempting to use the USB bus, introduce a flag that determines when either paths are in use. If a PCM device is already in use, the check will return an error to userspace notifying that the stream is currently busy. This ensures that only one path is using the USB substream. Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com> --- sound/usb/card.h | 1 + sound/usb/pcm.c | 19 +++++++++++++++++-- sound/usb/qcom/qc_audio_offload.c | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index 4535b48edd1b..922868d2dccd 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -164,6 +164,7 @@ struct snd_usb_substream { unsigned int pkt_offset_adj; /* Bytes to drop from beginning of packets (for non-compliant devices) */ unsigned int stream_offset_adj; /* Bytes to drop from beginning of stream (for non-compliant devices) */ + unsigned int opened:1; /* pcm device opened */ unsigned int running: 1; /* running status */ unsigned int period_elapsed_pending; /* delay period handling */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 482c160cbc17..c8590ff78d11 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1208,8 +1208,15 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream) struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_usb_substream *subs = &as->substream[direction]; + struct snd_usb_audio *chip = subs->stream->chip; int ret; + mutex_lock(&chip->mutex); + if (subs->opened) { + mutex_unlock(&chip->mutex); + return -EBUSY; + } + runtime->hw = snd_usb_hardware; /* need an explicit sync to catch applptr update in low-latency mode */ if (direction == SNDRV_PCM_STREAM_PLAYBACK && @@ -1226,13 +1233,17 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream) ret = setup_hw_info(runtime, subs); if (ret < 0) - return ret; + goto out; ret = snd_usb_autoresume(subs->stream->chip); if (ret < 0) - return ret; + goto out; ret = snd_media_stream_init(subs, as->pcm, direction); if (ret < 0) snd_usb_autosuspend(subs->stream->chip); + subs->opened = 1; +out: + mutex_unlock(&chip->mutex); + return ret; } @@ -1241,6 +1252,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream) int direction = substream->stream; struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_usb_substream *subs = &as->substream[direction]; + struct snd_usb_audio *chip = subs->stream->chip; int ret; snd_media_stop_pipeline(subs); @@ -1254,6 +1266,9 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream) subs->pcm_substream = NULL; snd_usb_autosuspend(subs->stream->chip); + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); return 0; } diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c index 2663906644f2..2c8dd5605849 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -1402,12 +1402,17 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, goto response; } + mutex_lock(&chip->mutex); if (req_msg->enable) { - if (info_idx < 0 || chip->system_suspend) { + if (info_idx < 0 || chip->system_suspend || subs->opened) { ret = -EBUSY; + mutex_unlock(&chip->mutex); + goto response; } + subs->opened = 1; } + mutex_unlock(&chip->mutex); if (req_msg->service_interval_valid) { ret = get_data_interval_from_si(subs, @@ -1429,6 +1434,11 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, if (!ret) ret = prepare_qmi_response(subs, req_msg, &resp, info_idx); + if (ret < 0) { + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); + } } else { info = &uadev[pcm_card_num].info[info_idx]; if (info->data_ep_pipe) { @@ -1450,6 +1460,9 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, } disable_audio_stream(subs); + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); } response:
WARNING: multiple messages have this Message-ID (diff)
From: Wesley Cheng <quic_wcheng@quicinc.com> To: <srinivas.kandagatla@linaro.org>, <mathias.nyman@intel.com>, <perex@perex.cz>, <broonie@kernel.org>, <lgirdwood@gmail.com>, <krzysztof.kozlowski+dt@linaro.org>, <agross@kernel.org>, <Thinh.Nguyen@synopsys.com>, <bgoswami@quicinc.com>, <andersson@kernel.org>, <robh+dt@kernel.org>, <gregkh@linuxfoundation.org>, <tiwai@suse.com> Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, quic_jackp@quicinc.com, quic_plai@quicinc.com, Wesley Cheng <quic_wcheng@quicinc.com> Subject: [PATCH v3 19/28] sound: usb: Prevent starting of audio stream if in use Date: Wed, 8 Mar 2023 15:57:42 -0800 [thread overview] Message-ID: <20230308235751.495-20-quic_wcheng@quicinc.com> (raw) In-Reply-To: <20230308235751.495-1-quic_wcheng@quicinc.com> With USB audio offloading, an audio session is started from the ASoC platform sound card and PCM devices. Likewise, the USB SND path is still readily available for use, in case the non-offload path is desired. In order to prevent the two entities from attempting to use the USB bus, introduce a flag that determines when either paths are in use. If a PCM device is already in use, the check will return an error to userspace notifying that the stream is currently busy. This ensures that only one path is using the USB substream. Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com> --- sound/usb/card.h | 1 + sound/usb/pcm.c | 19 +++++++++++++++++-- sound/usb/qcom/qc_audio_offload.c | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index 4535b48edd1b..922868d2dccd 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -164,6 +164,7 @@ struct snd_usb_substream { unsigned int pkt_offset_adj; /* Bytes to drop from beginning of packets (for non-compliant devices) */ unsigned int stream_offset_adj; /* Bytes to drop from beginning of stream (for non-compliant devices) */ + unsigned int opened:1; /* pcm device opened */ unsigned int running: 1; /* running status */ unsigned int period_elapsed_pending; /* delay period handling */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 482c160cbc17..c8590ff78d11 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -1208,8 +1208,15 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream) struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_pcm_runtime *runtime = substream->runtime; struct snd_usb_substream *subs = &as->substream[direction]; + struct snd_usb_audio *chip = subs->stream->chip; int ret; + mutex_lock(&chip->mutex); + if (subs->opened) { + mutex_unlock(&chip->mutex); + return -EBUSY; + } + runtime->hw = snd_usb_hardware; /* need an explicit sync to catch applptr update in low-latency mode */ if (direction == SNDRV_PCM_STREAM_PLAYBACK && @@ -1226,13 +1233,17 @@ static int snd_usb_pcm_open(struct snd_pcm_substream *substream) ret = setup_hw_info(runtime, subs); if (ret < 0) - return ret; + goto out; ret = snd_usb_autoresume(subs->stream->chip); if (ret < 0) - return ret; + goto out; ret = snd_media_stream_init(subs, as->pcm, direction); if (ret < 0) snd_usb_autosuspend(subs->stream->chip); + subs->opened = 1; +out: + mutex_unlock(&chip->mutex); + return ret; } @@ -1241,6 +1252,7 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream) int direction = substream->stream; struct snd_usb_stream *as = snd_pcm_substream_chip(substream); struct snd_usb_substream *subs = &as->substream[direction]; + struct snd_usb_audio *chip = subs->stream->chip; int ret; snd_media_stop_pipeline(subs); @@ -1254,6 +1266,9 @@ static int snd_usb_pcm_close(struct snd_pcm_substream *substream) subs->pcm_substream = NULL; snd_usb_autosuspend(subs->stream->chip); + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); return 0; } diff --git a/sound/usb/qcom/qc_audio_offload.c b/sound/usb/qcom/qc_audio_offload.c index 2663906644f2..2c8dd5605849 100644 --- a/sound/usb/qcom/qc_audio_offload.c +++ b/sound/usb/qcom/qc_audio_offload.c @@ -1402,12 +1402,17 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, goto response; } + mutex_lock(&chip->mutex); if (req_msg->enable) { - if (info_idx < 0 || chip->system_suspend) { + if (info_idx < 0 || chip->system_suspend || subs->opened) { ret = -EBUSY; + mutex_unlock(&chip->mutex); + goto response; } + subs->opened = 1; } + mutex_unlock(&chip->mutex); if (req_msg->service_interval_valid) { ret = get_data_interval_from_si(subs, @@ -1429,6 +1434,11 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, if (!ret) ret = prepare_qmi_response(subs, req_msg, &resp, info_idx); + if (ret < 0) { + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); + } } else { info = &uadev[pcm_card_num].info[info_idx]; if (info->data_ep_pipe) { @@ -1450,6 +1460,9 @@ static void handle_uaudio_stream_req(struct qmi_handle *handle, } disable_audio_stream(subs); + mutex_lock(&chip->mutex); + subs->opened = 0; + mutex_unlock(&chip->mutex); } response:
next prev parent reply other threads:[~2023-03-08 23:58 UTC|newest] Thread overview: 137+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-08 23:57 [PATCH v3 00/28] Introduce QC USB SND audio offloading support Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 01/28] xhci: Add support to allocate several interrupters Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 10:34 ` Oliver Neukum 2023-03-09 10:34 ` Oliver Neukum via Alsa-devel 2023-03-09 10:51 ` Takashi Iwai 2023-03-09 10:51 ` Takashi Iwai 2023-03-10 15:07 ` Mathias Nyman 2023-03-13 20:08 ` Wesley Cheng 2023-03-13 20:08 ` Wesley Cheng 2023-04-25 1:17 ` Wesley Cheng 2023-04-25 1:17 ` Wesley Cheng 2023-03-13 20:32 ` Wesley Cheng 2023-03-13 20:32 ` Wesley Cheng 2023-06-23 22:37 ` Wesley Cheng 2023-06-26 13:55 ` Mathias Nyman 2023-06-26 15:05 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 02/28] usb: xhci: Add XHCI APIs to support USB offloading Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 6:38 ` Greg KH 2023-03-09 6:38 ` Greg KH 2023-03-09 19:51 ` Wesley Cheng 2023-03-09 19:51 ` Wesley Cheng 2023-03-10 12:17 ` Claudiu.Beznea 2023-03-10 12:17 ` Claudiu.Beznea--- via Alsa-devel 2023-03-08 23:57 ` [PATCH v3 03/28] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 04/28] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 6:41 ` Greg KH 2023-03-09 6:41 ` Greg KH 2023-03-08 23:57 ` [PATCH v3 05/28] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 9:00 ` Srinivas Kandagatla 2023-03-08 23:57 ` [PATCH v3 06/28] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 9:01 ` Srinivas Kandagatla 2023-03-08 23:57 ` [PATCH v3 07/28] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 08/28] ASoC: qcom: Add USB backend ASoC driver for Q6 Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 9:01 ` Srinivas Kandagatla 2023-03-09 19:38 ` Wesley Cheng 2023-03-09 19:38 ` Wesley Cheng 2023-03-10 7:21 ` Srinivas Kandagatla 2023-03-25 1:15 ` Wesley Cheng 2023-03-25 1:15 ` Wesley Cheng 2023-03-10 12:22 ` Claudiu.Beznea 2023-03-10 12:22 ` Claudiu.Beznea--- via Alsa-devel 2023-03-08 23:57 ` [PATCH v3 09/28] sound: usb: card: Introduce USB SND platform op callbacks Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 6:44 ` Greg KH 2023-03-09 6:44 ` Greg KH 2023-03-09 14:10 ` Takashi Iwai 2023-03-09 14:10 ` Takashi Iwai 2023-03-09 11:16 ` Oliver Neukum 2023-03-09 11:16 ` Oliver Neukum via Alsa-devel 2023-03-08 23:57 ` [PATCH v3 10/28] sound: usb: Export USB SND APIs for modules Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 6:29 ` Greg KH 2023-03-09 6:29 ` Greg KH 2023-03-08 23:57 ` [PATCH v3 11/28] dt-bindings: usb: dwc3: Add snps,num-hc-interrupters definition Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-10 8:50 ` Krzysztof Kozlowski 2023-03-11 13:40 ` Rob Herring 2023-03-11 13:40 ` Rob Herring 2023-08-29 2:05 ` Wesley Cheng 2023-08-29 6:33 ` Krzysztof Kozlowski 2023-08-29 7:19 ` Wesley Cheng 2023-08-29 7:42 ` Krzysztof Kozlowski 2023-08-29 7:50 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 12/28] usb: dwc3: Add DT parameter to specify maximum number of interrupters Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 13/28] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 14/28] sound: usb: pcm: Export fixed rate check USB SND API Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 15/28] sound: usb: Introduce QC USB SND offloading support Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 8:29 ` Takashi Sakamoto 2023-03-09 8:29 ` Takashi Sakamoto 2023-03-09 17:54 ` Pierre-Louis Bossart 2023-03-08 23:57 ` [PATCH v3 16/28] sound: usb: card: Check for support for requested audio format Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 17/28] sound: soc: soc-usb: Add PCM format check API for USB backend Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 18/28] sound: soc: qcom: qusb6: Ensure PCM format is supported by USB audio device Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng [this message] 2023-03-08 23:57 ` [PATCH v3 19/28] sound: usb: Prevent starting of audio stream if in use Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 20/28] ASoC: dt-bindings: Add Q6USB backend bindings Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-10 8:54 ` Krzysztof Kozlowski 2023-06-23 0:15 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 21/28] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-10 8:56 ` Krzysztof Kozlowski 2023-06-23 0:51 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 22/28] ASoC: qcom: qdsp6: q6afe: Split USB AFE dev_token param into separate API Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 9:01 ` Srinivas Kandagatla 2023-03-09 19:39 ` Wesley Cheng 2023-03-09 19:39 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 23/28] sound: Pass USB SND card and PCM information to SOC USB Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 24/28] sound: soc: qdsp6: Add SND kcontrol to select offload device Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 25/28] sound: soc: qdsp6: Add SND kcontrol for fetching offload status Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 26/28] sound: usb: qc_audio_offload: Use card and PCM index from QMI request Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-08 23:57 ` [PATCH v3 27/28] sound: usb: card: Allow for rediscovery of connected USB SND devices Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 11:32 ` Oliver Neukum via Alsa-devel 2023-03-09 11:32 ` Oliver Neukum 2023-03-08 23:57 ` [PATCH v3 28/28] sound: soc: soc-usb: Rediscover USB SND devices on USB port add Wesley Cheng 2023-03-08 23:57 ` Wesley Cheng 2023-03-09 6:46 ` [PATCH v3 00/28] Introduce QC USB SND audio offloading support Greg KH 2023-03-09 6:46 ` Greg KH 2023-03-09 17:13 ` Pierre-Louis Bossart 2023-03-09 21:10 ` Wesley Cheng 2023-03-09 21:10 ` Wesley Cheng 2023-03-10 0:37 ` Pierre-Louis Bossart 2023-03-13 23:43 ` Wesley Cheng 2023-03-13 23:43 ` Wesley Cheng 2023-03-14 0:42 ` Pierre-Louis Bossart 2023-03-14 1:42 ` Wesley Cheng 2023-03-14 1:42 ` Wesley Cheng 2023-03-14 2:22 ` Pierre-Louis Bossart 2023-03-15 0:08 ` Wesley Cheng 2023-03-15 0:08 ` Wesley Cheng 2023-03-15 14:30 ` Pierre-Louis Bossart 2023-03-15 16:29 ` Mark Brown 2023-03-15 16:29 ` Mark Brown 2023-03-15 19:42 ` Wesley Cheng 2023-03-15 19:42 ` 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=20230308235751.495-20-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=devicetree@vger.kernel.org \ --cc=gregkh@linuxfoundation.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=quic_jackp@quicinc.com \ --cc=quic_plai@quicinc.com \ --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: linkBe 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.