[PATCH v2 0/6] ASoC: SDCA: class-driver fixes and PDM data-port support

[PATCH v2 0/6] ASoC: SDCA: class-driver fixes and PDM data-port support

[Srinivas Kandagatla]

Three small fixes in the SDCA class driver (propagating a read_prop
failure, dropping an extra pm_runtime reference on probe failure, and
re-enabling the IRQ on a failed system suspend), plus three patches
that teach the SDCA class_function path to tag PDM data-port terminals
and the SoundWire core to treat PDM streams correctly.

The three fixes carry Fixes: tags and are Cc'd to stable; the PDM
support patches have no Fixes: tag as they add new behaviour rather
than fix a regression.

The three fixes were flagged during a sashiko review during WCD9378
SDCA codec driver patch review.

Merge strategy: patches 1-4 and patch 6 go via ASoC, patch 5 goes via
SoundWire. There is no compile-time dependency between the SoundWire
and ASoC changes: patch 5 can land in SoundWire while patches 1-4, 6
land in ASoC in any order. Patch 6's runtime behaviour depends on
patch 5 to work end-to-end on Qualcomm SDCA targets, but each tree
compiles and tests cleanly on its own.

Changes in v2:
- 2/6: switched from reordering pm_runtime_get_noresume() to dropping
  the extra reference on devm_pm_runtime_enable() failure, per
- Replaces v1 4/4 ("clear sconfig.bps on PDM data-port terminals")
  with v2 4-6/6:
  - Moved the PDM terminal-type check out of sdca_class_function.c
    into a new sdca_asoc_dai_is_pdm() helper, per Charles.
  - Signal PDM via sconfig.type = SDW_STREAM_PDM instead of clearing
    sconfig.bps, per Pierre-Louis Bossart (use the type field that
    already exists in struct sdw_stream_config).
  - Added a core SoundWire change that skips the bps mismatch check
    for SDW_STREAM_PDM so the slave's PCM-container-width bps and
    the master's PDM bps convention can co-exist without -EINVAL.
- v1: https://lore.kernel.org/all/[v1-cover-letter-message-id]/

Srinivas Kandagatla (6):
  ASoC: SDCA: propagate sdw_slave_read_prop() failure in class_read_prop
  ASoC: SDCA: drop pm_runtime reference on probe failure path
  ASoC: SDCA: re-enable IRQ on pm_runtime_force_suspend failure
  ASoC: SDCA: add sdca_asoc_dai_is_pdm() helper
  soundwire: stream: skip bps mismatch check for PDM streams
  ASoC: SDCA: class_function: mark PDM data-port terminals

 drivers/soundwire/stream.c           |  4 +++-
 include/sound/sdca_asoc.h            |  2 ++
 sound/soc/sdca/sdca_asoc.c           | 23 +++++++++++++++++++++++
 sound/soc/sdca/sdca_class.c          | 10 ++++++++--
 sound/soc/sdca/sdca_class_function.c |  3 +++
 5 files changed, 39 insertions(+), 3 deletions(-)


base-commit: 3d229ce89862b8e82d71a9e11d6f840ca272a6d6
-- 
2.53.0

[PATCH v2 1/6] ASoC: SDCA: propagate sdw_slave_read_prop() failure in class_read_prop

[Srinivas Kandagatla]

sdw_slave_read_prop() can fail with -ENOMEM; propagate the return
instead of leaving slave->prop partially initialised.

