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 44/51] ASoC: qcom: qdsp6: Add headphone jack for offload connection status
Date: Fri, 16 Feb 2024 16:10:10 -0800	[thread overview]
Message-ID: <20240217001017.29969-45-quic_wcheng@quicinc.com> (raw)
In-Reply-To: <20240217001017.29969-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       | 20 ++++++++++++++++++++
 sound/soc/qcom/sm8250.c            | 12 +++++++++++-
 sound/soc/qcom/usb_offload_utils.c | 29 +++++++++++++++++++++++++++++
 sound/soc/qcom/usb_offload_utils.h | 20 ++++++++++++++++++++
 6 files changed, 87 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 d1bca2cf5ae4..092b4cb8bf39 100644
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -118,6 +118,10 @@ config SND_SOC_QDSP6_USB
 	tristate
 	select SND_SOC_USB
 
+config SND_SOC_QCOM_OFFLOAD_UTILS
+	tristate
+	select SND_SOC_USB
+
 config SND_SOC_QDSP6_PRM
 	tristate
 	select SND_SOC_QDSP6_PRM_LPASS_CLOCKS
@@ -177,6 +181,7 @@ config SND_SOC_SM8250
 	select SND_SOC_QDSP6
 	select SND_SOC_QCOM_COMMON
 	select SND_SOC_QCOM_SDW
+	select SND_SOC_QCOM_OFFLOAD_UTILS
 	help
 	  To add support for audio on Qualcomm Technologies Inc.
 	  SM8250 SoC-based systems.
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 32971395ab13..c62416215e83 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,12 +279,26 @@ 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 int q6usb_component_set_jack(struct snd_soc_component *component,
+			struct snd_soc_jack *jack, void *data)
+{
+	struct q6usb_port_data *priv = dev_get_drvdata(component->dev);
+
+	priv->hs_jack = jack;
+	snd_jack_report(jack->jack, priv->available_card_slot ? 1 : 0);
+
+	return 0;
+}
+
 static int q6usb_component_probe(struct snd_soc_component *component)
 {
 	struct q6usb_port_data *data = dev_get_drvdata(component->dev);
@@ -320,6 +339,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..a4e87dfb1b93 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,23 @@ 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;
 
-	return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup);
+	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 int sm8250_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
diff --git a/sound/soc/qcom/usb_offload_utils.c b/sound/soc/qcom/usb_offload_utils.c
new file mode 100644
index 000000000000..0be05c1f87a9
--- /dev/null
+++ b/sound/soc/qcom/usb_offload_utils.c
@@ -0,0 +1,29 @@
+// 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);
+
+	if (cpu_dai->id != USB_RX)
+		return 0;
+
+	if (!*jack_setup)
+		snd_soc_usb_setup_offload_jack(codec_dai->component, jack);
+
+	*jack_setup = true;
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(qcom_snd_usb_offload_jack_setup);
+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..283e81f57f43
--- /dev/null
+++ b/sound/soc/qcom/usb_offload_utils.h
@@ -0,0 +1,20 @@
+/* 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);
+#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;
+}
+#endif /* IS_ENABLED(CONFIG_SND_SOC_QCOM_OFFLOAD_UTILS) */
+#endif /* __QCOM_SND_USB_OFFLOAD_UTILS_H__ */

  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 ` [PATCH v17 42/51] ASoC: qcom: qdsp6: Add PCM ops to track current state Wesley Cheng
2024-02-17  0:10 ` [PATCH v17 43/51] ASoC: usb: Create SOC USB SND jack kcontrol Wesley Cheng
2024-02-17  0:10 ` Wesley Cheng [this message]
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-45-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.