Unverified Commit 4af11e11 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: rt5682-sdw: 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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230802153629.53576-15-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent df93dfa2

sound/soc/codecs/rt5682-sdw.c

+22 −15
Original line number Diff line number Diff line
@@ -339,7 +339,25 @@ static int rt5682_sdw_init(struct device *dev, struct regmap *regmap, 
	ret = devm_snd_soc_register_component(dev,

					      &rt5682_soc_component_dev,

					      rt5682_dai, ARRAY_SIZE(rt5682_dai));

	dev_dbg(&slave->dev, "%s\n", __func__);

	if (ret < 0)

		return ret;



	/* set autosuspend parameters */

	pm_runtime_set_autosuspend_delay(dev, 3000);

	pm_runtime_use_autosuspend(dev);



	/* 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 ret;

}
@@ -361,22 +379,12 @@ static int rt5682_io_init(struct device *dev, struct sdw_slave *slave) 
		regcache_cache_bypass(rt5682->regmap, true);



	/*

	 * 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

	 */

	if (!rt5682->first_hw_init) {

		/* set autosuspend parameters */

		pm_runtime_set_autosuspend_delay(&slave->dev, 3000);

		pm_runtime_use_autosuspend(&slave->dev);



	if (!rt5682->first_hw_init)

		/* 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);



	while (loop > 0) {
@@ -687,7 +695,6 @@ static int rt5682_sdw_remove(struct sdw_slave *slave) 
	if (rt5682->hw_init)

		cancel_delayed_work_sync(&rt5682->jack_detect_work);



	if (rt5682->first_hw_init)

	pm_runtime_disable(&slave->dev);



	return 0;

sound/soc/codecs/rt5682.c

+3 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,9 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component, 


	rt5682->hs_jack = hs_jack;



	if (rt5682->is_sdw && !rt5682->first_hw_init)

		return 0;



	if (!hs_jack) {

		regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2,

			RT5682_JD1_EN_MASK, RT5682_JD1_DIS);