Fixes: 2d877d0659cb ("ASoC: SDCA: Add basic SDCA class driver")
Cc: stable@vger.kernel.org
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Assisted-by: LLM
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 sound/soc/sdca/sdca_class.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
index 79fdb672be1d..bcc660aeb739 100644
--- a/sound/soc/sdca/sdca_class.c
+++ b/sound/soc/sdca/sdca_class.c
@@ -27,8 +27,11 @@
 static int class_read_prop(struct sdw_slave *sdw)
 {
 	struct sdw_slave_prop *prop = &sdw->prop;
+	int ret;
 
-	sdw_slave_read_prop(sdw);
+	ret = sdw_slave_read_prop(sdw);
+	if (ret)
+		return ret;
 
 	prop->use_domain_irq = true;
 	prop->scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY |
-- 
2.53.0

[PATCH v2 2/6] ASoC: SDCA: drop pm_runtime reference on probe failure path

[Srinivas Kandagatla]

sdca_class_probe() takes an extra usage count with
pm_runtime_get_noresume() to keep the device powered on until the
deferred boot work has run. If devm_pm_runtime_enable() then fails,
that reference is never dropped.

Drop it on the error path.

Fixes: 2d877d0659cb ("ASoC: SDCA: Add basic SDCA class driver")
Cc: stable@vger.kernel.org
Assisted-by: LLM
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 sound/soc/sdca/sdca_class.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
index bcc660aeb739..ca311209c6d1 100644
--- a/sound/soc/sdca/sdca_class.c
+++ b/sound/soc/sdca/sdca_class.c
@@ -197,8 +197,10 @@ int sdca_class_probe(struct sdw_slave *sdw,
 	pm_runtime_get_noresume(dev);
 
 	ret = devm_pm_runtime_enable(dev);
-	if (ret)
+	if (ret) {
+		pm_runtime_put_sync(dev);
 		return ret;
+	}
 
 	queue_work(system_long_wq, &drv->boot_work);
 
-- 
2.53.0

Re: [PATCH v2 2/6] ASoC: SDCA: drop pm_runtime reference on probe failure path

[Charles Keepax]

On Tue, Oct 20, 2026 at 08:38:52AM +0100, Srinivas Kandagatla wrote:
> sdca_class_probe() takes an extra usage count with
> pm_runtime_get_noresume() to keep the device powered on until the
> deferred boot work has run. If devm_pm_runtime_enable() then fails,
> that reference is never dropped.
> 
> Drop it on the error path.
> 
> Fixes: 2d877d0659cb ("ASoC: SDCA: Add basic SDCA class driver")
> Cc: stable@vger.kernel.org
> Assisted-by: LLM
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

[PATCH v2 3/6] ASoC: SDCA: re-enable IRQ on pm_runtime_force_suspend failure

[Srinivas Kandagatla]

The SoundWire IRQ was disabled before pm_runtime_force_suspend() but
never re-enabled when the force suspend failed, leaving the codec
unable to receive interrupts.

Fixes: 2d877d0659cb ("ASoC: SDCA: Add basic SDCA class driver")
Cc: stable@vger.kernel.org
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Assisted-by: LLM
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 sound/soc/sdca/sdca_class.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
index ca311209c6d1..ee61c983dc57 100644
--- a/sound/soc/sdca/sdca_class.c
+++ b/sound/soc/sdca/sdca_class.c
@@ -265,6 +265,7 @@ int sdca_class_system_suspend(struct sdca_class_drv *drv)
 	ret = pm_runtime_force_suspend(drv->dev);
 	if (ret) {
 		dev_err(drv->dev, "failed to force suspend: %d\n", ret);
+		enable_irq(drv->sdw->irq);
 		return ret;
 	}
 
-- 
2.53.0

[PATCH v2 4/6] ASoC: SDCA: add sdca_asoc_dai_is_pdm() helper

[Srinivas Kandagatla]

Resolve the SDCA terminal type for a DAI and return true for the
spec-defined PDM terminals (SDCA_TERM_TYPE_RAW_PDM_MIC and
SDCA_TERM_TYPE_PDM_RENDER_STREAM).

Used by sdca_class_function to tag PDM streams; expose it so other
SDCA codec drivers can share the check.

Assisted-by: LLM
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 include/sound/sdca_asoc.h  |  2 ++
 sound/soc/sdca/sdca_asoc.c | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/include/sound/sdca_asoc.h b/include/sound/sdca_asoc.h
index 599a72f33515..99c39b5944e3 100644
--- a/include/sound/sdca_asoc.h
+++ b/include/sound/sdca_asoc.h
@@ -112,4 +112,6 @@ int sdca_asoc_pde_poll_actual_ps(struct regmap *regmap,
 				 int from_ps, int to_ps,
 				 const struct sdca_pde_delay *pde_delays,
 				 int num_delays);
+bool sdca_asoc_dai_is_pdm(struct sdca_function_data *function,
+			  struct snd_soc_dai *dai);
 #endif // __SDCA_ASOC_H__
diff --git a/sound/soc/sdca/sdca_asoc.c b/sound/soc/sdca/sdca_asoc.c
index ccc579f878ff..559a0fdfd98e 100644
--- a/sound/soc/sdca/sdca_asoc.c
+++ b/sound/soc/sdca/sdca_asoc.c
@@ -1781,3 +1781,26 @@ int sdca_asoc_hw_params(struct device *dev, struct regmap *regmap,
 	return 0;
 }
 EXPORT_SYMBOL_NS(sdca_asoc_hw_params, "SND_SOC_SDCA");
+
+/**
+ * sdca_asoc_dai_is_pdm - True if the DAI is routed to a PDM data-port terminal
+ * @function: Pointer to the Function information.
+ * @dai: Pointer to the ASoC DAI.
+ *
+ * Return: true for SDCA_TERM_TYPE_RAW_PDM_MIC and
+ * SDCA_TERM_TYPE_PDM_RENDER_STREAM, false otherwise.
+ */
+bool sdca_asoc_dai_is_pdm(struct sdca_function_data *function,
+			  struct snd_soc_dai *dai)
+{
+	struct sdca_entity *entity = &function->entities[dai->id];
+
+	switch (entity->iot.type) {
+	case SDCA_TERM_TYPE_RAW_PDM_MIC:
+	case SDCA_TERM_TYPE_PDM_RENDER_STREAM:
+		return true;
+	default:
+		return false;
+	}
+}
+EXPORT_SYMBOL_NS(sdca_asoc_dai_is_pdm, "SND_SOC_SDCA");
-- 
2.53.0

Re: [PATCH v2 4/6] ASoC: SDCA: add sdca_asoc_dai_is_pdm() helper

[Charles Keepax]

On Tue, Oct 20, 2026 at 08:38:54AM +0100, Srinivas Kandagatla wrote:
> Resolve the SDCA terminal type for a DAI and return true for the
> spec-defined PDM terminals (SDCA_TERM_TYPE_RAW_PDM_MIC and
> SDCA_TERM_TYPE_PDM_RENDER_STREAM).
> 
> Used by sdca_class_function to tag PDM streams; expose it so other
> SDCA codec drivers can share the check.
> 
> Assisted-by: LLM
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

[PATCH v2 5/6] soundwire: stream: skip bps mismatch check for PDM streams

[Srinivas Kandagatla]

PDM data-port terminals carry a wire word length defined by the
stream payload, not by any host-side bps field.

Skip the sdw_config_stream() bps mismatch check for SDW_STREAM_PDM.
Behaviour for SDW_STREAM_PCM and SDW_STREAM_BPT is unchanged.

Assisted-by: LLM
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 drivers/soundwire/stream.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 0b00fcdcab2d..31db368ba24b 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1374,7 +1374,9 @@ static int sdw_config_stream(struct device *dev,
 		return -EINVAL;
 	}
 
-	if (stream->params.bps &&
+	/* PDM streams have no stream-wide bps; skip the match for them. */
+	if (stream_config->type != SDW_STREAM_PDM &&
+	    stream->params.bps &&
 	    stream->params.bps != stream_config->bps) {
 		dev_err(dev, "bps not matching, stream:%s\n", stream->name);
 		return -EINVAL;
-- 
2.53.0

Re: [PATCH v2 5/6] soundwire: stream: skip bps mismatch check for PDM streams

[Charles Keepax]

On Tue, Oct 20, 2026 at 08:38:55AM +0100, Srinivas Kandagatla wrote:
> PDM data-port terminals carry a wire word length defined by the
> stream payload, not by any host-side bps field.
> 
> Skip the sdw_config_stream() bps mismatch check for SDW_STREAM_PDM.
> Behaviour for SDW_STREAM_PCM and SDW_STREAM_BPT is unchanged.
> 
> Assisted-by: LLM
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles

[PATCH v2 6/6] ASoC: SDCA: class_function: mark PDM data-port terminals

[Srinivas Kandagatla]

snd_sdw_params_to_config() leaves sconfig.type at SDW_STREAM_PCM,
which is wrong when the DAI is routed to a PDM data-port terminal.

Set sconfig.type to SDW_STREAM_PDM for PDM terminals so the SoundWire
core sees the right type and does not enforce bps match against the
PCM-container-width value stamped by the helper.

Assisted-by: LLM
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 sound/soc/sdca/sdca_class_function.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sound/soc/sdca/sdca_class_function.c b/sound/soc/sdca/sdca_class_function.c
index 13b70f0f0dbf..41f6f0eb8563 100644
--- a/sound/soc/sdca/sdca_class_function.c
+++ b/sound/soc/sdca/sdca_class_function.c
@@ -142,6 +142,9 @@ static int class_function_sdw_add_peripheral(struct snd_pcm_substream *substream
 
 	snd_sdw_params_to_config(substream, params, &sconfig, &pconfig);
 
+	if (sdca_asoc_dai_is_pdm(drv->function, dai))
+		sconfig.type = SDW_STREAM_PDM;
+
 	/*
 	 * FIXME: As also noted in sdca_asoc_get_port(), currently only
 	 * a single unshared port is supported for each DAI.
-- 
2.53.0

Re: [PATCH v2 6/6] ASoC: SDCA: class_function: mark PDM data-port terminals

[Charles Keepax]

On Tue, Oct 20, 2026 at 08:38:56AM +0100, Srinivas Kandagatla wrote:
> snd_sdw_params_to_config() leaves sconfig.type at SDW_STREAM_PCM,
> which is wrong when the DAI is routed to a PDM data-port terminal.
> 
> Set sconfig.type to SDW_STREAM_PDM for PDM terminals so the SoundWire
> core sees the right type and does not enforce bps match against the
> PCM-container-width value stamped by the helper.
> 
> Assisted-by: LLM
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles