[PATCH v1] soundwire: intel_auxdevice: Fix system suspend/resume handling

Rafael J. Wysocki
2025-04-24T19:15:08Z

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The code in intel_suspend() and intel_resume() needs to be properly
synchronized with runtime PM which is not the case currently, so fix
it.

First of all, prevent runtime PM from triggering after intel_suspend()
has started because the changes made by it to the device might be
undone by a runtime resume of the device. For this purpose, add a
pm_runtime_disable() call to intel_suspend().

Next, once runtime PM has been disabled, the runtime PM status of the
device cannot change, so pm_runtime_status_suspended() can be used
instead of pm_runtime_suspended() in intel_suspend().

Moreover, checking the runtime PM status of the device in intel_resume()
is pointless because the device is going to be resumed anyway and the
code running in the case when the pm_runtime_suspended() check in
intel_resume() returns 'true' is harmful. Namely, calling
pm_runtime_resume() right after pm_runtime_set_active() has no effect
and calling pm_runtime_idle() on the device at that point is invalid
because the device is technically still suspended (it has not been
resumed yet). Remove that code altogether along with the check leading
to it.

Finally, call pm_runtime_set_active() at the end intel_resume() to set
the runtime PM status of the device to "active" because it has just been
resumed and re-enable runtime PM for it after that.

Additionally, drop the setting of DPM_FLAG_SMART_SUSPEND from the
driver because it has never been necessary and should not have been
done.

This addresses a functional regression after commit bca84a7b93fd ("PM:
sleep: Use DPM_FLAG_SMART_SUSPEND conditionally") that effectively
caused the fatal pm_runtime_suspended() check in intel_resume() to
trigger.

Fixes: bca84a7b93fd ("PM: sleep: Use DPM_FLAG_SMART_SUSPEND conditionally")
Cc: 6.2+ <stable@vger.kernel.org> # 6.2+
Reported-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Tested-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

This change fixes an issue predating commit bca84a7b93fd that simply
uncovered the problem and it needs to be backported to 6.2 and later
kernels.

Since it fixes a recent regression in 6.15-rc, I can route it through the
PM tree unless that would be a major concern.

---
drivers/soundwire/intel_auxdevice.c | 36 +++++++++++++-----------------------
1 file changed, 13 insertions(+), 23 deletions(-)

--- a/drivers/soundwire/intel_auxdevice.c
+++ b/drivers/soundwire/intel_auxdevice.c
@@ -353,9 +353,6 @@
/* use generic bandwidth allocation algorithm */
sdw->cdns.bus.compute_params = sdw_compute_params;

- /* avoid resuming from pm_runtime suspend if it's not required */
- dev_pm_set_driver_flags(dev, DPM_FLAG_SMART_SUSPEND);
-
ret = sdw_bus_master_add(bus, dev, dev->fwnode);
if (ret) {
dev_err(dev, "sdw_bus_master_add fail: %d\n", ret);
@@ -640,7 +637,10 @@
return 0;
}

- if (pm_runtime_suspended(dev)) {
+ /* Prevent runtime PM from racing with the code below. */
+ pm_runtime_disable(dev);
+
+ if (pm_runtime_status_suspended(dev)) {
dev_dbg(dev, "pm_runtime status: suspended\n");

clock_stop_quirks = sdw->link_res->clock_stop_quirks;
@@ -648,7 +648,7 @@
if ((clock_stop_quirks & SDW_INTEL_CLK_STOP_BUS_RESET) ||
!clock_stop_quirks) {

- if (pm_runtime_suspended(dev->parent)) {
+ if (pm_runtime_status_suspended(dev->parent)) {
/*
* paranoia check: this should not happen with the .prepare
* resume to full power
@@ -715,7 +715,6 @@
struct sdw_cdns *cdns = dev_get_drvdata(dev);
struct sdw_intel *sdw = cdns_to_intel(cdns);
struct sdw_bus *bus = &cdns->bus;
- int link_flags;
int ret;

if (bus->prop.hw_disabled || !sdw->startup_done) {
@@ -724,23 +723,6 @@
return 0;
}

- if (pm_runtime_suspended(dev)) {
- dev_dbg(dev, "pm_runtime status was suspended, forcing active\n");
-
- /* follow required sequence from runtime_pm.rst */
- pm_runtime_disable(dev);
- pm_runtime_set_active(dev);
- pm_runtime_mark_last_busy(dev);
- pm_runtime_enable(dev);
-
- pm_runtime_resume(bus->dev);
-
- link_flags = md_flags >> (bus->link_id * 8);
-
- if (!(link_flags & SDW_INTEL_MASTER_DISABLE_PM_RUNTIME_IDLE))
- pm_runtime_idle(dev);
- }
-
ret = sdw_intel_link_power_up(sdw);
if (ret) {
dev_err(dev, "%s failed: %d\n", __func__, ret);
@@ -761,6 +743,14 @@
}

/*
+ * Runtime PM has been disabled in intel_suspend(), so set the status
+ * to active because the device has just been resumed and re-enable
+ * runtime PM.
+ */
+ pm_runtime_set_active(dev);
+ pm_runtime_enable(dev);
+
+ /*
* after system resume, the pm_runtime suspend() may kick in
* during the enumeration, before any children device force the
* master device to remain active. Using pm_runtime_get()