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>,
<krzk+dt@kernel.org>, <gregkh@linuxfoundation.org>,
<Thinh.Nguyen@synopsys.com>, <broonie@kernel.org>,
<bgoswami@quicinc.com>, <tiwai@suse.com>, <bagasdotme@gmail.com>,
<robh@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 v21 32/39] ASoC: qcom: qdsp6: Add headphone jack for offload connection status
Date: Tue, 7 May 2024 12:51:09 -0700 [thread overview]
Message-ID: <20240507195116.9464-33-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240507195116.9464-1-quic_wcheng@quicinc.com>
The headphone jack framework has a well defined infrastructure for
notifying userspace entities through input devices. Expose a jack device
that carries information about if an offload capable device is connected.
Applications can further identify specific offloading information through
other SND kcontrols.
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
---
sound/soc/qcom/Kconfig | 5 +++
sound/soc/qcom/Makefile | 2 ++
sound/soc/qcom/qdsp6/q6usb.c | 40 ++++++++++++++++++++++
sound/soc/qcom/sm8250.c | 23 ++++++++++++-
sound/soc/qcom/usb_offload_utils.c | 55 ++++++++++++++++++++++++++++++
sound/soc/qcom/usb_offload_utils.h | 29 ++++++++++++++++
6 files changed, 153 insertions(+), 1 deletion(-)
create mode 100644 sound/soc/qcom/usb_offload_utils.c
create mode 100644 sound/soc/qcom/usb_offload_utils.h
diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index a1beafe2b1dd..e5284a93cf9a 100644
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -118,9 +118,14 @@ config SND_SOC_QDSP6_PRM
tristate
select SND_SOC_QDSP6_PRM_LPASS_CLOCKS
+config SND_SOC_QCOM_OFFLOAD_UTILS
+ tristate
+
config SND_SOC_QDSP6_USB
tristate "SoC ALSA USB offloading backing for QDSP6"
depends on SND_SOC_USB
+ select SND_SOC_QCOM_OFFLOAD_UTILS
+
help
Adds support for USB offloading for QDSP6 ASoC
based platform sound cards. This will enable the
diff --git a/sound/soc/qcom/Makefile b/sound/soc/qcom/Makefile
index 34f3fcb8ee9a..001c287df777 100644
--- a/sound/soc/qcom/Makefile
+++ b/sound/soc/qcom/Makefile
@@ -30,6 +30,7 @@ snd-soc-sc8280xp-objs := sc8280xp.o
snd-soc-qcom-common-objs := common.o
snd-soc-qcom-sdw-objs := sdw.o
snd-soc-x1e80100-objs := x1e80100.o
+snd-soc-qcom-offload-utils-objs := usb_offload_utils.o
obj-$(CONFIG_SND_SOC_STORM) += snd-soc-storm.o
obj-$(CONFIG_SND_SOC_APQ8016_SBC) += snd-soc-apq8016-sbc.o
@@ -42,6 +43,7 @@ obj-$(CONFIG_SND_SOC_SM8250) += snd-soc-sm8250.o
obj-$(CONFIG_SND_SOC_QCOM_COMMON) += snd-soc-qcom-common.o
obj-$(CONFIG_SND_SOC_QCOM_SDW) += snd-soc-qcom-sdw.o
obj-$(CONFIG_SND_SOC_X1E80100) += snd-soc-x1e80100.o
+obj-$(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS) += snd-soc-qcom-offload-utils.o
#DSP lib
obj-$(CONFIG_SND_SOC_QDSP6) += qdsp6/
diff --git a/sound/soc/qcom/qdsp6/q6usb.c b/sound/soc/qcom/qdsp6/q6usb.c
index 394b20b6de82..ba988b47ffd5 100644
--- a/sound/soc/qcom/qdsp6/q6usb.c
+++ b/sound/soc/qcom/qdsp6/q6usb.c
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <sound/asound.h>
+#include <sound/jack.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/q6usboffload.h>
@@ -38,6 +39,7 @@ struct q6usb_status {
struct q6usb_port_data {
struct q6afe_usb_cfg usb_cfg;
struct snd_soc_usb *usb;
+ struct snd_soc_jack *hs_jack;
struct q6usb_offload priv;
struct mutex mutex;
unsigned long available_card_slot;
@@ -252,6 +254,9 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
mutex_lock(&data->mutex);
if (connected) {
+ if (!data->available_card_slot)
+ snd_jack_report(data->hs_jack->jack, 1);
+
/*
* Update the latest USB headset plugged in, if session is
* idle.
@@ -274,11 +279,45 @@ static int q6usb_alsa_connection_cb(struct snd_soc_usb *usb,
ffs(data->available_card_slot) - 1 : 0;
data->sel_pcm_idx = 0;
}
+
+ if (!data->available_card_slot)
+ snd_jack_report(data->hs_jack->jack, 0);
}
mutex_unlock(&data->mutex);
return 0;
}
+static void q6usb_component_disable_jack(struct q6usb_port_data *data)
+{
+ /* Offload jack has already been disabled */
+ if (!data->hs_jack)
+ return;
+
+ snd_jack_report(data->hs_jack->jack, 0);
+ data->hs_jack = NULL;
+}
+
+static void q6usb_component_enable_jack(struct q6usb_port_data *data,
+ struct snd_soc_jack *jack)
+{
+ snd_jack_report(jack->jack, data->available_card_slot ? 1 : 0);
+ data->hs_jack = jack;
+}
+
+static int q6usb_component_set_jack(struct snd_soc_component *component,
+ struct snd_soc_jack *jack, void *priv)
+{
+ struct q6usb_port_data *data = dev_get_drvdata(component->dev);
+
+ mutex_lock(&data->mutex);
+ if (jack)
+ q6usb_component_enable_jack(data, jack);
+ else
+ q6usb_component_disable_jack(data);
+ mutex_unlock(&data->mutex);
+
+ return 0;
+}
static int q6usb_component_probe(struct snd_soc_component *component)
{
@@ -320,6 +359,7 @@ static void q6usb_component_remove(struct snd_soc_component *component)
static const struct snd_soc_component_driver q6usb_dai_component = {
.probe = q6usb_component_probe,
+ .set_jack = q6usb_component_set_jack,
.remove = q6usb_component_remove,
.name = "q6usb-dai-component",
.dapm_widgets = q6usb_dai_widgets,
diff --git a/sound/soc/qcom/sm8250.c b/sound/soc/qcom/sm8250.c
index d70df72c0160..6f156c94de01 100644
--- a/sound/soc/qcom/sm8250.c
+++ b/sound/soc/qcom/sm8250.c
@@ -12,6 +12,7 @@
#include <linux/input-event-codes.h>
#include "qdsp6/q6afe.h"
#include "common.h"
+#include "usb_offload_utils.h"
#include "sdw.h"
#define DRIVER_NAME "sm8250"
@@ -22,14 +23,33 @@ struct sm8250_snd_data {
struct snd_soc_card *card;
struct sdw_stream_runtime *sruntime[AFE_PORT_MAX];
struct snd_soc_jack jack;
+ struct snd_soc_jack usb_offload_jack;
+ bool usb_offload_jack_setup;
bool jack_setup;
};
static int sm8250_snd_init(struct snd_soc_pcm_runtime *rtd)
{
struct sm8250_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+ int ret;
+
+ if (cpu_dai->id == USB_RX)
+ ret = qcom_snd_usb_offload_jack_setup(rtd, &data->usb_offload_jack,
+ &data->usb_offload_jack_setup);
+ else
+ ret = qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
+ return ret;
+}
+
+static void sm8250_snd_exit(struct snd_soc_pcm_runtime *rtd)
+{
+ struct sm8250_snd_data *data = snd_soc_card_get_drvdata(rtd->card);
+ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+
+ if (cpu_dai->id == USB_RX)
+ qcom_snd_usb_offload_jack_remove(rtd, &data->usb_offload_jack_setup);
- return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
}
static int sm8250_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
@@ -129,6 +149,7 @@ static void sm8250_add_be_ops(struct snd_soc_card *card)
for_each_card_prelinks(card, i, link) {
if (link->no_pcm == 1) {
link->init = sm8250_snd_init;
+ link->exit = sm8250_snd_exit;
link->be_hw_params_fixup = sm8250_be_hw_params_fixup;
link->ops = &sm8250_be_ops;
}
diff --git a/sound/soc/qcom/usb_offload_utils.c b/sound/soc/qcom/usb_offload_utils.c
new file mode 100644
index 000000000000..a84394a9b772
--- /dev/null
+++ b/sound/soc/qcom/usb_offload_utils.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include <dt-bindings/sound/qcom,q6afe.h>
+#include <linux/module.h>
+#include <sound/jack.h>
+#include <sound/soc-usb.h>
+
+#include "usb_offload_utils.h"
+
+int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
+ struct snd_soc_jack *jack, bool *jack_setup)
+{
+ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+ struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+ int ret = 0;
+
+ if (cpu_dai->id != USB_RX)
+ return -EINVAL;
+
+ if (!*jack_setup) {
+ ret = snd_soc_usb_setup_offload_jack(codec_dai->component, jack);
+ if (ret)
+ return ret;
+ }
+
+ *jack_setup = true;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_snd_usb_offload_jack_setup);
+
+int qcom_snd_usb_offload_jack_remove(struct snd_soc_pcm_runtime *rtd,
+ bool *jack_setup)
+{
+ struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+ struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+ int ret = 0;
+
+ if (cpu_dai->id != USB_RX)
+ return -EINVAL;
+
+ if (*jack_setup) {
+ ret = snd_soc_usb_disable_offload_jack(codec_dai->component);
+ if (ret)
+ return ret;
+ }
+
+ *jack_setup = false;
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_snd_usb_offload_jack_remove);
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/qcom/usb_offload_utils.h b/sound/soc/qcom/usb_offload_utils.h
new file mode 100644
index 000000000000..d44f78569b47
--- /dev/null
+++ b/sound/soc/qcom/usb_offload_utils.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#ifndef __QCOM_SND_USB_OFFLOAD_UTILS_H__
+#define __QCOM_SND_USB_OFFLOAD_UTILS_H__
+
+#include <sound/soc.h>
+
+#if IS_ENABLED(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS)
+int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
+ struct snd_soc_jack *jack, bool *jack_setup);
+
+int qcom_snd_usb_offload_jack_remove(struct snd_soc_pcm_runtime *rtd,
+ bool *jack_setup);
+#else
+static inline int qcom_snd_usb_offload_jack_setup(struct snd_soc_pcm_runtime *rtd,
+ struct snd_soc_jack *jack, bool *jack_setup)
+{
+ return -ENODEV;
+}
+
+static inline int qcom_snd_usb_offload_jack_remove(struct snd_soc_pcm_runtime *rtd,
+ bool *jack_setup)
+{
+ return -ENODEV;
+}
+#endif /* IS_ENABLED(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS) */
+#endif /* __QCOM_SND_USB_OFFLOAD_UTILS_H__ */
next prev parent reply other threads:[~2024-05-07 19:51 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 19:50 [PATCH v21 00/39] Introduce QC USB SND audio offloading support Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 01/39] xhci: add helper to stop endpoint and wait for completion Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 02/39] usb: host: xhci: Repurpose event handler for skipping interrupter events Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 03/39] xhci: sideband: add initial api to register a sideband entity Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 04/39] usb: xhci: Allow for secondary interrupter to set IMOD Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 05/39] usb: host: xhci-mem: Cleanup pending secondary event ring events Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 06/39] usb: host: xhci-mem: Allow for interrupter clients to choose specific index Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 07/39] ASoC: Add SOC USB APIs for adding an USB backend Wesley Cheng
2024-05-07 20:26 ` Pierre-Louis Bossart
2024-05-08 20:16 ` Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 08/39] ASoC: dt-bindings: qcom,q6dsp-lpass-ports: Add USB_RX port Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 09/39] ASoC: qcom: qdsp6: Introduce USB AFE port to q6dsp Wesley Cheng
2024-05-07 20:37 ` Pierre-Louis Bossart
2024-05-08 23:34 ` Wesley Cheng
2024-05-09 12:54 ` Pierre-Louis Bossart
2024-05-09 21:34 ` Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 10/39] ASoC: qdsp6: q6afe: Increase APR timeout Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 11/39] ASoC: qcom: qdsp6: Add USB backend ASoC driver for Q6 Wesley Cheng
2024-05-07 20:39 ` Pierre-Louis Bossart
2024-05-07 19:50 ` [PATCH v21 12/39] ALSA: usb-audio: Introduce USB SND platform op callbacks Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 13/39] ALSA: usb-audio: Export USB SND APIs for modules Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 14/39] ALSA: usb-audio: Save UAC sample size information Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 15/39] usb: dwc3: Specify maximum number of XHCI interrupters Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 16/39] usb: host: xhci-plat: Set XHCI max interrupters if property is present Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 17/39] ALSA: usb-audio: qcom: Add USB QMI definitions Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 18/39] ALSA: usb-audio: qcom: Introduce QC USB SND offloading support Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 19/39] ALSA: usb-audio: Check for support for requested audio format Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 20/39] ASoC: usb: Add PCM format check API for USB backend Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 21/39] ASoC: qcom: qdsp6: Ensure PCM format is supported by USB audio device Wesley Cheng
2024-05-07 19:50 ` [PATCH v21 22/39] ALSA: usb-audio: Prevent starting of audio stream if in use Wesley Cheng
2024-05-07 21:20 ` Pierre-Louis Bossart
2024-05-08 23:40 ` Wesley Cheng
2024-05-09 13:01 ` Pierre-Louis Bossart
2024-05-09 21:38 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 23/39] ALSA: usb-audio: Do not allow USB offload path if PCM device is " Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 24/39] ASoC: dt-bindings: Update example for enabling USB offload on SM8250 Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 25/39] ALSA: usb-audio: qcom: Populate PCM and USB chip information Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 26/39] ASoC: qcom: qdsp6: Add support to track available USB PCM devices Wesley Cheng
2024-05-07 21:23 ` Pierre-Louis Bossart
2024-05-08 23:57 ` Wesley Cheng
2024-05-09 13:02 ` Pierre-Louis Bossart
2024-05-09 21:49 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 27/39] ASoC: Introduce SND kcontrols to select sound card and PCM device Wesley Cheng
2024-05-07 21:26 ` Pierre-Louis Bossart
2024-05-09 0:10 ` Wesley Cheng
2024-05-09 13:07 ` Pierre-Louis Bossart
2024-05-09 22:32 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 28/39] ASoC: qcom: qdsp6: Add SOC USB offload select get/put callbacks Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 29/39] ASoC: Introduce SND kcontrols to track USB offloading state Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 30/39] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 31/39] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-05-07 19:51 ` Wesley Cheng [this message]
2024-05-07 19:51 ` [PATCH v21 33/39] ASoC: usb: Fetch ASoC sound card information Wesley Cheng
2024-05-07 21:33 ` Pierre-Louis Bossart
2024-05-09 0:13 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 34/39] ALSA: usb-audio: Add USB offloading capable kcontrol Wesley Cheng
2024-05-07 21:37 ` Pierre-Louis Bossart
2024-05-08 19:41 ` Wesley Cheng
2024-05-09 0:42 ` Wesley Cheng
2024-05-09 13:11 ` Pierre-Louis Bossart
2024-05-09 22:05 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 35/39] ALSA: usb-audio: Allow for rediscovery of connected USB SND devices Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 36/39] ALSA: usb-audio: qcom: Use card and PCM index from QMI request Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 37/39] ASoC: usb: Rediscover USB SND devices on USB port add Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 38/39] ASoC: qcom: Populate SoC components string Wesley Cheng
2024-05-07 21:40 ` Pierre-Louis Bossart
2024-05-08 20:06 ` Wesley Cheng
2024-05-09 13:17 ` Pierre-Louis Bossart
2024-05-09 22:09 ` Wesley Cheng
2024-05-07 19:51 ` [PATCH v21 39/39] ASoC: doc: Add documentation for SOC USB 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=20240507195116.9464-33-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=bagasdotme@gmail.com \
--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=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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).