ASoC: rt1712-sdca: enable pm_runtime in probe, keep status as 'suspended'

This patch suggests enabling pm_runtime during the probe, but marking the
device as 'active' only after it is enumerated. That will force a
dependency between the card and the codec, pm_runtime_get_sync() will
have to wait for the codec device to resume and hence implicitly wait
for the enumeration/initialization to be completed. In the nominal
case where the codec device is already active the get_sync() would
only perform a ref-count increase.

The changes are directly inspired by RT711 and RT711-sdca changes.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230802153629.53576-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/rt712-sdca-sdw.c b/sound/soc/codecs/rt712-sdca-sdw.c
index 6bc50396a0f62c1e36a36347997b463faef65b6a..6b644a89c5890bb0a802c97c9ecbcfd977d6b35d 100644 (file)
--- a/sound/soc/codecs/rt712-sdca-sdw.c
+++ b/sound/soc/codecs/rt712-sdca-sdw.c
@@ -363,8 +363,7 @@ static int rt712_sdca_sdw_remove(struct sdw_slave *slave)
                cancel_delayed_work_sync(&rt712->jack_btn_check_work);
        }
 
-       if (rt712->first_hw_init)
-               pm_runtime_disable(&slave->dev);
+       pm_runtime_disable(&slave->dev);
 
        mutex_destroy(&rt712->calibrate_mutex);
        mutex_destroy(&rt712->disable_irq_lock);

diff --git a/sound/soc/codecs/rt712-sdca.c b/sound/soc/codecs/rt712-sdca.c
index 88f6c895722e6e48ce919df6b19db9a051098def..7077ff6ba1f4bc30cbde0b69ff147c349f8ea710 100644 (file)
--- a/sound/soc/codecs/rt712-sdca.c
+++ b/sound/soc/codecs/rt712-sdca.c
@@ -453,6 +453,9 @@ static int rt712_sdca_set_jack_detect(struct snd_soc_component *component,
 
        rt712->hs_jack = hs_jack;
 
+       if (!rt712->first_hw_init)
+               return 0;
+
        ret = pm_runtime_resume_and_get(component->dev);
        if (ret < 0) {
                if (ret != -EACCES) {
@@ -960,6 +963,9 @@ static int rt712_sdca_probe(struct snd_soc_component *component)
        rt712_sdca_parse_dt(rt712, &rt712->slave->dev);
        rt712->component = component;
 
+       if (!rt712->first_hw_init)
+               return 0;
+
        ret = pm_runtime_resume(component->dev);
        if (ret < 0 && ret != -EACCES)
                return ret;
@@ -1210,10 +1216,27 @@ int rt712_sdca_init(struct device *dev, struct regmap *regmap,
        else
                ret =  devm_snd_soc_register_component(dev,
                                &soc_sdca_dev_rt712, rt712_sdca_dai, 1);
+       if (ret < 0)
+               return ret;
 
-       dev_dbg(&slave->dev, "%s\n", __func__);
+       /* set autosuspend parameters */
+       pm_runtime_set_autosuspend_delay(dev, 3000);
+       pm_runtime_use_autosuspend(dev);
 
-       return ret;
+       /* make sure the device does not suspend immediately */
+       pm_runtime_mark_last_busy(dev);
+
+       pm_runtime_enable(dev);
+
+       /* important note: the device is NOT tagged as 'active' and will remain
+        * 'suspended' until the hardware is enumerated/initialized. This is required
+        * to make sure the ASoC framework use of pm_runtime_get_sync() does not silently
+        * fail with -EACCESS because of race conditions between card creation and enumeration
+        */
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       return 0;
 }
 
 int rt712_sdca_io_init(struct device *dev, struct sdw_slave *slave)
@@ -1234,20 +1257,11 @@ int rt712_sdca_io_init(struct device *dev, struct sdw_slave *slave)
                regcache_cache_bypass(rt712->mbq_regmap, true);
        } else {
                /*
-                * PM runtime is only enabled when a Slave reports as Attached
+                *  PM runtime status is marked as 'active' only when a Slave reports as Attached
                 */
 
-               /* set autosuspend parameters */
-               pm_runtime_set_autosuspend_delay(&slave->dev, 3000);
-               pm_runtime_use_autosuspend(&slave->dev);
-
                /* update count of parent 'active' children */
                pm_runtime_set_active(&slave->dev);
-
-               /* make sure the device does not suspend immediately */
-               pm_runtime_mark_last_busy(&slave->dev);
-
-               pm_runtime_enable(&slave->dev);
        }
 
        pm_runtime_get_noresume(&slave->dev);