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

[PATCH 1/4] 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
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 2/4] ASoC: SDCA: enable pm_runtime before taking the initial reference

[Srinivas Kandagatla]

If devm_pm_runtime_enable() failed, the usage count taken earlier by
pm_runtime_get_noresume() was never dropped. Reorder so the get only
happens once enable has succeeded.

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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
index bcc660aeb739..3361db188046 100644
--- a/sound/soc/sdca/sdca_class.c
+++ b/sound/soc/sdca/sdca_class.c
@@ -194,12 +194,13 @@ int sdca_class_probe(struct sdw_slave *sdw,
 	pm_runtime_set_autosuspend_delay(dev, 250);
 	pm_runtime_use_autosuspend(dev);
 	pm_runtime_set_active(dev);
-	pm_runtime_get_noresume(dev);
 
 	ret = devm_pm_runtime_enable(dev);
 	if (ret)
 		return ret;
 
+	pm_runtime_get_noresume(dev);
+
 	queue_work(system_long_wq, &drv->boot_work);
 
 	return 0;
-- 
2.53.0

[PATCH 3/4] 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
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 3361db188046..8396a4c058ec 100644
--- a/sound/soc/sdca/sdca_class.c
+++ b/sound/soc/sdca/sdca_class.c
@@ -264,6 +264,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

Re: [PATCH 1/4] ASoC: SDCA: propagate sdw_slave_read_prop() failure in class_read_prop

[Charles Keepax]

On Sun, Oct 18, 2026 at 08:23:56PM +0100, Srinivas Kandagatla wrote:
> 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
> Assisted-by: LLM
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

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

Thanks,
Charles

Re: [PATCH 2/4] ASoC: SDCA: enable pm_runtime before taking the initial reference

[Charles Keepax]

On Sun, Oct 18, 2026 at 08:23:57PM +0100, Srinivas Kandagatla wrote:
> If devm_pm_runtime_enable() failed, the usage count taken earlier by
> pm_runtime_get_noresume() was never dropped. Reorder so the get only
> happens once enable has succeeded.
> 
> 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 | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
> index bcc660aeb739..3361db188046 100644
> --- a/sound/soc/sdca/sdca_class.c
> +++ b/sound/soc/sdca/sdca_class.c
> @@ -194,12 +194,13 @@ int sdca_class_probe(struct sdw_slave *sdw,
>  	pm_runtime_set_autosuspend_delay(dev, 250);
>  	pm_runtime_use_autosuspend(dev);
>  	pm_runtime_set_active(dev);
> -	pm_runtime_get_noresume(dev);
>  
>  	ret = devm_pm_runtime_enable(dev);
>  	if (ret)
>  		return ret;
>  
> +	pm_runtime_get_noresume(dev);

I think it would be better to drop the reference on the error
path. Doing it this way round there is a very small chance that
the device auto-suspends between the enable and get_noresume.
The intention was to keep everything powered on until bring up
was complete.

Thanks,
Charles

Re: [PATCH 3/4] ASoC: SDCA: re-enable IRQ on pm_runtime_force_suspend failure

[Charles Keepax]

On Sun, Oct 18, 2026 at 08:23:58PM +0100, Srinivas Kandagatla wrote:
> 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
> Assisted-by: LLM
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---

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

Thanks,
Charles

Re: [PATCH 2/4] ASoC: SDCA: enable pm_runtime before taking the initial reference

[Srinivas Kandagatla]

On 10/19/26 9:39 AM, Charles Keepax wrote:
> On Sun, Oct 18, 2026 at 08:23:57PM +0100, Srinivas Kandagatla wrote:
>> If devm_pm_runtime_enable() failed, the usage count taken earlier by
>> pm_runtime_get_noresume() was never dropped. Reorder so the get only
>> happens once enable has succeeded.
>>
>> 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 | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/sound/soc/sdca/sdca_class.c b/sound/soc/sdca/sdca_class.c
>> index bcc660aeb739..3361db188046 100644
>> --- a/sound/soc/sdca/sdca_class.c
>> +++ b/sound/soc/sdca/sdca_class.c
>> @@ -194,12 +194,13 @@ int sdca_class_probe(struct sdw_slave *sdw,
>>  	pm_runtime_set_autosuspend_delay(dev, 250);
>>  	pm_runtime_use_autosuspend(dev);
>>  	pm_runtime_set_active(dev);
>> -	pm_runtime_get_noresume(dev);
>>  
>>  	ret = devm_pm_runtime_enable(dev);
>>  	if (ret)
>>  		return ret;
>>  
>> +	pm_runtime_get_noresume(dev);
> 
> I think it would be better to drop the reference on the error
> path. Doing it this way round there is a very small chance that
> the device auto-suspends between the enable and get_noresume.
> The intention was to keep everything powered on until bring up
> was complete.
Understood, will fix that in v2.

--srini
> 
> Thanks,
> Charles